mirror of
https://github.com/tale/headplane.git
synced 2026-07-26 07:48:14 +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}
|
||||
</p>
|
||||
<p className="text-sm opacity-50">
|
||||
{node.user.name || node.user.email}
|
||||
{node.user.name || node.user.email || node.user.id}
|
||||
</p>
|
||||
<div className="flex gap-1 flex-wrap mt-1.5">
|
||||
{mapTagsToComponents(node, uiTags)}
|
||||
|
||||
@@ -34,7 +34,7 @@ export default function Move({ machine, users, isOpen, setIsOpen }: MoveProps) {
|
||||
}}
|
||||
>
|
||||
{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>
|
||||
</Dialog.Panel>
|
||||
|
||||
@@ -46,7 +46,7 @@ export default function NewMachine(data: NewMachineProps) {
|
||||
placeholder="Select a 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>
|
||||
</Dialog.Panel>
|
||||
|
||||
@@ -109,7 +109,7 @@ export default function Page() {
|
||||
</span>
|
||||
<div className="flex items-center gap-x-2.5 mt-1">
|
||||
<UserCircle />
|
||||
{node.user.name || node.user.email}
|
||||
{node.user.name || node.user.email || node.user.id}
|
||||
</div>
|
||||
</div>
|
||||
<div className="p-2 pl-4">
|
||||
|
||||
@@ -36,7 +36,7 @@ export default function AddAuthKey(data: AddAuthKeyProps) {
|
||||
}}
|
||||
>
|
||||
{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>
|
||||
<NumberInput
|
||||
|
||||
@@ -197,7 +197,7 @@ export default function Page() {
|
||||
{[
|
||||
<Select.Item key="__headplane_all">All</Select.Item>,
|
||||
...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>
|
||||
|
||||
@@ -8,8 +8,7 @@ interface DeleteProps {
|
||||
}
|
||||
|
||||
export default function DeleteUser({ user, isOpen, setIsOpen }: DeleteProps) {
|
||||
const name =
|
||||
(user.displayName?.length ?? 0) > 0 ? user.displayName : user.name;
|
||||
const name = user.name;
|
||||
|
||||
return (
|
||||
<Dialog isOpen={isOpen} onOpenChange={setIsOpen}>
|
||||
|
||||
@@ -132,6 +132,10 @@ function getName(user: client.UserInfoResponse, claims: client.IDToken) {
|
||||
return user.name;
|
||||
}
|
||||
|
||||
if (user.displayName) {
|
||||
return user.displayName;
|
||||
}
|
||||
|
||||
if (claims.name && typeof claims.name === 'string') {
|
||||
return claims.name;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user