Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-14 13:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/datacenter' of github.com:toeverything/AFFiNE into feat/datacenter

Browse Source
This commit is contained in:
QiShaoXuan
2023-01-10 21:10:03 +08:00
parent 2780beddbb 7909e03cef
commit 1bf7a4a4fe
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/app/src/hooks/use-ensure-workspace.ts
View File

@@ -7,6 +7,9 @@ export const useEnsureWorkspace = () => {
const [workspaceLoaded, setWorkspaceLoaded] = useState(false);
const { workspaceList, loadWorkspace, user } = useAppState();
const router = useRouter();
const [activeWorkspaceId, setActiveWorkspaceId] = useState(
router.query.workspaceId as string
);
// const defaultOutLineWorkspaceId = '99ce7eb7';
// console.log(defaultOutLineWorkspaceId);
@@ -35,15 +38,15 @@ export const useEnsureWorkspace = () => {
const workspaceId =
(router.query.workspaceId as string) || workspaceList[0]?.id;
loadWorkspace(workspaceId).finally(() => {
console.log('workspaceId: ', workspaceId);
setWorkspaceLoaded(true);
setActiveWorkspaceId(activeWorkspaceId);
});
}, [loadWorkspace, router, user, workspaceList]);
return {
workspaceLoaded,
activeWorkspaceId,
};
};

10
packages/app/src/pages/workspace/[workspaceId]/index.tsx
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();
}, [

1
packages/app/src/pages/workspace/index.tsx
View File

@@ -11,7 +11,6 @@ export const WorkspaceIndex = () => {
useEffect(() => {
if (workspaceLoaded) {
console.log('workspaceLoaded: ', workspaceLoaded);
router.push(`/workspace/${currentWorkspaceId}`);
}
}, [currentWorkspaceId, router, workspaceLoaded]);

6
packages/app/src/providers/app-state-provider/Provider.tsx
View File

@@ -89,22 +89,22 @@ export const AppStateProvider = ({
const loadWorkspace = useRef<AppStateFunction['loadWorkspace']>();
loadWorkspace.current = async (workspaceId: string) => {
console.log('loadWorkspace');
const { dataCenter, workspaceList, currentWorkspaceId, currentWorkspace } =
appState;
if (!workspaceList.find(v => v.id === workspaceId)) {
if (!workspaceList.find(v => v.id.toString() === workspaceId)) {
return null;
}
if (workspaceId === currentWorkspaceId) {
return currentWorkspace;
}
const workspace = await dataCenter.loadWorkspace(workspaceId);
const currentMetaWorkSpace = dataCenter.workspaces.find(
(item: WorkspaceInfo) => {
return item.id === workspace.room;
}
);
setAppState({
...appState,
currentWorkspace: workspace,