fix(ui): if name is empty (#2278)

TabbyML · May 29, 2024 · 93e47f2 · 93e47f2
1 parent c075541
commit 93e47f2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/ee/tabby-ui/app/(dashboard)/activities/components/activity.tsx b/ee/tabby-ui/app/(dashboard)/activities/components/activity.tsx
@@ -169,7 +169,7 @@ export default function Activity() {
                         </SelectItem>
                         {members.map(member => (
                           <SelectItem value={member.id} key={member.id}>
-                            {member.name}
+                            {member.name || member.email}
                           </SelectItem>
                         ))}
                       </SelectGroup>
@@ -338,6 +338,10 @@ function ActivityRow({
       break
     }
   }
+
+  let displayUser = activity.userId
+  const user = members.find(user => user.id === activity.userId)
+  if (user) displayUser = user.name || user.email
   return (
     <>
       <TableRow
@@ -359,10 +363,7 @@ function ActivityRow({
             </TooltipContent>
           </Tooltip>
         </TableCell>
-        <TableCell>
-          {members.find(user => user.id === activity.userId)?.name ||
-            activity.userId}
-        </TableCell>
+        <TableCell>{displayUser}</TableCell>
         <TableCell className="pr-4 md:pr-8">
           <Tooltip>
             <TooltipTrigger>

diff --git a/ee/tabby-ui/app/(dashboard)/reports/components/report.tsx b/ee/tabby-ui/app/(dashboard)/reports/components/report.tsx
@@ -237,7 +237,7 @@ export function Report() {
                 <SelectItem value={KEY_SELECT_ALL}>All members</SelectItem>
                 {members.map(member => (
                   <SelectItem value={member.id} key={member.id}>
-                    {member.name}
+                    {member.name || member.email}
                   </SelectItem>
                 ))}
               </SelectGroup>

diff --git a/ee/tabby-ui/app/(home)/page.tsx b/ee/tabby-ui/app/(home)/page.tsx
@@ -176,10 +176,14 @@ function MainPanel() {
 
           <div className="mt-2 flex w-full">
             <div className="flex flex-col gap-y-1">
-              <div className="flex items-center gap-2">
-                <IconUser className="text-muted-foreground" />
-                <p className="max-w-[10rem] truncate text-sm">{data.me.name}</p>
-              </div>
+              {data.me.name && (
+                <div className="flex items-center gap-2">
+                  <IconUser className="text-muted-foreground" />
+                  <p className="max-w-[10rem] truncate text-sm">
+                    {data.me.name}
+                  </p>
+                </div>
+              )}
               <div className="flex items-center gap-2">
                 <IconMail className="text-muted-foreground" />
                 <p className="max-w-[10rem] truncate text-sm">

diff --git a/ee/tabby-ui/components/user-panel.tsx b/ee/tabby-ui/components/user-panel.tsx
@@ -47,10 +47,17 @@ export default function UserPanel({
     <DropdownMenu>
       <DropdownMenuTrigger>{children}</DropdownMenuTrigger>
       <DropdownMenuContent collisionPadding={{ right: 16 }}>
-        <DropdownMenuLabel className="pb-0.5">{user.name}</DropdownMenuLabel>
-        <DropdownMenuLabel className="pb-1 pt-0 text-sm font-normal text-muted-foreground">
-          {user.email}
-        </DropdownMenuLabel>
+        {user.name && (
+          <>
+            <DropdownMenuLabel className="pb-0.5">
+              {user.name}
+            </DropdownMenuLabel>
+            <DropdownMenuLabel className="pb-1 pt-0 text-sm font-normal text-muted-foreground">
+              {user.email}
+            </DropdownMenuLabel>
+          </>
+        )}
+        {!user.name && <DropdownMenuLabel>{user.email}</DropdownMenuLabel>}
         <DropdownMenuSeparator />
         <DropdownMenuItem
           onClick={() => window.open('/')}