From 3be4e4015eb0c057fd2b4c3e95e6d4590dd8306a Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Tue, 10 Jan 2023 20:08:31 +0800 Subject: [PATCH] feat: enable workspace cloud --- packages/app/src/hooks/use-ensure-workspace.ts | 2 +- packages/app/src/pages/workspace/[workspaceId]/index.tsx | 2 ++ packages/app/src/pages/workspace/index.tsx | 1 + packages/app/src/providers/app-state-provider/Provider.tsx | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/app/src/hooks/use-ensure-workspace.ts b/packages/app/src/hooks/use-ensure-workspace.ts index 205443aeed..93140dd923 100644 --- a/packages/app/src/hooks/use-ensure-workspace.ts +++ b/packages/app/src/hooks/use-ensure-workspace.ts @@ -8,7 +8,6 @@ const defaultOutLineWorkspaceId = 'affine'; export const useEnsureWorkspace = () => { const [workspaceLoaded, setWorkspaceLoaded] = useState(false); const { workspaceList, loadWorkspace, user } = useAppState(); - console.log('workspaceList: ', workspaceList); const router = useRouter(); // const defaultOutLineWorkspaceId = '99ce7eb7'; @@ -41,6 +40,7 @@ export const useEnsureWorkspace = () => { : (router.query.workspaceId as string) || defaultOutLineWorkspaceId; loadWorkspace(workspaceId).finally(() => { + console.log('workspaceId: ', workspaceId); setWorkspaceLoaded(true); }); }, [loadWorkspace, router, user, workspaceList]); diff --git a/packages/app/src/pages/workspace/[workspaceId]/index.tsx b/packages/app/src/pages/workspace/[workspaceId]/index.tsx index d502f57980..37144ff7c8 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/index.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/index.tsx @@ -10,6 +10,7 @@ const WorkspaceIndex = () => { const { currentWorkspaceId, currentWorkspace } = useAppState(); const { createPage } = usePageHelper(); const { workspaceLoaded } = useEnsureWorkspace(); + console.log('workspaceLoaded: ', workspaceLoaded); useEffect(() => { const initPage = async () => { @@ -17,6 +18,7 @@ const WorkspaceIndex = () => { return; } const savedPageId = currentWorkspace?.meta.pageMetas[0]?.id; + console.log('savedPageId: ', savedPageId); if (savedPageId) { router.replace(`/workspace/${currentWorkspaceId}/${savedPageId}`); return; diff --git a/packages/app/src/pages/workspace/index.tsx b/packages/app/src/pages/workspace/index.tsx index 1fe3ba2c17..145e47e89d 100644 --- a/packages/app/src/pages/workspace/index.tsx +++ b/packages/app/src/pages/workspace/index.tsx @@ -11,6 +11,7 @@ export const WorkspaceIndex = () => { useEffect(() => { if (workspaceLoaded) { + console.log('workspaceLoaded: ', workspaceLoaded); router.push(`/workspace/${currentWorkspaceId}`); } }, [currentWorkspaceId, router, workspaceLoaded]); diff --git a/packages/app/src/providers/app-state-provider/Provider.tsx b/packages/app/src/providers/app-state-provider/Provider.tsx index 2c85e560e7..40a3f8775b 100644 --- a/packages/app/src/providers/app-state-provider/Provider.tsx +++ b/packages/app/src/providers/app-state-provider/Provider.tsx @@ -28,6 +28,7 @@ export const AppStateProvider = ({ if (dataCenter.workspaces.length === 0) { await createDefaultWorkspace(dataCenter); } + const currentWorkspace = await dataCenter.loadWorkspace( dataCenter.workspaces[0].id );