fix: logic after delete all workspaces (#2587)

Co-authored-by: JimmFly <yangjinfei001@gmail.com>

apps/web/src/providers/modal-provider.tsx

@@ -1,14 +1,16 @@
 import { getEnvironment } from '@affine/env';
-import { rootWorkspacesMetadataAtom } from '@affine/workspace/atom';
+import {
+  rootCurrentWorkspaceIdAtom,
+  rootWorkspacesMetadataAtom,
+} from '@affine/workspace/atom';
 import { WorkspaceSubPath } from '@affine/workspace/type';
 import { arrayMove } from '@dnd-kit/sortable';
-import { useAtom, useAtomValue, useSetAtom } from 'jotai';
+import { useAtom, useSetAtom } from 'jotai';
 import { useRouter } from 'next/router';
 import type { ReactElement } from 'react';
 import { lazy, Suspense, useCallback, useTransition } from 'react';
 
 import {
-  currentWorkspaceIdAtom,
   openCreateWorkspaceModalAtom,
   openDisableCloudAlertModalAtom,
   openOnboardingModalAtom,
@@ -17,7 +19,6 @@ import {
 import { useAffineLogIn } from '../hooks/affine/use-affine-log-in';
 import { useAffineLogOut } from '../hooks/affine/use-affine-log-out';
 import { useCurrentUser } from '../hooks/current/use-current-user';
-import { useCurrentWorkspace } from '../hooks/current/use-current-workspace';
 import { useRouterHelper } from '../hooks/use-router-helper';
 import { useWorkspaces } from '../hooks/use-workspaces';
 
@@ -47,14 +48,7 @@ const OnboardingModal = lazy(() =>
   }))
 );
 
-export function Modals() {
-  const [openWorkspacesModal, setOpenWorkspacesModal] = useAtom(
-    openWorkspacesModalAtom
-  );
-  const [openCreateWorkspaceModal, setOpenCreateWorkspaceModal] = useAtom(
-    openCreateWorkspaceModalAtom
-  );
-
+export function CurrentWorkspaceModals() {
   const [openDisableCloudAlertModal, setOpenDisableCloudAlertModal] = useAtom(
     openDisableCloudAlertModalAtom
   );
@@ -62,14 +56,6 @@ export function Modals() {
     openOnboardingModalAtom
   );
 
-  const router = useRouter();
-  const { jumpToSubPath } = useRouterHelper(router);
-  const user = useCurrentUser();
-  const workspaces = useWorkspaces();
-  const setWorkspaces = useSetAtom(rootWorkspacesMetadataAtom);
-  const currentWorkspaceId = useAtomValue(currentWorkspaceIdAtom);
-  const [, setCurrentWorkspace] = useCurrentWorkspace();
-  const [transitioning, transition] = useTransition();
   const env = getEnvironment();
   const onCloseOnboardingModal = useCallback(() => {
     setOpenOnboardingModal(false);
@@ -92,14 +78,39 @@ export function Modals() {
           />
         </Suspense>
       )}
+    </>
+  );
+}
 
+export const AllWorkspaceModals = (): ReactElement => {
+  const [openWorkspacesModal, setOpenWorkspacesModal] = useAtom(
+    openWorkspacesModalAtom
+  );
+  const [isOpenCreateWorkspaceModal, setOpenCreateWorkspaceModal] = useAtom(
+    openCreateWorkspaceModalAtom
+  );
+
+  const router = useRouter();
+  const { jumpToSubPath } = useRouterHelper(router);
+  const user = useCurrentUser();
+  const workspaces = useWorkspaces();
+  const setWorkspaces = useSetAtom(rootWorkspacesMetadataAtom);
+  const [currentWorkspaceId, setCurrentWorkspaceId] = useAtom(
+    rootCurrentWorkspaceIdAtom
+  );
+  const [transitioning, transition] = useTransition();
+  return (
+    <>
       <Suspense>
         <WorkspaceListModal
           disabled={transitioning}
           user={user}
           workspaces={workspaces}
           currentWorkspaceId={currentWorkspaceId}
-          open={openWorkspacesModal || workspaces.length === 0}
+          open={
+            (openWorkspacesModal || workspaces.length === 0) &&
+            isOpenCreateWorkspaceModal === false
+          }
           onClose={useCallback(() => {
             setOpenWorkspacesModal(false);
           }, [setOpenWorkspacesModal])}
@@ -118,18 +129,18 @@ export function Modals() {
           onClickWorkspace={useCallback(
             workspace => {
               setOpenWorkspacesModal(false);
-              setCurrentWorkspace(workspace.id);
+              setCurrentWorkspaceId(workspace.id);
               jumpToSubPath(workspace.id, WorkspaceSubPath.ALL);
             },
-            [jumpToSubPath, setCurrentWorkspace, setOpenWorkspacesModal]
+            [jumpToSubPath, setCurrentWorkspaceId, setOpenWorkspacesModal]
           )}
           onClickWorkspaceSetting={useCallback(
             workspace => {
               setOpenWorkspacesModal(false);
-              setCurrentWorkspace(workspace.id);
+              setCurrentWorkspaceId(workspace.id);
               jumpToSubPath(workspace.id, WorkspaceSubPath.SETTING);
             },
-            [jumpToSubPath, setCurrentWorkspace, setOpenWorkspacesModal]
+            [jumpToSubPath, setCurrentWorkspaceId, setOpenWorkspacesModal]
           )}
           onClickLogin={useAffineLogIn()}
           onClickLogout={useAffineLogOut()}
@@ -143,7 +154,7 @@ export function Modals() {
       </Suspense>
       <Suspense>
         <CreateWorkspaceModal
-          mode={openCreateWorkspaceModal}
+          mode={isOpenCreateWorkspaceModal}
           onClose={useCallback(() => {
             setOpenCreateWorkspaceModal(false);
           }, [setOpenCreateWorkspaceModal])}
@@ -151,12 +162,12 @@ export function Modals() {
             async id => {
               setOpenCreateWorkspaceModal(false);
               setOpenWorkspacesModal(false);
-              setCurrentWorkspace(id);
+              setCurrentWorkspaceId(id);
               return jumpToSubPath(id, WorkspaceSubPath.ALL);
             },
             [
               jumpToSubPath,
-              setCurrentWorkspace,
+              setCurrentWorkspaceId,
               setOpenCreateWorkspaceModal,
               setOpenWorkspacesModal,
             ]
@@ -165,12 +176,4 @@ export function Modals() {
       </Suspense>
     </>
   );
-}
-
-export const ModalProvider = (): ReactElement => {
-  return (
-    <>
-      <Modals />
-    </>
-  );
 };