refactor

src/client/js/components/PageRenameModal.jsx

@@ -34,6 +34,14 @@ const PageRenameModal = (props) => {
     SetIsRenameRecursively(!isRenameRecursively);
   }
 
+  function changeIsRenameRedirectHandler() {
+    SetIsRenameRedirect(!isRenameRedirect);
+  }
+
+  function changeIsRenameMetadataHandler() {
+    SetIsRenameMetadata(!isRenameMetadata);
+  }
+
   /**
    * change pageNameInput
    * @param {string} value
@@ -49,9 +57,9 @@ const PageRenameModal = (props) => {
 
       const response = await pageContainer.rename(
         pageNameInput,
+        isRenameRecursively,
         isRenameRedirect,
         isRenameMetadata,
-        isRenameRecursively,
       );
       const { page } = response;
       window.location.href = encodeURI(`${page.path}?rename=${path}`);
@@ -110,7 +118,8 @@ const PageRenameModal = (props) => {
             name="create_redirect"
             id="cbRenameRedirect"
             type="checkbox"
-            onChange={SetIsRenameRedirect}
+            checked={isRenameRedirect}
+            onChange={changeIsRenameRedirectHandler}
           />
           <label className="custom-control-label" htmlFor="cbRenameRedirect">
             { t('modal_rename.label.Redirect') }
@@ -124,7 +133,8 @@ const PageRenameModal = (props) => {
             name="remain_metadata"
             id="cbRenameMetadata"
             type="checkbox"
-            onChange={SetIsRenameMetadata}
+            checked={isRenameMetadata}
+            onChange={changeIsRenameMetadataHandler}
           />
           <label className="custom-control-label" htmlFor="cbRenameMetadata">
             { t('modal_rename.label.Do not update metadata') }

src/client/js/services/PageContainer.js

@@ -341,17 +341,19 @@ export default class PageContainer extends Container {
     });
   }
 
-  rename(pageNameInput, isRenameRedirect, isRenameMetadata, isRenameRecursively) {
+  rename(pageNameInput, isRenameRecursively, isRenameRedirect, isRenameMetadata) {
     const websocketContainer = this.appContainer.getContainer('WebsocketContainer');
-    const recursively = isRenameRecursively ? true : null;
+    const isRecursively = isRenameRecursively ? true : null;
+    const isRedirect = isRenameRedirect ? true : null;
+    const isRemain = isRenameMetadata ? true : null;
 
     return this.appContainer.apiPost('/pages.rename', {
-      recursively,
+      recursively: isRecursively,
       page_id: this.state.pageId,
       revision_id: this.state.revisionId,
       new_path: pageNameInput,
-      create_redirect: isRenameRedirect,
-      remain_metadata: isRenameMetadata,
+      create_redirect: isRedirect,
+      remain_metadata: isRemain,
       socketClientId: websocketContainer.getSocketClientId(),
     });
   }