remove obsolete code and migrate correctly

apps/app/src/client/components/Bookmarks/BookmarkFolderTree.tsx

@@ -11,11 +11,11 @@ import { toastSuccess } from '~/client/util/toastr';
 import type { OnDeletedFunction } from '~/interfaces/ui';
 import { useIsReadOnlyUser } from '~/states/context';
 import { useCurrentPageData } from '~/states/page';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import {
   useSWRxUserBookmarks, useSWRMUTxCurrentUserBookmarks,
 } from '~/stores/bookmark';
 import { useSWRxBookmarkFolderAndChild } from '~/stores/bookmark-folder';
-import { usePageDeleteModal } from '~/stores/modal';
 import { mutateAllPageInfo, useSWRMUTxPageInfo } from '~/stores/page';
 
 import { BookmarkFolderItem } from './BookmarkFolderItem';

apps/app/src/client/components/ItemsTree/ItemsTree.tsx

@@ -13,8 +13,9 @@ import type { OnDuplicatedFunction, OnDeletedFunction } from '~/interfaces/ui';
 import type { UpdateDescCountData, UpdateDescCountRawData } from '~/interfaces/websocket';
 import { SocketEventName } from '~/interfaces/websocket';
 import { useCurrentPagePath, useFetchCurrentPage } from '~/states/page';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import type { IPageForPageDuplicateModal } from '~/stores/modal';
