luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: deepscan error (#733)

Browse Source
This commit is contained in:
zuomeng wang
2023-01-13 15:54:21 +08:00
committed by GitHub
parent ba9a57d4ae
commit 21d24ad542
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/components/editor/index.tsx
View File

@@ -60,7 +60,7 @@ export const Editor = ({ page, workspace, setEditor }: Props) => {
} }
setEditor(editor); setEditor(editor);
document.title = page?.meta.title || 'Untitled'; document.title = page.meta.title || 'Untitled';
return ret; return ret;
}, [workspace, page, setEditor]); }, [workspace, page, setEditor]);

2
packages/app/src/pages/public-workspace/[workspaceId]/[pageId].tsx
View File

@@ -25,7 +25,7 @@ const Page: NextPageWithLayout = () => {
p => p.id === router.query.pageId p => p.id === router.query.pageId
) )
) { ) {
const page = data.blocksuiteWorkspace?.getPage( const page = data.blocksuiteWorkspace.getPage(
router.query.pageId as string router.query.pageId as string
); );
page && setPage(page); page && setPage(page);

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

@@ -101,14 +101,15 @@ export const AppStateProvider = ({
} }
const workspace = (await dataCenter.loadWorkspace(workspaceId)) ?? null; const workspace = (await dataCenter.loadWorkspace(workspaceId)) ?? null;
let isOwner; let isOwner;
if (workspace.provider === 'local') { if (workspace?.provider === 'local') {
// isOwner is useful only in the cloud // isOwner is useful only in the cloud
isOwner = true; isOwner = true;
} else { } else {
isOwner = workspace.owner && user?.id === workspace.owner.id; // We must ensure workspace.owner exists, then ensure id same.
isOwner = workspace?.owner && user?.id === workspace.owner.id;
} }
const pageList = const pageList =
(workspace.blocksuiteWorkspace?.meta.pageMetas as PageMeta[]) ?? []; (workspace?.blocksuiteWorkspace?.meta.pageMetas as PageMeta[]) ?? [];
setAppState({ setAppState({
...appState, ...appState,
currentWorkspace: workspace, currentWorkspace: workspace,

4
packages/data-center/src/datacenter.ts
View File

@@ -150,7 +150,9 @@ export class DataCenter {
* @param {string} workspaceId workspace id * @param {string} workspaceId workspace id
* @returns {Promise<WorkspaceUnit>} * @returns {Promise<WorkspaceUnit>}
*/ */
public async loadWorkspace(workspaceId: string) { public async loadWorkspace(
workspaceId: string
): Promise<WorkspaceUnit | null> {
const workspaceUnit = this._workspaceUnitCollection.find(workspaceId); const workspaceUnit = this._workspaceUnitCollection.find(workspaceId);
assert(workspaceUnit, 'Workspace not found'); assert(workspaceUnit, 'Workspace not found');
const currentProvider = this.providerMap.get(workspaceUnit.provider); const currentProvider = this.providerMap.get(workspaceUnit.provider);