feat: space layout

Author: younocode

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,8 @@ export class BaseService {
         order: true,
         spaceId: true,
         icon: true,
+        createdBy: true,
+        lastModifiedTime: true,
       },
       where: {
         deletedTime: null,
@@ -122,9 +127,24 @@ export class BaseService {
       },
       orderBy: [{ spaceId: 'asc' }, { order: 'asc' }],
     });
+
+    const createUserList = 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');
+
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      return { ...base, role };
+      const createUser = createUserMap[base.createdBy];
+      return {
+        ...base,
+        role,
+        createdUser: {
+          ...createUser,
+          avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.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,8 @@ export class SpaceService {
         order: true,
         spaceId: true,
         icon: true,
+        createdBy: true,
+        lastModifiedTime: true,
       },
       where: {
         spaceId,
@@ -277,9 +279,23 @@ export class SpaceService {
       },
     });
 
+    const createUserList = 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');
+
     return baseList.map((base) => {
       const role = roleMap[base.id] || roleMap[base.spaceId];
-      return { ...base, role };
+      const createUser = createUserMap[base.createdBy];
+      return {
+        ...base,
+        role,
+        createdUser: {
+          ...createUser,
+          avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.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,10 +150,10 @@ 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 spaceIds = spaceId ? [spaceId] : bases.map((base) => base.spaceId);
     const baseIdMap = keyBy(bases, 'id');
 
     const trashedSpaces = await this.prismaService.trash.findMany({

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

@@ -241,6 +241,7 @@ export type I18nTranslations = {
             "import": string;
             "expand": string;
             "deleteTip": string;
+            "select": string;
         };
         "quickAction": {
             "title": string;
@@ -846,6 +847,7 @@ export type I18nTranslations = {
             "resetTrashConfirm": string;
             "addToTrash": string;
             "description": string;
+            "spaceTrash": string;
         };
         "pluginCenter": {
             "pluginUrlEmpty": string;
@@ -2693,6 +2695,14 @@ export type I18nTranslations = {
             "title": string;
             "description": string;
         };
+        "baseList": {
+            "allBases": string;
+            "owner": string;
+            "lastOpened": string;
+            "enter": string;
+            "noTables": string;
+            "empty": string;
+        };
     };
     "system": {
         "notFound": {