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

fix: add judgement of currentWorkspace

Browse Source
This commit is contained in:
QiShaoXuan
2023-01-10 20:42:00 +08:00
parent f1ea2ee691
commit b86a03642a
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app/src/components/workspace-setting/SyncPage.tsx
View File

@@ -40,7 +40,7 @@ export const SyncPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
confirmText: user ? 'Enable' : 'Sign in and Enable', confirmText: user ? 'Enable' : 'Sign in and Enable',
cancelText: 'Skip', cancelText: 'Skip',
}).then(async confirm => { }).then(async confirm => {
if (confirm) { if (confirm && currentWorkspace) {
// if (user) { // if (user) {
// await login(); // await login();
// } // }

3
packages/app/src/components/workspace-setting/general/General.tsx
View File

@@ -42,6 +42,7 @@ export const GeneralPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
}; };
const handleUpdateWorkspaceName = () => { const handleUpdateWorkspaceName = () => {
console.log('currentWorkspace: ', currentWorkspace); console.log('currentWorkspace: ', currentWorkspace);
currentWorkspace &&
updateWorkspace({ name: workspaceName }, currentWorkspace); updateWorkspace({ name: workspaceName }, currentWorkspace);
}; };
@@ -49,7 +50,7 @@ export const GeneralPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
// console.log('file: ', file); // console.log('file: ', file);
// setUploading(true); // setUploading(true);
const blob = new Blob([file], { type: file.type }); const blob = new Blob([file], { type: file.type });
updateWorkspace({ avatarBlob: blob }, currentWorkspace); currentWorkspace && updateWorkspace({ avatarBlob: blob }, currentWorkspace);
}; };
return workspace ? ( return workspace ? (

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

@@ -31,7 +31,7 @@ const Page: NextPageWithLayout = () => {
<EditorHeader /> <EditorHeader />
<MobileModal /> <MobileModal />
{currentPage && ( {currentPage && currentWorkspace && (
<DynamicBlocksuite <DynamicBlocksuite
page={currentPage} page={currentPage}
workspace={currentWorkspace} workspace={currentWorkspace}