refactor: rename variables for clarity in user-related data handling across services

Author: younocode

apps/nestjs-backend/src/features/base/base.service.ts

@@ -129,23 +129,23 @@ export class BaseService {
       orderBy: [{ spaceId: 'asc' }, { order: 'asc' }],
     });
 
-    const createUserList = await this.prismaService.user.findMany({
+    const createdUserList = await this.prismaService.user.findMany({
       where: { id: { in: baseList.map((base) => base.createdBy) } },
       select: { id: true, name: true, avatar: true },
     });
-    const createUserMap = keyBy(createUserList, 'id');
+    const createdUserMap = keyBy(createdUserList, 'id');
 
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      const createUser = createUserMap[base.createdBy];
+      const createdUser = createdUserMap[base.createdBy];
       return {
         ...base,
         role,
         lastModifiedTime: base.lastModifiedTime?.toISOString(),
         createdTime: base.createdTime?.toISOString(),
         createdUser: {
-          ...createUser,
-          avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),
+          ...(createdUser ?? {}),
+          avatar: createdUser?.avatar && getPublicFullStorageUrl(createdUser.avatar),
         },
       };
     });

apps/nestjs-backend/src/features/collaborator/collaborator.service.ts

@@ -19,7 +19,7 @@ import type {
 } from '@teable/openapi';
 import { CollaboratorType, PrincipalType } from '@teable/openapi';
 import { Knex } from 'knex';
-import { difference, map } from 'lodash';
+import { difference, keyBy, map } from 'lodash';
 import { InjectModel } from 'nest-knexjs';
 import { ClsService } from 'nestjs-cls';
 import { CustomHttpException } from '../../custom.exception';
@@ -830,6 +830,12 @@ export class CollaboratorService {
         },
       },
     });
+
+    const createdUserList = await this.prismaService.txClient().user.findMany({
+      where: { id: { in: bases.map((base) => base.createdBy) } },
+      select: { id: true, name: true, avatar: true },
+    });
+    const createdUserMap = keyBy(createdUserList, 'id');
     return bases.map((base) => ({
       id: base.id,
       name: base.name,
@@ -842,9 +848,10 @@ export class CollaboratorService {
       createdTime: base.createdTime?.toISOString(),
       createdBy: base.createdBy,
       createdUser: {
-        id: base.createdBy,
-        name: base.createdBy,
-        avatar: base.createdBy ? getPublicFullStorageUrl(base.createdBy) : null,
+        ...(createdUserMap[base.createdBy] ?? {}),
+        avatar:
+          createdUserMap[base.createdBy]?.avatar &&
+          getPublicFullStorageUrl(createdUserMap[base.createdBy]?.avatar ?? ''),
       },
     }));
   }

apps/nestjs-backend/src/features/space/space.service.ts

@@ -280,23 +280,23 @@ export class SpaceService {
       },
     });
 
-    const createUserList = await this.prismaService.user.findMany({
+    const createdUserList = await this.prismaService.user.findMany({
       where: { id: { in: baseList.map((base) => base.createdBy) } },
       select: { id: true, name: true, avatar: true },
     });
-    const createUserMap = keyBy(createUserList, 'id');
+    const createdUserMap = keyBy(createdUserList, 'id');
 
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      const createUser = createUserMap[base.createdBy];
+      const createdUser = createdUserMap[base.createdBy];
       return {
         ...base,
         role,
         lastModifiedTime: base.lastModifiedTime?.toISOString(),
         createdTime: base.createdTime?.toISOString(),
         createdUser: {
-          ...createUser,
-          avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),
+          ...createdUser,
+          avatar: createdUser?.avatar && getPublicFullStorageUrl(createdUser.avatar),
         },
       };
     });

apps/nextjs-app/src/features/app/blocks/space/BaseItem.tsx

@@ -1,13 +1,7 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 import { hasPermission } from '@teable/core';
-import {
-  ChevronDown,
-  ChevronRight,
-  Database,
-  DraggableHandle,
-  MoreHorizontal,
-} from '@teable/icons';
+import { ChevronDown, ChevronRight, Database, MoreHorizontal } from '@teable/icons';
 import type { IGetBaseVo } from '@teable/openapi';
 import { PinType } from '@teable/openapi';
 import { useLanDayjs } from '@teable/sdk/hooks';
@@ -161,7 +155,9 @@ export const BaseItem: FC<IBaseItemProps> = (props) => {
           <AvatarImage src={base.createdUser?.avatar ?? ''} />
           <AvatarFallback className="text-xs">{base.createdUser?.name?.slice(0, 1)}</AvatarFallback>
         </Avatar>
-        <span className="truncate text-xs">{base.createdUser?.name}</span>
+        <span className="truncate text-xs" title={base.createdUser?.name}>
+          {base.createdUser?.name}
+        </span>
       </div>
 
       {/* Last Opened Column */}

apps/nextjs-app/src/features/app/blocks/space/BaseList.tsx

@@ -123,7 +123,7 @@ export const BaseList = (props: IBaseListProps) => {
             <div className="bg-muted">
               <BaseNodeTree
                 mode="view"
-                emptyText={t('space:baseList.empty')}
+                emptyText={t('space:baseList.noTables')}
                 skeleton={
                   <div className="flex w-full flex-col gap-2 px-2">
                     <Skeleton className="h-7 w-full" />

apps/nextjs-app/src/features/app/blocks/space/space-side-bar/PinList.tsx

@@ -100,7 +100,7 @@ export const PinList = (props: { className?: string }) => {
           innerClassName="flex min-h-0 flex-1 flex-col"
         >
           <ScrollArea className="flex w-full !border-none px-2 [&>[data-radix-scroll-area-viewport]>div]:!block [&>[data-radix-scroll-area-viewport]>div]:!min-w-0">
-            <div className="flexmin-h-0 flex-1 flex-col overflow-y-auto">
+            <div className="flex min-h-0 flex-1 flex-col overflow-y-auto">
               {pinListData?.length === 0 && (
                 <div className="text-center text-xs text-muted-foreground">
                   {t('space:pin.empty')}

apps/nextjs-app/src/features/app/blocks/trash/SpaceInnerTrashPage.tsx

@@ -18,15 +18,13 @@ import { toast } from '@teable/ui-lib/shadcn/ui/sonner';
 import dayjs from 'dayjs';
 import { IterationCcwIcon } from 'lucide-react';
 import { useParams } from 'next/navigation';
-import { useRouter } from 'next/router';
 import { useTranslation } from 'next-i18next';
 import { useCallback, useMemo, useState } from 'react';
 import { spaceConfig } from '@/features/i18n/space.config';
 import { Collaborator } from '../../components/collaborator-manage/components/Collaborator';
 
 export const SpaceInnerTrashPage = () => {
   const { spaceId } = useParams<{ spaceId: string }>();
-  const router = useRouter();
   const isHydrated = useIsHydrated();
   const queryClient = useQueryClient();
   const { t } = useTranslation(spaceConfig.i18nNamespaces);

apps/nextjs-app/src/features/app/layouts/SharedBaseLayout.tsx

@@ -1,5 +1,5 @@
 import type { DehydratedState } from '@tanstack/react-query';
-import { Component, Database, Home, Users } from '@teable/icons';
+import { Component, Database } from '@teable/icons';
 import type { IUser } from '@teable/sdk';
 import { NotificationProvider, SessionProvider } from '@teable/sdk';
 import { AppProvider } from '@teable/sdk/context';