feat: space layout

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

@@ -12,6 +12,7 @@ import type {
   IUpdateBaseRo,
   IUpdateOrderRo,
 } from '@teable/openapi';
+import { keyBy } from 'lodash';
 import { ClsService } from 'nestjs-cls';
 import { IThresholdConfig, ThresholdConfig } from '../../configs/threshold.config';
 import { CustomHttpException } from '../../custom.exception';
@@ -20,6 +21,7 @@ import { IDbProvider } from '../../db-provider/db.provider.interface';
 import type { IClsStore } from '../../types/cls';
 import { getMaxLevelRole } from '../../utils/get-max-level-role';
 import { updateOrder } from '../../utils/update-order';
+import { getPublicFullStorageUrl } from '../attachments/plugins/utils';
 import { PermissionService } from '../auth/permission.service';
 import { CollaboratorService } from '../collaborator/collaborator.service';
 import { GraphService } from '../graph/graph.service';
@@ -52,6 +54,7 @@ export class BaseService {
           name: true,
           icon: true,
           spaceId: true,
+          createdBy: true,
         },
         where: {
           id: baseId,
@@ -101,6 +104,9 @@ export class BaseService {
         order: true,
         spaceId: true,
         icon: true,
+        createdBy: true,
+        createdTime: true,
+        lastModifiedTime: true,
       },
       where: {
         deletedTime: null,
@@ -122,9 +128,26 @@ export class BaseService {
       },
       orderBy: [{ spaceId: 'asc' }, { order: 'asc' }],
     });
+
+    const createdUserList = await this.prismaService.user.findMany({
+      where: { id: { in: baseList.map((base) => base.createdBy) } },
+      select: { id: true, name: true, avatar: true },
+    });
+    const createdUserMap = keyBy(createdUserList, 'id');
+
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      return { ...base, role };
+      const createdUser = createdUserMap[base.createdBy];
+      return {
+        ...base,
+        role,
+        lastModifiedTime: base.lastModifiedTime?.toISOString(),
+        createdTime: base.createdTime?.toISOString(),
+        createdUser: {
+          ...(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,
@@ -838,6 +844,15 @@ export class CollaboratorService {
       spaceId: base.spaceId,
       spaceName: base.space?.name,
       collaboratorType: CollaboratorType.Base,
+      lastModifiedTime: base.lastModifiedTime?.toISOString(),
+      createdTime: base.createdTime?.toISOString(),
+      createdBy: base.createdBy,
+      createdUser: {
+        ...(createdUserMap[base.createdBy] ?? {}),
+        avatar:
+          createdUserMap[base.createdBy]?.avatar &&
+          getPublicFullStorageUrl(createdUserMap[base.createdBy]?.avatar ?? ''),
+      },
     }));
   }
 

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

@@ -19,19 +19,19 @@ import type {
   IUpdateSpaceRo,
 } from '@teable/openapi';
 import { ResourceType, CollaboratorType, PrincipalType, IntegrationType } from '@teable/openapi';
-import { map } from 'lodash';
+import { keyBy, map } from 'lodash';
 import { ClsService } from 'nestjs-cls';
 import { ThresholdConfig, IThresholdConfig } from '../../configs/threshold.config';
 import { CustomHttpException } from '../../custom.exception';
 import { PerformanceCache, PerformanceCacheService } from '../../performance-cache';
 import { generateIntegrationCacheKey } from '../../performance-cache/generate-keys';
 import type { IClsStore } from '../../types/cls';
+import { getPublicFullStorageUrl } from '../attachments/plugins/utils';
 import { PermissionService } from '../auth/permission.service';
 import { BaseService } from '../base/base.service';
 import { CollaboratorService } from '../collaborator/collaborator.service';
 import { SettingOpenApiService } from '../setting/open-api/setting-open-api.service';
 import { SettingService } from '../setting/setting.service';
