Merge branch 'feat/cloud-sync-saika' into feat/poc

packages/app/src/components/header/editor-header.tsx

@@ -22,14 +22,14 @@ export const EditorHeader = () => {
 
   useEffect(() => {
     onPropsUpdated(editor => {
-      setTitle(editor.model?.title || 'Untitled');
+      setTitle(editor.pageBlockModel?.title || 'Untitled');
     });
   }, [onPropsUpdated]);
 
   useEffect(() => {
     setTimeout(() => {
       // If first time in, need to wait for editor to be inserted into DOM
-      setTitle(editor?.model?.title || 'Untitled');
+      setTitle(editor?.pageBlockModel?.title || 'Untitled');
     }, 300);
   }, [editor]);
 

packages/app/src/components/import/index.tsx

@@ -31,9 +31,10 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => {
         setTimeout(() => {
           const editor = document.querySelector('editor-container');
           if (editor) {
-            const groupId = page.addBlock({ flavour: 'affine:group' }, pageId);
+            page.addBlock({ flavour: 'affine:surface' }, null);
+            const frameId = page.addBlock({ flavour: 'affine:frame' }, pageId);
             // TODO blocksuite should offer a method to import markdown from store
-            editor.clipboard.importMarkdown(template.source, `${groupId}`);
+            editor.clipboard.importMarkdown(template.source, `${frameId}`);
             page.resetHistory();
             editor.requestUpdate();
           }

packages/app/src/components/login-modal/LoginOptionButton.tsx

@@ -9,14 +9,14 @@ export const GoogleLoginButton = () => {
   return (
     <StyledGoogleButton
       onClick={() => {
-        getDataCenter()
-          .then(dc => dc.apis.signInWithGoogle?.())
-          .then(() => {
-            triggerLoginModal();
-          })
-          .catch(error => {
-            console.log('sign google error', error);
-          });
+        // getDataCenter()
+        //   .then(dc => dc.apis.signInWithGoogle?.())
+        //   .then(() => {
+        //     triggerLoginModal();
+        //   })
+        //   .catch(error => {
+        //     console.log('sign google error', error);
+        //   });
       }}
     >
       <ButtonWrapper>

packages/app/src/components/workspace-setting/general/leave/leave.tsx

@@ -7,7 +7,7 @@ import {
 } from './style';
 import { ModalCloseButton } from '@/ui/modal';
 import { Button } from '@/ui/button';
-import { getDataCenter } from '@affine/datacenter';
+// import { getDataCenter } from '@affine/datacenter';
 import { useAppState } from '@/providers/app-state-provider';
 
 interface WorkspaceDeleteProps {
@@ -25,10 +25,10 @@ export const WorkspaceLeave = ({
   // const router = useRouter();
   const { refreshWorkspacesMeta } = useAppState();
   const handleLeave = async () => {
-    const dc = await getDataCenter();
-    await dc.apis.leaveWorkspace({ id: workspaceId });
-    // router.push(`/workspace/${nextWorkSpaceId}`);
-    refreshWorkspacesMeta();
+    // const dc = await getDataCenter();
+    // await dc.apis.leaveWorkspace({ id: workspaceId });
+    // // router.push(`/workspace/${nextWorkSpaceId}`);
+    // refreshWorkspacesMeta();
     onClose();
   };
 

packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx

@@ -53,9 +53,9 @@ export const SelectorPopperContent = ({
           if (type === WorkspaceType.Private) {
             return { id, member_count: 1, owner: user };
           } else {
-            const dc = await getDataCenter();
-            const data = await dc.apis.getWorkspaceDetail({ id });
-            return { id, ...data } || { id, member_count: 0, owner: user };
+            // const dc = await getDataCenter();
+            // const data = await dc.apis.getWorkspaceDetail({ id });
+            // return { id, ...data } || { id, member_count: 0, owner: user };
           }
         }
       })

packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceItem/CreateWorkspaceItem/workspace-create/workspace-create.tsx

@@ -52,10 +52,10 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => {
         ctx.fillText(workspaceName[0], 50, 50);
         canvas.toBlob(blob => {
           if (blob) {
-            const blobId = getDataCenter().then(dc =>
-              dc.apis.uploadBlob({ blob })
-            );
-            resolve(blobId);
+            // const blobId = getDataCenter().then(dc =>
+            //   dc.apis.uploadBlob({ blob })
+            // );
+            // resolve(blobId);
           } else {
             reject();
           }
@@ -71,23 +71,23 @@ export const WorkspaceCreate = ({ open, onClose }: WorkspaceCreateProps) => {
       setCreating(false);
     });
     if (blobId) {
-      getDataCenter()
-        .then(dc =>
-          dc.apis.createWorkspace({ name: workspaceName, avatar: blobId })
-        )
-        .then(async data => {
-          await refreshWorkspacesMeta();
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          router.push(`/workspace/${data.id}`);
-          onClose();
-        })
-        .catch(err => {
-          console.log(err, 'err');
-        })
-        .finally(() => {
-          setCreating(false);
-        });
+      // getDataCenter()
+      //   .then(dc =>
+      //     dc.apis.createWorkspace({ name: workspaceName, avatar: blobId })
+      //   )
+      //   .then(async data => {
+      //     await refreshWorkspacesMeta();
+      //     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      //     // @ts-ignore
+      //     router.push(`/workspace/${data.id}`);
+      //     onClose();
+      //   })
+      //   .catch(err => {
+      //     console.log(err, 'err');
+      //   })
+      //   .finally(() => {
+      //     setCreating(false);
+      //   });
     }
   };
   return (

packages/app/src/components/workspace-slider-bar/index.tsx

@@ -4,14 +4,14 @@ import {
   StyledArrowButton,
   StyledLink,
   StyledListItem,
-  StyledListItemForWorkspace,
+  // StyledListItemForWorkspace,
   StyledNewPageButton,
   StyledSliderBar,
   StyledSliderBarWrapper,
   StyledSubListItem,
 } from './style';
 import { Arrow } from './icons';
-import { WorkspaceSelector } from './WorkspaceSelector';
+// import { WorkspaceSelector } from './WorkspaceSelector';
 import Collapse from '@mui/material/Collapse';
 import {
   ArrowDownIcon,
@@ -113,9 +113,9 @@ export const WorkSpaceSliderBar = () => {
         </Tooltip>
 
         <StyledSliderBarWrapper data-testid="sliderBar">
-          <StyledListItemForWorkspace>
+          {/* <StyledListItemForWorkspace>
             <WorkspaceSelector />
-          </StyledListItemForWorkspace>
+          </StyledListItemForWorkspace> */}
           <StyledListItem
             data-testid="sliderBar-quickSearchButton"
             style={{ cursor: 'pointer' }}