move modal into PrivateLegacyPages

packages/app/src/client/base.jsx

@@ -16,7 +16,6 @@ import PageAccessoriesModal from '../components/PageAccessoriesModal';
 import AppContainer from '~/client/services/AppContainer';
 import SocketIoContainer from '~/client/services/SocketIoContainer';
 import { DescendantsPageListModal } from '~/components/DescendantsPageListModal';
-import { LegacyPrivatePagesMigrationModal } from '~/components/LegacyPrivatePagesMigrationModal';
 
 const logger = loggerFactory('growi:cli:app');
 
@@ -53,7 +52,6 @@ const componentMappings = {
   'page-presentation-modal': <PagePresentationModal />,
   'page-accessories-modal': <PageAccessoriesModal />,
   'descendants-page-list-modal': <DescendantsPageListModal />,
-  'legacy-private-pages-migration-modal': <LegacyPrivatePagesMigrationModal />,
 
   'grw-hotkeys-manager': <HotkeysManager />,
 

packages/app/src/components/PrivateLegacyPages.tsx

@@ -21,6 +21,7 @@ import { OperateAllControl } from './SearchPage/OperateAllControl';
 
 import { IReturnSelectedPageIds, SearchPageBase } from './SearchPage2/SearchPageBase';
 import { MenuItemType } from './Common/Dropdown/PageItemControl';
+import { LegacyPrivatePagesMigrationModal } from './LegacyPrivatePagesMigrationModal';
 
 
 // TODO: replace with "customize:showPageLimitationS"
@@ -279,16 +280,20 @@ export const PrivateLegacyPages = (props: Props): JSX.Element => {
   }, [conditions, configurationsByPagination?.limit, data, pagingNumberChangedHandler]);
 
   return (
-    <SearchPageBase
-      ref={searchPageBaseRef}
-      appContainer={appContainer}
-      pages={data?.data}
-      onSelectedPagesByCheckboxesChanged={selectedPagesByCheckboxesChangedHandler}
-      forceHideMenuItems={[MenuItemType.BOOKMARK, MenuItemType.RENAME, MenuItemType.DUPLICATE]}
-      // Components
-      searchControl={searchControl}
-      searchResultListHead={searchResultListHead}
-      searchPager={searchPager}
-    />
+    <>
+      <SearchPageBase
+        ref={searchPageBaseRef}
+        appContainer={appContainer}
+        pages={data?.data}
+        onSelectedPagesByCheckboxesChanged={selectedPagesByCheckboxesChangedHandler}
+        forceHideMenuItems={[MenuItemType.BOOKMARK, MenuItemType.RENAME, MenuItemType.DUPLICATE]}
+        // Components
+        searchControl={searchControl}
+        searchResultListHead={searchResultListHead}
+        searchPager={searchPager}
+      />
+
+      <LegacyPrivatePagesMigrationModal />
+    </>
   );
 };

packages/app/src/server/views/layout/layout.html

@@ -110,7 +110,6 @@
 <div id="page-presentation-modal"></div>
 <div id="page-accessories-modal"></div>
 <div id="descendants-page-list-modal"></div>
-<div id="legacy-private-pages-migration-modal"></div>
 
 {% include '../modal/shortcuts.html' %}