Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-10 21:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: switch workspace

Browse Source
This commit is contained in:
alt0
2022-12-22 23:19:53 +08:00
parent e1ca69aaf9
commit 2665d0c5cd
4 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/pages/workspace/[workspaceId]/index.tsx
+3 -8
View File
@@ -1,13 +1,12 @@
import React, { ReactElement, useEffect } from 'react';
import { useEffect } from 'react';
import { useRouter } from 'next/router';
import { useAppState } from '@/providers/app-state-provider/context';
import { useLoadWorkspace } from '@/providers/app-state-provider/hooks';
import WorkspaceLayout from '@/components/workspace-layout';
import { useInitWorkspace } from '@/hooks/use-init-workspace';
const WorkspaceIndex = () => {
const router = useRouter();
const workspace = useLoadWorkspace();
const { createPage, currentWorkspaceId } = useAppState();
const { workspace } = useInitWorkspace();
useEffect(() => {
const initPage = async () => {
@@ -29,8 +28,4 @@ const WorkspaceIndex = () => {
return <></>;
};
WorkspaceIndex.getLayout = function getLayout(page: ReactElement) {
return <WorkspaceLayout>{page}</WorkspaceLayout>;
};
export default WorkspaceIndex;
packages/app/src/pages/workspace/index.tsx
+8 -11
View File
@@ -1,21 +1,18 @@
import React, { ReactElement, useEffect } from 'react';
import WorkspaceLayout from '@/components/workspace-layout';
import { useAppState } from '@/providers/app-state-provider';
import { useEffect } from 'react';
import { useRouter } from 'next/router';
import { useInitWorkspace } from '@/hooks/use-init-workspace';
export const WorkspaceIndex = () => {
const router = useRouter();
const { currentWorkspaceId } = useAppState();
const { workspaceId, workspace } = useInitWorkspace();
useEffect(() => {
if (currentWorkspaceId) {
router.replace(`/workspace/${currentWorkspaceId}`);
if (workspace) {
router.push(`/workspace/${workspaceId}`);
}
}, [currentWorkspaceId, router]);
}, [workspace, workspaceId]);
return <></>;
};
WorkspaceIndex.getLayout = function getLayout(page: ReactElement) {
return <WorkspaceLayout>{page}</WorkspaceLayout>;
};
export default WorkspaceIndex;