-
 @Injectable()
 export class SpaceService {
   constructor(
@@ -267,6 +267,9 @@ export class SpaceService {
         order: true,
         spaceId: true,
         icon: true,
+        createdBy: true,
+        lastModifiedTime: true,
+        createdTime: true,
       },
       where: {
         spaceId,
@@ -277,9 +280,25 @@ export class SpaceService {
       },
     });
 
+    const createdUserList = await this.prismaService.user.findMany({
+      where: { id: { in: baseList.map((base) => base.createdBy) } },
+      select: { id: true, name: true, avatar: true },
+    });
+    const createdUserMap = keyBy(createdUserList, 'id');
+
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      return { ...base, role };
+      const createdUser = createdUserMap[base.createdBy];
+      return {
+        ...base,
+        role,
+        lastModifiedTime: base.lastModifiedTime?.toISOString(),
+        createdTime: base.createdTime?.toISOString(),
+        createdUser: {
+          ...createdUser,
+          avatar: createdUser?.avatar && getPublicFullStorageUrl(createdUser.avatar),
+        },
+      };
     });
   }
 

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

@@ -90,13 +90,13 @@ export class TrashService {
   }
 
   async getTrash(trashRo: ITrashRo) {
-    const { resourceType } = trashRo;
+    const { resourceType, spaceId } = trashRo;
 
     switch (resourceType) {
       case ResourceType.Space:
         return await this.getSpaceTrash();
       case ResourceType.Base:
-        return await this.getBaseTrash();
+        return await this.getBaseTrash(spaceId);
       default:
         throw new CustomHttpException(
           `Invalid resource type ${resourceType}`,
@@ -150,23 +150,26 @@ export class TrashService {
     };
   }
 
-  private async getBaseTrash() {
+  private async getBaseTrash(spaceId?: string) {
     const { bases } = await this.getAuthorizedSpacesAndBases();
-    const baseIds = bases.map((base) => base.id);
-    const spaceIds = bases.map((base) => base.spaceId);
+    const authorizedBaseIds = bases.map((base) => base.id);
+    const authorizedBaseSpaceIds = bases.map((base) => base.spaceId);
     const baseIdMap = keyBy(bases, 'id');
 
     const trashedSpaces = await this.prismaService.trash.findMany({
       where: {
         resourceType: ResourceType.Space,
-        resourceId: { in: spaceIds },
+        resourceId: { in: authorizedBaseSpaceIds },
       },
       select: { resourceId: true },
     });
     const list = await this.prismaService.trash.findMany({
       where: {
-        parentId: { notIn: trashedSpaces.map((space) => space.resourceId) },
-        resourceId: { in: baseIds },
+        parentId: {
+          notIn: trashedSpaces.map((space) => space.resourceId),
+          in: spaceId ? [spaceId] : undefined,
+        },
+        resourceId: { in: authorizedBaseIds },
         resourceType: ResourceType.Base,
       },
     });

apps/nestjs-backend/src/features/user/last-visit/last-visit.service.ts

@@ -79,6 +79,33 @@ export class LastVisitService {
     };
   }
 
+  async spaceVisit(userId: string, parentResourceId: string) {
+    const lastVisit = await this.prismaService.userLastVisit.findFirst({
+      where: {
+        userId,
+        parentResourceId,
+        resourceType: LastVisitResourceType.Space,
+      },
+      orderBy: {
+        lastVisitTime: 'desc',
+      },
+      take: 1,
+      select: {
+        resourceId: true,
+        resourceType: true,
+      },
+    });
+
+    if (lastVisit) {
+      return {
+        resourceId: lastVisit.resourceId,
+        resourceType: lastVisit.resourceType as LastVisitResourceType,
+      };
+    }
+
+    return undefined;
+  }
+
   async tableVisit(userId: string, baseId: string): Promise<IUserLastVisitVo | undefined> {
     const knex = this.knex;
 
@@ -404,6 +431,7 @@ export class LastVisitService {
         resourceIcon: 'b.icon',
         resourceRole: 'c.role_name',
         spaceId: 's.id',
+        createBy: 'b.created_by',
       })
       .from('user_last_visit as ulv')
       .join('base as b', function () {
@@ -436,6 +464,7 @@ export class LastVisitService {
         resourceIcon: string;
         resourceRole: IRole;
         spaceId: string;
+        createBy: string;
       }[]
     >(query.toQuery());
 
@@ -449,6 +478,7 @@ export class LastVisitService {
         icon: result.resourceIcon,
         role: result.resourceRole,
         spaceId: result.spaceId,
+        createdBy: result.createBy,
       },
     }));
 
@@ -463,6 +493,8 @@ export class LastVisitService {
     params: IGetUserLastVisitRo
   ): Promise<IUserLastVisitVo | undefined> {
     switch (params.resourceType) {
+      case LastVisitResourceType.Space:
+        return this.spaceVisit(userId, params.parentResourceId);
       case LastVisitResourceType.Table:
         return this.tableVisit(userId, params.parentResourceId);
       case LastVisitResourceType.View:
@@ -495,7 +527,6 @@ export class LastVisitService {
         resourceType: LastVisitResourceType.Base,
         resourceId,
         parentResourceId,
-        maxRecords: 10,
       });
       return;
     }

apps/nestjs-backend/src/types/i18n.generated.ts

@@ -236,6 +236,7 @@ export type I18nTranslations = {
             "exit": string;
             "next": string;
             "previous": string;
+            "select": string;
             "continue": string;
             "export": string;
             "import": string;
@@ -837,6 +838,7 @@ export type I18nTranslations = {
             };
         };
         "trash": {
+            "spaceTrash": string;
             "type": string;
             "resetTrash": string;
             "deletedBy": string;
@@ -2657,6 +2659,10 @@ export type I18nTranslations = {
             "description": string;
             "empty": string;
         };
+        "trash": {
+            "spaceDescription": string;
+            "baseDescription": string;
+        };
         "integration": {
             "title": string;
             "description": string;
@@ -2693,6 +2699,14 @@ export type I18nTranslations = {
             "title": string;
             "description": string;
         };
+        "baseList": {
+            "allBases": string;
+            "owner": string;
+            "lastOpened": string;
+            "enter": string;
+            "noTables": string;
+            "empty": string;
+        };
     };
     "system": {
         "notFound": {

apps/nextjs-app/src/features/app/blocks/base/base-node/hooks/useBaseNode.ts

@@ -1,6 +1,6 @@
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { getBaseNodeChannel } from '@teable/core';
-import type { IBaseNodeVo } from '@teable/openapi';
+import type { IBaseNodeTreeVo, IBaseNodeVo } from '@teable/openapi';
 import { getBaseNodeTree } from '@teable/openapi';
 import { ReactQueryKeys } from '@teable/sdk/config';
 import { useConnection } from '@teable/sdk/hooks';
@@ -16,10 +16,21 @@ export const useBaseNode = (baseId: string) => {
   const channel = getBaseNodeChannel(baseId);
   const presence = connection?.getPresence(channel);
   const [nodes, setNodes] = useState<IBaseNodeVo[]>([]);
-  const [treeItems, setTreeItems] = useState<Record<string, TreeItemData>>({});
   const [shouldInvalidate, setShouldInvalidate] = useState(0);
 
   const queryClient = useQueryClient();
+
+  // Initialize treeItems from cache to avoid flash of empty state on remount
+  const [treeItems, setTreeItems] = useState<Record<string, TreeItemData>>(() => {
+    const cachedData = queryClient.getQueryData<IBaseNodeTreeVo>(
+      ReactQueryKeys.baseNodeTree(baseId)
+    );
+    if (cachedData?.nodes && cachedData.nodes.length > 0) {
+      return buildTreeItems(cachedData.nodes);
+    }
+    return {};
+  });
+
   const { data: queryData, isLoading } = useQuery({
     queryKey: ReactQueryKeys.baseNodeTree(baseId),
     queryFn: ({ queryKey }) => getBaseNodeTree(queryKey[1]).then((res) => res.data),

apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseNodeMore.tsx

@@ -64,6 +64,8 @@ interface ICommonOperationProps extends IBaseNodeMoreProps {
 
 const CommonOperation = (props: ICommonOperationProps) => {
   const {
+    open,
+    setOpen,
     onRename,
     onDuplicate,
     onDelete,
@@ -82,7 +84,7 @@ const CommonOperation = (props: ICommonOperationProps) => {
 
   return (
     <>
-      <DropdownMenu>
+      <DropdownMenu open={open} onOpenChange={setOpen}>
         <DropdownMenuTrigger asChild>
           <div>
             <MoreHorizontal className={className} />