Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-23 05:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure return activeWorkspaceId

Browse Source
This commit is contained in:
DiamondThree
2023-01-10 21:08:28 +08:00
parent f1ea2ee691
commit ed46eb58fd
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/pages/workspace/[workspaceId]/index.tsx
+5 -5
View File
@@ -9,23 +9,23 @@ const WorkspaceIndex = () => {
const router = useRouter();
const { currentWorkspaceId, currentWorkspace } = useAppState();
const { createPage } = usePageHelper();
const { workspaceLoaded } = useEnsureWorkspace();
console.log('workspaceLoaded: ', workspaceLoaded);
const { workspaceLoaded, activeWorkspaceId } = useEnsureWorkspace();
useEffect(() => {
const initPage = async () => {
if (!workspaceLoaded) {
return;
}
const savedPageId = currentWorkspace?.meta.pageMetas[0]?.id;
console.log('savedPageId: ', savedPageId);
if (savedPageId) {
router.replace(`/workspace/${currentWorkspaceId}/${savedPageId}`);
router.replace(`/workspace/${activeWorkspaceId}/${savedPageId}`);
return;
}
const pageId = await createPage();
router.replace(`/workspace/${currentWorkspaceId}/${pageId}`);
router.replace(`/workspace/${activeWorkspaceId}/${pageId}`);
};
initPage();
}, [
packages/app/src/pages/workspace/index.tsx
-1
View File
@@ -11,7 +11,6 @@ export const WorkspaceIndex = () => {
useEffect(() => {
if (workspaceLoaded) {
console.log('workspaceLoaded: ', workspaceLoaded);
router.push(`/workspace/${currentWorkspaceId}`);
}
}, [currentWorkspaceId, router, workspaceLoaded]);