From 30679763abce60535a2114a24938d82186506aaf Mon Sep 17 00:00:00 2001
From: DiamondThree <857159145@qq.com>
Date: Tue, 10 Jan 2023 21:59:09 +0800
Subject: [PATCH] feat: change workspaceInfo type

---
 .../app/src/components/quick-search/Input.tsx |   2 +-
 .../app/src/components/quick-search/index.tsx |   2 +-
 .../src/components/workspace-modal/index.tsx  |   2 +-
 .../workspace-setting/ExportPage.tsx          |   4 +-
 .../workspace-setting/MembersPage.tsx         |   4 +-
 .../workspace-setting/PublishPage.tsx         |   8 +-
 .../components/workspace-setting/SyncPage.tsx |   4 +-
 .../workspace-setting/general/General.tsx     |   4 +-
 .../general/delete/Delete.tsx                 |   4 +-
 .../pages/workspace/[workspaceId]/setting.tsx |   4 +-
 .../providers/app-state-provider/Provider.tsx |  19 +--
 .../providers/app-state-provider/interface.ts |   6 +-
 packages/data-center/src/index.ts             |   1 +
 .../src/workspace-meta-collection.ts          | 127 ------------------
 .../src/workspace-unit-collection.ts          |   2 +-
 15 files changed, 35 insertions(+), 158 deletions(-)
 delete mode 100644 packages/data-center/src/workspace-meta-collection.ts

