refactor: rootWorkspacesMetadataAtom loading logic (#2882)

apps/web/src/hooks/__tests__/index.spec.tsx

@@ -5,8 +5,12 @@ import 'fake-indexeddb/auto';
 
 import assert from 'node:assert';
 
+import type { WorkspaceAdapter } from '@affine/env/workspace';
 import { WorkspaceFlavour, WorkspaceSubPath } from '@affine/env/workspace';
-import { rootCurrentWorkspaceIdAtom } from '@affine/workspace/atom';
+import {
+  rootCurrentWorkspaceIdAtom,
+  workspaceAdaptersAtom,
+} from '@affine/workspace/atom';
 import type { PageBlockModel } from '@blocksuite/blocks';
 import { __unstableSchemas, AffineSchemas } from '@blocksuite/blocks/models';
 import type { Page } from '@blocksuite/store';
@@ -22,6 +26,7 @@ import { createDynamicRouteParser } from 'next-router-mock/dynamic-routes';
 import type React from 'react';
 import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
 
+import { WorkspaceAdapters } from '../../adapters/workspace';
 import { workspacesAtom } from '../../atoms';
 import { rootCurrentWorkspaceAtom } from '../../atoms/root';
 import { BlockSuiteWorkspace } from '../../shared';
@@ -53,12 +58,19 @@ beforeEach(() => {
 
 async function getJotaiContext() {
   const store = createStore();
+  store.set(
+    workspaceAdaptersAtom,
+    WorkspaceAdapters as Record<
+      WorkspaceFlavour,
+      WorkspaceAdapter<WorkspaceFlavour>
+    >
+  );
   const ProviderWrapper: React.FC<React.PropsWithChildren> =
     function ProviderWrapper({ children }) {
       return <Provider store={store}>{children}</Provider>;
     };
   const workspaces = await store.get(workspacesAtom);
-  expect(workspaces.length).toBe(0);
+  expect(workspaces.length).toBe(1);
   return {
     store,
     ProviderWrapper,
@@ -182,7 +194,13 @@ describe('useWorkspaces', () => {
     const { result } = renderHook(() => useWorkspaces(), {
       wrapper: ProviderWrapper,
     });
-    expect(result.current).toEqual([]);
+    expect(result.current).toEqual([
+      {
+        id: expect.stringContaining(''),
+        flavour: WorkspaceFlavour.LOCAL,
+        blockSuiteWorkspace: expect.anything(),
+      },
+    ]);
   });
 
   test('mutation', async () => {
@@ -192,20 +210,20 @@ describe('useWorkspaces', () => {
     });
     {
       const workspaces = await store.get(workspacesAtom);
-      expect(workspaces.length).toEqual(0);
+      expect(workspaces.length).toEqual(1);
     }
     await result.current.createLocalWorkspace('test');
     {
       const workspaces = await store.get(workspacesAtom);
-      expect(workspaces.length).toEqual(1);
+      expect(workspaces.length).toEqual(2);
     }
     const { result: result2 } = renderHook(() => useWorkspaces(), {
       wrapper: ProviderWrapper,
     });
-    expect(result2.current.length).toEqual(1);
-    const firstWorkspace = result2.current[0];
-    expect(firstWorkspace.flavour).toBe('local');
-    assert(firstWorkspace.flavour === WorkspaceFlavour.LOCAL);
-    expect(firstWorkspace.blockSuiteWorkspace.meta.name).toBe('test');
+    expect(result2.current.length).toEqual(2);
+    const secondWorkspace = result2.current[1];
+    expect(secondWorkspace.flavour).toBe('local');
+    assert(secondWorkspace.flavour === WorkspaceFlavour.LOCAL);
+    expect(secondWorkspace.blockSuiteWorkspace.meta.name).toBe('test');
   });
 });

apps/web/src/hooks/affine/use-toggle-workspace-publish.ts

@@ -19,7 +19,7 @@ export function useToggleWorkspacePublish(
       });
       await mutate(QueryKey.getWorkspaces);
       // fixme: remove force update
-      rootStore.set(rootWorkspacesMetadataAtom, ws => [...ws]);
+      await rootStore.set(rootWorkspacesMetadataAtom, ws => [...ws]);
     },
     [mutate, workspace.id]
   );

apps/web/src/hooks/use-transform-workspace.ts

@@ -25,7 +25,7 @@ export function useTransformWorkspace() {
         workspace.blockSuiteWorkspace
       );
       await WorkspaceAdapters[from].CRUD.delete(workspace as any);
-      set(workspaces => {
+      await set(workspaces => {
         const idx = workspaces.findIndex(ws => ws.id === workspace.id);
         workspaces.splice(idx, 1, {
           id: newId,

apps/web/src/hooks/use-workspaces.ts

@@ -29,7 +29,7 @@ export function useAppHelper() {
     addLocalWorkspace: useCallback(
       async (workspaceId: string): Promise<string> => {
         saveWorkspaceToLocalStorage(workspaceId);
-        set(workspaces => [
+        await set(workspaces => [
           ...workspaces,
           {
             id: workspaceId,
@@ -50,7 +50,7 @@ export function useAppHelper() {
         );
         blockSuiteWorkspace.meta.setName(name);
         const id = await LocalAdapter.CRUD.create(blockSuiteWorkspace);
-        set(workspaces => [
+        await set(workspaces => [
           ...workspaces,
           {
             id,
@@ -79,7 +79,7 @@ export function useAppHelper() {
           targetWorkspace as any
         );
         // delete workspace from jotai storage
-        set(workspaces => workspaces.filter(ws => ws.id !== workspaceId));
+        await set(workspaces => workspaces.filter(ws => ws.id !== workspaceId));
       },
       [jotaiWorkspaces, set, workspaces]
     ),