diff --git a/packages/app/src/components/workspace-setting/SyncPage.tsx b/packages/app/src/components/workspace-setting/SyncPage.tsx index a93074a8ee..6c15773d99 100644 --- a/packages/app/src/components/workspace-setting/SyncPage.tsx +++ b/packages/app/src/components/workspace-setting/SyncPage.tsx @@ -12,12 +12,14 @@ import { useAppState } from '@/providers/app-state-provider'; import { useConfirm } from '@/providers/ConfirmProvider'; import { toast } from '@/ui/toast'; import { useUserHelper } from '@/hooks/use-user-helper'; +import { useRouter } from 'next/router'; export const SyncPage = ({ workspace }: { workspace: WorkspaceInfo }) => { // console.log('workspace: ', workspace); const { enableWorkspace } = useWorkspaceHelper(); const { currentWorkspace } = useAppState(); const { confirm } = useConfirm(); const { user, login } = useUserHelper(); + const router = useRouter(); return (
@@ -42,7 +44,8 @@ export const SyncPage = ({ workspace }: { workspace: WorkspaceInfo }) => { // if (user) { // await login(); // } - await enableWorkspace(currentWorkspace); + const id = await enableWorkspace(currentWorkspace); + router.push(`/workspace/${id}`); toast('Enabled success'); } }); diff --git a/packages/app/src/hooks/use-ensure-workspace.ts b/packages/app/src/hooks/use-ensure-workspace.ts index 9412379008..205443aeed 100644 --- a/packages/app/src/hooks/use-ensure-workspace.ts +++ b/packages/app/src/hooks/use-ensure-workspace.ts @@ -8,6 +8,7 @@ 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'; diff --git a/packages/app/src/hooks/use-workspace-helper.ts b/packages/app/src/hooks/use-workspace-helper.ts index e282421891..4d6493a252 100644 --- a/packages/app/src/hooks/use-workspace-helper.ts +++ b/packages/app/src/hooks/use-workspace-helper.ts @@ -33,8 +33,9 @@ export const useWorkspaceHelper = () => { }; const enableWorkspace = async (workspace: Workspace) => { - const newWorkspace = await dataCenter.enableWorkspaceCloud(workspace); - console.log('newWorkspace: ', newWorkspace); + const newWorkspaceId = await dataCenter.enableWorkspaceCloud(workspace); + // console.log('newWorkspace: ', newWorkspace); + return newWorkspaceId; }; return { createWorkspace, diff --git a/packages/app/src/pages/404.tsx b/packages/app/src/pages/404.tsx index 87ab0471be..74f25f07ed 100644 --- a/packages/app/src/pages/404.tsx +++ b/packages/app/src/pages/404.tsx @@ -1,4 +1,9 @@ import NotfoundPage from '@/components/404'; +import { useAppState } from '@/providers/app-state-provider'; + export default function Custom404() { + const { workspaceList } = useAppState(); + console.log('workspaceList: ', workspaceList); + return ; }