mirror of
https://github.com/tale/headplane.git
synced 2026-08-24 19:46:29 +00:00
fix display name
This commit is contained in:
committed by
Aarnav Tale
parent
f7547a4c62
commit
ad469129bc
@@ -64,7 +64,7 @@ export default function MachineRow({
|
|||||||
{node.givenName}
|
{node.givenName}
|
||||||
</p>
|
</p>
|
||||||
<p className="text-sm opacity-50">
|
<p className="text-sm opacity-50">
|
||||||
{node.user.name || node.user.email}
|
{node.user.name || node.user.email || node.user.id}
|
||||||
</p>
|
</p>
|
||||||
<div className="flex gap-1 flex-wrap mt-1.5">
|
<div className="flex gap-1 flex-wrap mt-1.5">
|
||||||
{mapTagsToComponents(node, uiTags)}
|
{mapTagsToComponents(node, uiTags)}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export default function Move({ machine, users, isOpen, setIsOpen }: MoveProps) {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{users.map((user) => (
|
{users.map((user) => (
|
||||||
<Select.Item key={user.id}>{user.name}</Select.Item>
|
<Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
</Dialog.Panel>
|
</Dialog.Panel>
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export default function NewMachine(data: NewMachineProps) {
|
|||||||
placeholder="Select a user"
|
placeholder="Select a user"
|
||||||
>
|
>
|
||||||
{data.users.map((user) => (
|
{data.users.map((user) => (
|
||||||
<Select.Item key={user.id}>{user.name}</Select.Item>
|
<Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
</Dialog.Panel>
|
</Dialog.Panel>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ export default function Page() {
|
|||||||
</span>
|
</span>
|
||||||
<div className="flex items-center gap-x-2.5 mt-1">
|
<div className="flex items-center gap-x-2.5 mt-1">
|
||||||
<UserCircle />
|
<UserCircle />
|
||||||
{node.user.name || node.user.email}
|
{node.user.name || node.user.email || node.user.id}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="p-2 pl-4">
|
<div className="p-2 pl-4">
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ export default function AddAuthKey(data: AddAuthKeyProps) {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{data.users.map((user) => (
|
{data.users.map((user) => (
|
||||||
<Select.Item key={user.id}>{user.name}</Select.Item>
|
<Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
<NumberInput
|
<NumberInput
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ export default function Page() {
|
|||||||
{[
|
{[
|
||||||
<Select.Item key="__headplane_all">All</Select.Item>,
|
<Select.Item key="__headplane_all">All</Select.Item>,
|
||||||
...keys.map(({ user }) => (
|
...keys.map(({ user }) => (
|
||||||
<Select.Item key={user.id}>{user.name}</Select.Item>
|
<Select.Item key={user.id}>{user.name || user.email || user.id}</Select.Item>
|
||||||
)),
|
)),
|
||||||
]}
|
]}
|
||||||
</Select>
|
</Select>
|
||||||
|
|||||||
@@ -8,8 +8,7 @@ interface DeleteProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function DeleteUser({ user, isOpen, setIsOpen }: DeleteProps) {
|
export default function DeleteUser({ user, isOpen, setIsOpen }: DeleteProps) {
|
||||||
const name =
|
const name = user.name;
|
||||||
(user.displayName?.length ?? 0) > 0 ? user.displayName : user.name;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
|
<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
|
||||||
|
|||||||
@@ -132,6 +132,10 @@ function getName(user: client.UserInfoResponse, claims: client.IDToken) {
|
|||||||
return user.name;
|
return user.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (user.displayName) {
|
||||||
|
return user.displayName;
|
||||||
|
}
|
||||||
|
|
||||||
if (claims.name && typeof claims.name === 'string') {
|
if (claims.name && typeof claims.name === 'string') {
|
||||||
return claims.name;
|
return claims.name;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user