Merge pull request #6286 from weseek/feat/render-page-rename-and-delete-modals

feat: Render Page Rename/Delete Modal

packages/app/src/components/Layout/BasicLayout.tsx

@@ -22,7 +22,10 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
   const ShortcutsModal = dynamic(() => import('../ShortcutsModal'), { ssr: false });
   const SystemVersion = dynamic(() => import('../SystemVersion'), { ssr: false });
   // Page modals
+  // const PageCreateModal = dynamic(() => import('../PageCreateModal'), { ssr: false });
   const PageDuplicateModal = dynamic(() => import('../PageDuplicateModal'), { ssr: false });
+  const PageDeleteModal = dynamic(() => import('../PageDeleteModal'), { ssr: false });
+  const PageRenameModal = dynamic(() => import('../PageRenameModal'), { ssr: false });
 
   return (
     <RawLayout title={title} className={className}>
@@ -40,8 +43,10 @@ export const BasicLayout = ({ children, title, className }: Props): JSX.Element
 
       <GrowiNavbarBottom />
 
-      {/* <PageCreateModal /> */}
+      {/* <PageCreateModal /> */} {/* Todo: render w/o depending on appContainer */}
       <PageDuplicateModal />
+      <PageDeleteModal />
+      <PageRenameModal />
       {/* <HotkeysManager /> */}
 
       <ShortcutsModal />

packages/app/src/server/routes/apiv3/users.js

@@ -648,7 +648,7 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: data of delete user
    */
-  router.delete('/:id/remove', loginRequiredStrictly, adminRequired,  addActivity, async(req, res) => {
+  router.delete('/:id/remove', loginRequiredStrictly, adminRequired, addActivity, async(req, res) => {
     const { id } = req.params;
 
     try {