feat: add createdTime field to service responses and update sorting logic in BaseList component

Author: younocode

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

@@ -105,6 +105,7 @@ export class BaseService {
         spaceId: true,
         icon: true,
         createdBy: true,
+        createdTime: true,
         lastModifiedTime: true,
       },
       where: {
@@ -141,6 +142,7 @@ export class BaseService {
         ...base,
         role,
         lastModifiedTime: base.lastModifiedTime?.toISOString(),
+        createdTime: base.createdTime?.toISOString(),
         createdUser: {
           ...createUser,
           avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),

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

@@ -839,6 +839,7 @@ export class CollaboratorService {
       spaceName: base.space?.name,
       collaboratorType: CollaboratorType.Base,
       lastModifiedTime: base.lastModifiedTime?.toISOString(),
+      createdTime: base.createdTime?.toISOString(),
       createdBy: base.createdBy,
       createdUser: {
         id: base.createdBy,

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

@@ -269,6 +269,7 @@ export class SpaceService {
         icon: true,
         createdBy: true,
         lastModifiedTime: true,
+        createdTime: true,
       },
       where: {
         spaceId,
@@ -292,6 +293,7 @@ export class SpaceService {
         ...base,
         role,
         lastModifiedTime: base.lastModifiedTime?.toISOString(),
+        createdTime: base.createdTime?.toISOString(),
         createdUser: {
           ...createUser,
           avatar: createUser?.avatar && getPublicFullStorageUrl(createUser.avatar),

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

@@ -45,18 +45,31 @@ export const BaseList = (props: IBaseListProps) => {
       };
     });
 
+    /**
+     * 1. Both have lastVisitTime: compare by lastVisitTime (recent first)
+     * 2. One has lastVisitTime: prioritize the one with lastVisitTime
+     * 3. Both have lastModifiedTime: compare by lastModifiedTime (recent first)
+     * 4. One has lastModifiedTime: prioritize the one with lastModifiedTime
+     * 5. Finally, sort by createdTime (recent first)
+     */
     return withTime.sort((a, b) => {
-      const aTime = a.lastVisitTime
-        ? new Date(a.lastVisitTime).getTime()
-        : a.lastModifiedTime
-          ? new Date(a.lastModifiedTime).getTime()
-          : Number.NEGATIVE_INFINITY;
-      const bTime = b.lastVisitTime
-        ? new Date(b.lastVisitTime).getTime()
-        : b.lastModifiedTime
-          ? new Date(b.lastModifiedTime).getTime()
-          : Number.NEGATIVE_INFINITY;
-      return bTime - aTime;
+      if (a.lastVisitTime && b.lastVisitTime) {
+        return new Date(b.lastVisitTime).getTime() - new Date(a.lastVisitTime).getTime();
+      }
+
+      if (a.lastVisitTime && !b.lastVisitTime) return -1;
+      if (!a.lastVisitTime && b.lastVisitTime) return 1;
+
+      if (a.lastModifiedTime && b.lastModifiedTime) {
+        return new Date(b.lastModifiedTime).getTime() - new Date(a.lastModifiedTime).getTime();
+      }
+
+      if (a.lastModifiedTime && !b.lastModifiedTime) return -1;
+      if (!a.lastModifiedTime && b.lastModifiedTime) return 1;
+
+      const aCreated = a.createdTime ? new Date(a.createdTime).getTime() : 0;
+      const bCreated = b.createdTime ? new Date(b.createdTime).getTime() : 0;
+      return bCreated - aCreated;
     });
   }, [baseIds, allBaseMap, lastVisitBaseMap]);
 

packages/openapi/src/base/get.ts

@@ -17,6 +17,7 @@ export const getBaseItemSchema = z.object({
   restrictedAuthority: z.boolean().optional(),
   enabledAuthority: z.boolean().optional(),
   lastModifiedTime: z.string().nullable().optional(),
+  createdTime: z.string().nullable().optional(),
   createdBy: z.string(),
   createdUser: z
     .object({