diff --git a/packages/app/src/components/quick-search/Input.tsx b/packages/app/src/components/quick-search/Input.tsx
index 69d47a16a1..e12dc655b2 100644
--- a/packages/app/src/components/quick-search/Input.tsx
+++ b/packages/app/src/components/quick-search/Input.tsx
@@ -20,7 +20,7 @@ export const Input = (props: {
   const { currentWorkspaceId, workspaceList, currentWorkspace } = useAppState();
   const isPublish = workspaceList.find(
     meta => String(meta.id) === String(currentWorkspaceId)
-  )?.isPublish;
+  )?.published;
   useEffect(() => {
     inputRef.current?.addEventListener(
       'blur',
diff --git a/packages/app/src/components/quick-search/index.tsx b/packages/app/src/components/quick-search/index.tsx
index 8199493a47..1450531f5a 100644
--- a/packages/app/src/components/quick-search/index.tsx
+++ b/packages/app/src/components/quick-search/index.tsx
@@ -29,7 +29,7 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => {
   const [showCreatePage, setShowCreatePage] = useState(true);
   const { triggerQuickSearchModal } = useModal();
 
-  const isPublish = currentMetaWorkSpace?.isPublish;
+  const isPublish = currentMetaWorkSpace?.published;
 
   // Add  ‘⌘+K’ shortcut keys as switches
   useEffect(() => {
diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx
index 5380f71fc0..dbe5146c52 100644
--- a/packages/app/src/components/workspace-modal/index.tsx
+++ b/packages/app/src/components/workspace-modal/index.tsx
@@ -98,7 +98,7 @@ export const WorkspaceModal = ({ open, onClose }: WorkspaceModalProps) => {
                       {item.provider === 'affine' && (
                         <CloudInsyncIcon fontSize={24} />
                       )}
-                      {item.isPublish && <UsersIcon fontSize={24} />}
+                      {item.published && <UsersIcon fontSize={24} />}
                     </span>
                     {/* {item.isLocal ? 'isLocal' : ''}/ */}
                   </WorkspaceItem>
diff --git a/packages/app/src/components/workspace-setting/ExportPage.tsx b/packages/app/src/components/workspace-setting/ExportPage.tsx
index 3742b71a3c..e3bde461f9 100644
--- a/packages/app/src/components/workspace-setting/ExportPage.tsx
+++ b/packages/app/src/components/workspace-setting/ExportPage.tsx
@@ -1,5 +1,5 @@
 import { styled } from '@/styles';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 
 export const ExportPageTitleContainer = styled('div')(() => {
   return {
@@ -9,7 +9,7 @@ export const ExportPageTitleContainer = styled('div')(() => {
     flex: 1,
   };
 });
-export const ExportPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
+export const ExportPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   return (
     <ExportPageTitleContainer>
       Export Workspace{' '}
diff --git a/packages/app/src/components/workspace-setting/MembersPage.tsx b/packages/app/src/components/workspace-setting/MembersPage.tsx
index 32639f874f..3859bcbd26 100644
--- a/packages/app/src/components/workspace-setting/MembersPage.tsx
+++ b/packages/app/src/components/workspace-setting/MembersPage.tsx
@@ -24,13 +24,13 @@ import { Empty } from '@/ui/empty';
 //   User,
 //   Workspace,
 // } from '@/hooks/mock-data/mock';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 import { useTemporaryHelper } from '@/providers/temporary-helper-provider';
 import { StyledMemberWarp } from './general/style';
 import { useConfirm } from '@/providers/ConfirmProvider';
 
 // import { useAppState } from '@/providers/app-state-provider';
-export const MembersPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
+export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   const [isInviteModalShow, setIsInviteModalShow] = useState(false);
   const [members, setMembers] = useState<[{ name: string; email: string }]>([
     { name: 'affine', email: 'tttt' },
diff --git a/packages/app/src/components/workspace-setting/PublishPage.tsx b/packages/app/src/components/workspace-setting/PublishPage.tsx
index e931041fac..dce254dc21 100644
--- a/packages/app/src/components/workspace-setting/PublishPage.tsx
+++ b/packages/app/src/components/workspace-setting/PublishPage.tsx
@@ -12,9 +12,9 @@ import { toast } from '@/ui/toast';
 import { useConfirm } from '@/providers/ConfirmProvider';
 // import { useAppState } from '@/providers/app-state-provider3';
 import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 
-export const PublishPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
+export const PublishPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   const shareUrl =
     window.location.host + '/workspace/' + workspace.id + '?share=true';
   const { publishWorkspace } = useWorkspaceHelper();
@@ -53,7 +53,7 @@ export const PublishPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
       {workspace.provider === 'cloud' ? (
         <div>
           <StyledPublishContent>
-            {workspace?.isPublish ? (
+            {workspace?.published ? (
               <>
                 <StyledPublishExplanation>
                   Publishing to web requires AFFiNE Cloud service .
@@ -75,7 +75,7 @@ export const PublishPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
               </StyledPublishExplanation>
             )}
           </StyledPublishContent>
-          {workspace.isPublish ? (
+          {workspace.published ? (
             <Button
               onClick={() => {
                 togglePublic(false);
diff --git a/packages/app/src/components/workspace-setting/SyncPage.tsx b/packages/app/src/components/workspace-setting/SyncPage.tsx
index afd19b700f..b6884910ba 100644
--- a/packages/app/src/components/workspace-setting/SyncPage.tsx
+++ b/packages/app/src/components/workspace-setting/SyncPage.tsx
@@ -6,13 +6,13 @@ import {
 import { DownloadIcon } from '@blocksuite/icons';
 import { Button } from '@/ui/button';
 import { Menu, MenuItem } from '@/ui/menu';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
 import { useAppState } from '@/providers/app-state-provider';
 import { useConfirm } from '@/providers/ConfirmProvider';
 import { toast } from '@/ui/toast';
 import { useRouter } from 'next/router';
-export const SyncPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
+export const SyncPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   // console.log('workspace: ', workspace);
   const { enableWorkspace } = useWorkspaceHelper();
   const { currentWorkspace, user } = useAppState();
diff --git a/packages/app/src/components/workspace-setting/general/General.tsx b/packages/app/src/components/workspace-setting/general/General.tsx
index 26802b4cc1..ec541b9f11 100644
--- a/packages/app/src/components/workspace-setting/general/General.tsx
+++ b/packages/app/src/components/workspace-setting/general/General.tsx
@@ -14,9 +14,9 @@ import { WorkspaceDelete } from './delete';
 import { WorkspaceLeave } from './leave';
 import { Upload } from '@/components/file-upload';
 import { WorkspaceAvatar } from '@/components/workspace-avatar';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
-export const GeneralPage = ({ workspace }: { workspace: WorkspaceInfo }) => {
+export const GeneralPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   const [showDelete, setShowDelete] = useState<boolean>(false);
   const [showLeave, setShowLeave] = useState<boolean>(false);
   const [uploading, setUploading] = useState<boolean>(false);
diff --git a/packages/app/src/components/workspace-setting/general/delete/Delete.tsx b/packages/app/src/components/workspace-setting/general/delete/Delete.tsx
index e459addea7..9c1efb4c44 100644
--- a/packages/app/src/components/workspace-setting/general/delete/Delete.tsx
+++ b/packages/app/src/components/workspace-setting/general/delete/Delete.tsx
@@ -17,12 +17,12 @@ import {
   getWorkspaces,
   // Workspace,
 } from '@/hooks/mock-data/mock';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 
 interface WorkspaceDeleteProps {
   open: boolean;
   onClose: () => void;
-  workspace: WorkspaceInfo;
+  workspace: WorkspaceUnit;
 }
 
 export const WorkspaceDelete = ({
diff --git a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx
index 48255cab35..5d3f190207 100644
--- a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx
+++ b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx
@@ -23,14 +23,14 @@ import {
 } from '@/components/workspace-setting';
 import { useAppState } from '@/providers/app-state-provider';
 import WorkspaceLayout from '@/components/workspace-layout';
-import { WorkspaceInfo } from '@affine/datacenter';
+import { WorkspaceUnit } from '@affine/datacenter';
 
 type TabNames = 'general' | 'members' | 'publish' | 'sync' | 'export';
 
 const tabMap: {
   name: TabNames;
   icon: ReactNode;
-  panelRender: (workspace: WorkspaceInfo) => ReactNode;
+  panelRender: (workspace: WorkspaceUnit) => ReactNode;
 }[] = [
   {
     name: 'general',
diff --git a/packages/app/src/providers/app-state-provider/Provider.tsx b/packages/app/src/providers/app-state-provider/Provider.tsx
index 9c0ebdda54..9c2afcf757 100644
--- a/packages/app/src/providers/app-state-provider/Provider.tsx
+++ b/packages/app/src/providers/app-state-provider/Provider.tsx
@@ -8,7 +8,7 @@ import {
   PageMeta,
 } from './interface';
 import { createDefaultWorkspace } from './utils';
-import { WorkspaceInfo, User } from '@affine/datacenter';
+import { WorkspaceUnit, User } from '@affine/datacenter';
 
 type AppStateContextProps = PropsWithChildren<Record<string, unknown>>;
 
@@ -66,12 +66,15 @@ export const AppStateProvider = ({
   useEffect(() => {
     const { dataCenter } = appState;
     // FIXME: onWorkspacesChange should have dispose function
-    dataCenter?.onWorkspacesChange(() => {
-      setAppState({
-        ...appState,
-        workspaceList: dataCenter.workspaces,
-      });
-    });
+    dataCenter?.onWorkspacesChange(
+      () => {
+        setAppState({
+          ...appState,
+          workspaceList: dataCenter.workspaces,
+        });
+      },
+      { immediate: false }
+    );
   }, [appState]);
 
   const loadPage = useRef<AppStateFunction['loadPage']>();
@@ -100,7 +103,7 @@ export const AppStateProvider = ({
 
     const workspace = await dataCenter.loadWorkspace(workspaceId);
     const currentMetaWorkSpace = dataCenter.workspaces.find(
-      (item: WorkspaceInfo) => {
+      (item: WorkspaceUnit) => {
         return item.id === workspace.room;
       }
     );
diff --git a/packages/app/src/providers/app-state-provider/interface.ts b/packages/app/src/providers/app-state-provider/interface.ts
index de1577af75..4dd9d3db46 100644
--- a/packages/app/src/providers/app-state-provider/interface.ts
+++ b/packages/app/src/providers/app-state-provider/interface.ts
@@ -1,4 +1,4 @@
-import { DataCenter, User, WorkspaceInfo } from '@affine/datacenter';
+import { DataCenter, User, WorkspaceUnit } from '@affine/datacenter';
 import type { EditorContainer } from '@blocksuite/editor';
 
 import type {
@@ -18,9 +18,9 @@ export interface PageMeta extends StorePageMeta {
 export type AppStateValue = {
   dataCenter: DataCenter;
   user: User | null;
-  workspaceList: WorkspaceInfo[];
+  workspaceList: WorkspaceUnit[];
   currentWorkspace: StoreWorkspace | null;
-  currentMetaWorkSpace: WorkspaceInfo | null;
+  currentMetaWorkSpace: WorkspaceUnit | null;
   currentWorkspaceId: string;
   pageList: PageMeta[];
   currentPage: StorePage | null;
diff --git a/packages/data-center/src/index.ts b/packages/data-center/src/index.ts
index b0a5a7b373..fd199935fc 100644
--- a/packages/data-center/src/index.ts
+++ b/packages/data-center/src/index.ts
@@ -30,3 +30,4 @@ export type { AccessTokenMessage } from './provider/affine/apis';
 export { WorkspaceUnit } from './workspace-unit';
 export { getLogger } from './logger';
 export * from './message';
+export * from './types';
diff --git a/packages/data-center/src/workspace-meta-collection.ts b/packages/data-center/src/workspace-meta-collection.ts
deleted file mode 100644
index c50b93dcae..0000000000
--- a/packages/data-center/src/workspace-meta-collection.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { Observable } from 'lib0/observable';
-import type { WorkspaceInfo, WorkspaceMeta } from './types';
-
-export interface WorkspaceMetaCollectionScope {
-  get: (workspaceId: string) => WorkspaceInfo | undefined;
-  list: () => WorkspaceInfo[];
-  add: (workspace: WorkspaceInfo) => void;
-  remove: (workspaceId: string) => boolean;
-  clear: () => void;
-  update: (workspaceId: string, workspaceMeta: Partial<WorkspaceMeta>) => void;
-}
-
-export interface WorkspaceMetaCollectionChangeEvent {
-  added?: WorkspaceInfo;
-  deleted?: WorkspaceInfo;
-  updated?: WorkspaceInfo;
-}
-
-export class WorkspaceMetaCollection extends Observable<'change'> {
-  private _workspacesMap = new Map<string, WorkspaceInfo>();
-
-  get workspaces(): WorkspaceInfo[] {
-    return Array.from(this._workspacesMap.values());
-  }
-
-  find(workspaceId: string) {
-    return this._workspacesMap.get(workspaceId);
-  }
-
-  createScope(): WorkspaceMetaCollectionScope {
-    const scopedWorkspaceIds = new Set<string>();
-
-    const get = (workspaceId: string) => {
-      if (!scopedWorkspaceIds.has(workspaceId)) {
-        return;
-      }
-      return this._workspacesMap.get(workspaceId);
-    };
-
-    const add = (workspace: WorkspaceInfo) => {
-      if (this._workspacesMap.has(workspace.id)) {
-        throw new Error(`Duplicate workspace id.`);
-      }
-      this._workspacesMap.set(workspace.id.toString(), workspace);
-      scopedWorkspaceIds.add(workspace.id);
-
-      this.emit('change', [
-        {
-          added: workspace,
-        } as WorkspaceMetaCollectionChangeEvent,
-      ]);
-    };
-
-    const remove = (workspaceId: string) => {
-      if (!scopedWorkspaceIds.has(workspaceId)) {
-        return true;
-      }
-
-      const workspace = this._workspacesMap.get(workspaceId);
-      if (workspace) {
-        const ret = this._workspacesMap.delete(workspaceId);
-        // If deletion failed, return.
-        if (!ret) {
-          return ret;
-        }
-
-        scopedWorkspaceIds.delete(workspaceId);
-
-        this.emit('change', [
-          {
-            deleted: workspace,
-          } as WorkspaceMetaCollectionChangeEvent,
-        ]);
-      }
-      return true;
-    };
-
-    const clear = () => {
-      scopedWorkspaceIds.forEach(id => {
-        remove(id);
-      });
-    };
-
-    const update = (
-      workspaceId: string,
-      workspaceMeta: Partial<WorkspaceMeta>
-    ) => {
-      if (!scopedWorkspaceIds.has(workspaceId)) {
-        return true;
-      }
-
-      const workspace = this._workspacesMap.get(workspaceId);
-      if (!workspace) {
-        return true;
-      }
-
-      this._workspacesMap.set(workspaceId, { ...workspace, ...workspaceMeta });
-
-      this.emit('change', [
-        {
-          updated: this._workspacesMap.get(workspaceId),
-        } as WorkspaceMetaCollectionChangeEvent,
-      ]);
-    };
-
-    // TODO: need to optimize
-    const list = () => {
-      const workspaces: WorkspaceInfo[] = [];
-      scopedWorkspaceIds.forEach(id => {
-        const workspace = this._workspacesMap.get(id);
-        if (workspace) {
-          workspaces.push(workspace);
-        }
-      });
-      return workspaces;
-    };
-
-    return {
-      get,
-      list,
-      add,
-      remove,
-      clear,
-      update,
-    };
-  }
-}
diff --git a/packages/data-center/src/workspace-unit-collection.ts b/packages/data-center/src/workspace-unit-collection.ts
index 58770e2122..dee7aa78fc 100644
--- a/packages/data-center/src/workspace-unit-collection.ts
+++ b/packages/data-center/src/workspace-unit-collection.ts
@@ -65,7 +65,7 @@ export class WorkspaceUnitCollection {
       }
 
       const workspaceUnit = new WorkspaceUnit(workspace);
-      this._workspaceUnitMap.set(workspace.id, workspaceUnit);
+      this._workspaceUnitMap.set(workspace.id.toString(), workspaceUnit);
 
       scopedWorkspaceIds.add(workspace.id);