-import { usePageDuplicateModal, usePageDeleteModal } from '~/stores/modal';
+import { usePageDuplicateModal } from '~/stores/modal';
 import { mutateAllPageInfo } from '~/stores/page';
 import {
   useSWRxRootPage, mutatePageTree, mutatePageList,

apps/app/src/client/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -36,9 +36,10 @@ import {
   isUploadEnabledAtom,
 } from '~/states/server-configurations';
 import { useEditorMode } from '~/states/ui/editor';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import {
   usePageAccessoriesModal, PageAccessoriesModalContents, type IPageForPageDuplicateModal,
-  usePageDuplicateModal, usePageRenameModal, usePageDeleteModal, usePagePresentationModal,
+  usePageDuplicateModal, usePageRenameModal, usePagePresentationModal,
 } from '~/stores/modal';
 import {
   useSWRxPageInfo,

apps/app/src/client/components/PageList/PageListItemL.tsx

@@ -25,9 +25,10 @@ import type {
   OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction, OnPutBackedFunction,
 } from '~/interfaces/ui';
 import LinkedPagePath from '~/models/linked-page-path';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import { useSWRMUTxCurrentUserBookmarks } from '~/stores/bookmark';
 import {
-  usePageRenameModal, usePageDuplicateModal, usePageDeleteModal, usePutBackPageModal,
+  usePageRenameModal, usePageDuplicateModal, usePutBackPageModal,
 } from '~/stores/modal';
 import { useIsDeviceLargerThanLg } from '~/stores/ui';
 

apps/app/src/client/components/SearchPage/SearchPageBase.tsx

@@ -14,7 +14,7 @@ import type { IFormattedSearchResult, IPageWithSearchMeta } from '~/interfaces/s
 import type { OnDeletedFunction } from '~/interfaces/ui';
 import { useIsGuestUser, useIsReadOnlyUser } from '~/states/context';
 import { isSearchServiceConfiguredAtom, isSearchServiceReachableAtom } from '~/states/server-configurations';
-import { usePageDeleteModal } from '~/stores/modal';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import { mutatePageTree, mutateRecentlyUpdated } from '~/stores/page-listing';
 
 import type { ForceHideMenuItems } from '../Common/Dropdown/PageItemControl';

apps/app/src/client/components/SearchPage/SearchResultContent.tsx

@@ -18,8 +18,9 @@ import type { IPageWithSearchMeta } from '~/interfaces/search';
 import type { OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction } from '~/interfaces/ui';
 import { useShouldExpandContent } from '~/services/layout/use-should-expand-content';
 import { useCurrentUser } from '~/states/global';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
 import {
-  usePageDuplicateModal, usePageRenameModal, usePageDeleteModal,
+  usePageDuplicateModal, usePageRenameModal,
 } from '~/stores/modal';
 import { mutatePageList, mutatePageTree, mutateRecentlyUpdated } from '~/stores/page-listing';
 import { useSearchResultOptions } from '~/stores/renderer';

apps/app/src/components/PageView/PageAlerts/TrashPageAlert.tsx

@@ -8,7 +8,8 @@ import { useTranslation } from 'react-i18next';
 import {
   useCurrentPageData, useCurrentPagePath, useIsTrashPage, useFetchCurrentPage,
 } from '~/states/page';
-import { usePageDeleteModal, usePutBackPageModal } from '~/stores/modal';
+import { usePageDeleteModal } from '~/states/ui/modal/page-delete';
+import { usePutBackPageModal } from '~/stores/modal';
 import { useSWRxPageInfo } from '~/stores/page';
 import { mutateRecentlyUpdated } from '~/stores/page-listing';
 import { useIsAbleToShowTrashPageManagementButtons } from '~/stores/ui';

apps/app/src/stores/modal.tsx

@@ -9,36 +9,12 @@ import type { SWRResponse } from 'swr';
 
 import type { BookmarkFolderItems } from '~/interfaces/bookmark-info';
 import type {
-  OnDuplicatedFunction, OnRenamedFunction, OnDeletedFunction, OnPutBackedFunction, onDeletedBookmarkFolderFunction, OnSelectedFunction,
+  OnDuplicatedFunction, OnRenamedFunction, OnPutBackedFunction, onDeletedBookmarkFolderFunction, OnSelectedFunction,
 } from '~/interfaces/ui';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:stores:modal');
 
-/*
-* PageCreateModal
-*/
-type CreateModalStatus = {
-  isOpened: boolean,
-  path?: string,
-}
-
-type CreateModalStatusUtils = {
-  open(path?: string): Promise<CreateModalStatus | undefined>
-  close(): Promise<CreateModalStatus | undefined>
-}
-
-export const usePageCreateModal = (status?: CreateModalStatus): SWRResponse<CreateModalStatus, Error> & CreateModalStatusUtils => {
-  const initialData: CreateModalStatus = { isOpened: false };
-  const swrResponse = useSWRStatic<CreateModalStatus, Error>('pageCreateModalStatus', status, { fallbackData: initialData });
-
-  return {
-    ...swrResponse,
-    open: (path?: string) => swrResponse.mutate({ isOpened: true, path }),
-    close: () => swrResponse.mutate({ isOpened: false }),
-  };
-};
-
 /*
 * GrantedGroupsInheritanceSelectModal
 */
@@ -71,46 +47,6 @@ export const useGrantedGroupsInheritanceSelectModal = (
   };
 };
 
-/*
-* PageDeleteModal
-*/
-export type IDeleteModalOption = {
-  onDeleted?: OnDeletedFunction,
-}
-
-type DeleteModalStatus = {
-  isOpened: boolean,
-  pages?: IPageToDeleteWithMeta[],
-  opts?: IDeleteModalOption,
-}
-
-type DeleteModalStatusUtils = {
-  open(
-    pages?: IPageToDeleteWithMeta[],
-    opts?: IDeleteModalOption,
-  ): Promise<DeleteModalStatus | undefined>,
-  close(): Promise<DeleteModalStatus | undefined>,
-}
-
-export const usePageDeleteModal = (status?: DeleteModalStatus): SWRResponse<DeleteModalStatus, Error> & DeleteModalStatusUtils => {
-  const initialData: DeleteModalStatus = {
-    isOpened: false,
-    pages: [],
-  };
-  const swrResponse = useSWRStatic<DeleteModalStatus, Error>('deleteModalStatus', status, { fallbackData: initialData });
-
-  return {
-    ...swrResponse,
-    open: (
-        pages?: IPageToDeleteWithMeta[],
-        opts?: IDeleteModalOption,
-    ) => swrResponse.mutate({
-      isOpened: true, pages, opts,
-    }),
-    close: () => swrResponse.mutate({ isOpened: false }),
-  };
-};
-
 /*
 * EmptyTrashModal
 */