feat: filter out empty workpace in sidebar list (toeverything#7960)

fix PD-1567
XAuthSystems · Aug 28, 2024 · dde4574 · dde4574
1 parent 0668568
commit dde4574
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 9 deletions.
diff --git a/packages/backend/server/src/core/workspaces/resolvers/workspace.ts b/packages/backend/server/src/core/workspaces/resolvers/workspace.ts
@@ -94,6 +94,21 @@ export class WorkspaceResolver {
     });
   }
 
+  @ResolveField(() => Boolean, {
+    description: 'is current workspace initialized',
+    complexity: 2,
+  })
+  async initialized(@Parent() workspace: WorkspaceType) {
+    return this.prisma.snapshot
+      .count({
+        where: {
+          id: workspace.id,
+          workspaceId: workspace.id,
+        },
+      })
+      .then(count => count > 0);
+  }
+
   @ResolveField(() => UserType, {
     description: 'Owner of workspace',
     complexity: 2,

diff --git a/packages/backend/server/src/schema.gql b/packages/backend/server/src/schema.gql
@@ -893,6 +893,9 @@ type WorkspaceType {
   histories(before: DateTime, guid: String!, take: Int): [DocHistoryType!]!
   id: ID!
 
+  """is current workspace initialized"""
+  initialized: Boolean!
+
   """member count of workspace"""
   memberCount: Int!
 

diff --git a/packages/common/infra/src/modules/workspace/metadata.ts b/packages/common/infra/src/modules/workspace/metadata.ts
@@ -1,3 +1,7 @@
 import type { WorkspaceFlavour } from '@affine/env/workspace';
 
-export type WorkspaceMetadata = { id: string; flavour: WorkspaceFlavour };
+export type WorkspaceMetadata = {
+  id: string;
+  flavour: WorkspaceFlavour;
+  initialized?: boolean;
+};
diff --git a/packages/frontend/component/src/components/workspace-list/index.tsx b/packages/frontend/component/src/components/workspace-list/index.tsx
@@ -1,3 +1,4 @@
+import { WorkspaceFlavour } from '@affine/env/workspace';
 import type { WorkspaceMetadata } from '@toeverything/infra';
 import { Suspense } from 'react';
 
@@ -58,9 +59,13 @@ const SortableWorkspaceItem = ({
 export const WorkspaceList = (props: WorkspaceListProps) => {
   const workspaceList = props.items;
 
-  return workspaceList.map(item => (
-    <Suspense fallback={<WorkspaceCardSkeleton />} key={item.id}>
-      <SortableWorkspaceItem key={item.id} {...props} item={item} />
-    </Suspense>
-  ));
+  return workspaceList
+    .filter(
+      w => w.flavour !== WorkspaceFlavour.AFFINE_CLOUD || w.initialized === true
+    )
+    .map(item => (
+      <Suspense fallback={<WorkspaceCardSkeleton />} key={item.id}>
+        <SortableWorkspaceItem key={item.id} {...props} item={item} />
+      </Suspense>
+    ));
 };
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
@@ -117,7 +117,10 @@ export class CloudWorkspaceFlavourProviderService
     this.revalidate();
     await this.waitForLoaded();
 
-    return { id: workspaceId, flavour: WorkspaceFlavour.AFFINE_CLOUD };
+    return {
+      id: workspaceId,
+      flavour: WorkspaceFlavour.AFFINE_CLOUD,
+    };
   }
   revalidate = effect(
     map(() => {
@@ -138,12 +141,16 @@ export class CloudWorkspaceFlavourProviderService
             },
           });
 
-          const ids = workspaces.map(({ id }) => id);
+          const ids = workspaces.map(({ id, initialized }) => ({
+            id,
+            initialized,
+          }));
           return {
             accountId,
-            workspaces: ids.map(id => ({
+            workspaces: ids.map(({ id, initialized }) => ({
               id,
               flavour: WorkspaceFlavour.AFFINE_CLOUD,
+              initialized,
             })),
           };
         }).pipe(

diff --git a/packages/frontend/graphql/src/graphql/get-workspaces.gql b/packages/frontend/graphql/src/graphql/get-workspaces.gql
@@ -1,6 +1,7 @@
 query getWorkspaces {
   workspaces {
     id
+    initialized
     owner {
       id
     }

diff --git a/packages/frontend/graphql/src/graphql/index.ts b/packages/frontend/graphql/src/graphql/index.ts
@@ -677,6 +677,7 @@ export const getWorkspacesQuery = {
 query getWorkspaces {
   workspaces {
     id
+    initialized
     owner {
       id
     }

diff --git a/packages/frontend/graphql/src/schema.ts b/packages/frontend/graphql/src/schema.ts
@@ -1203,6 +1203,8 @@ export interface WorkspaceType {
   features: Array<FeatureType>;
   histories: Array<DocHistoryType>;
   id: Scalars['ID']['output'];
+  /** is current workspace initialized */
+  initialized: Scalars['Boolean']['output'];
   /** member count of workspace */
   memberCount: Scalars['Int']['output'];
   /** Members of workspace */
@@ -1843,6 +1845,7 @@ export type GetWorkspacesQuery = {
   workspaces: Array<{
     __typename?: 'WorkspaceType';
     id: string;
+    initialized: boolean;
     owner: { __typename?: 'UserType'; id: string };
   }>;
 };