Просмотр исходного кода

refs #80335: Detach page control from page container
- Retry: Detach rename from pageContainer

NEEDLEMAN3\tatsu 4 лет назад
Родитель
Сommit
c63ca4f8de

+ 0 - 14
packages/app/src/client/services/PageContainer.js

@@ -523,20 +523,6 @@ export default class PageContainer extends Container {
     return res;
     return res;
   }
   }
 
 
-  rename(newPagePath, isRecursively, isRenameRedirect, isRemainMetadata, pageId = this.state.pageId, revisionId = this.state.revisionId, path = this.state.path) {
-    const socketIoContainer = this.appContainer.getContainer('SocketIoContainer');
-
-    return this.appContainer.apiv3Put('/pages/rename', {
-      revisionId,
-      pageId,
-      isRecursively,
-      isRenameRedirect,
-      isRemainMetadata,
-      newPagePath,
-      path,
-    });
-  }
-
   showSuccessToastr() {
   showSuccessToastr() {
     toastr.success(undefined, 'Saved successfully', {
     toastr.success(undefined, 'Saved successfully', {
       closeButton: true,
       closeButton: true,

+ 7 - 4
packages/app/src/components/PageRenameModal.jsx

@@ -25,7 +25,7 @@ const PageRenameModal = (props) => {
     t, appContainer, pageContainer,
     t, appContainer, pageContainer,
   } = props;
   } = props;
 
 
-  const { path } = pageContainer.state;
+  const { path, revisionId, pageId } = pageContainer.state;
 
 
   const { crowi } = appContainer.config;
   const { crowi } = appContainer.config;
 
 
@@ -112,12 +112,15 @@ const PageRenameModal = (props) => {
     setErrs(null);
     setErrs(null);
 
 
     try {
     try {
-      const response = await pageContainer.rename(
-        pageNameInput,
+      const response = await appContainer.apiv3Put('/pages/rename', {
+        revisionId,
+        pageId,
         isRenameRecursively,
         isRenameRecursively,
         isRenameRedirect,
         isRenameRedirect,
         isRenameMetadata,
         isRenameMetadata,
-      );
+        pageNameInput,
+        path,
+      });
 
 
       const { page } = response.data;
       const { page } = response.data;
       const url = new URL(page.path, 'https://dummy');
       const url = new URL(page.path, 'https://dummy');