Bladeren bron

refactor updateMetadata option

Yuki Takei 4 jaren geleden
bovenliggende
commit
dd3d9c5e1a

+ 2 - 2
packages/app/resource/locales/en_US/translation.json

@@ -414,12 +414,12 @@
       "Rename this page only": "Rename this page only",
       "Rename this page only": "Rename this page only",
       "Force rename all child pages": "Force rename all pages",
       "Force rename all child pages": "Force rename all pages",
       "Other options": "Other options",
       "Other options": "Other options",
-      "Update metadata": "Update metadata",
+      "Do not update metadata": "Do not update metadata",
       "Redirect": "Redirect"
       "Redirect": "Redirect"
     },
     },
     "help": {
     "help": {
       "redirect": "Redirect to new page if someone accesses under this path",
       "redirect": "Redirect to new page if someone accesses under this path",
-      "metadata": "Update last update user and updated date",
+      "metadata": "Remains last update user and updated date as is",
       "recursive": "Move/Rename children of under this path recursively"
       "recursive": "Move/Rename children of under this path recursively"
     }
     }
   },
   },

+ 2 - 2
packages/app/resource/locales/ja_JP/translation.json

@@ -413,12 +413,12 @@
       "Rename this page only": "このページのみを移動/名前変更",
       "Rename this page only": "このページのみを移動/名前変更",
       "Force rename all child pages": "全ての配下のページを移動/名前変更する",
       "Force rename all child pages": "全ての配下のページを移動/名前変更する",
       "Other options": "その他のオプション",
       "Other options": "その他のオプション",
-      "Update metadata": "メタデータを更新する",
+      "Do not update metadata": "不更新元数据",
       "Redirect": "リダイレクトする"
       "Redirect": "リダイレクトする"
     },
     },
     "help": {
     "help": {
       "redirect": "アクセスされた際に自動的に新しいページにジャンプします",
       "redirect": "アクセスされた際に自動的に新しいページにジャンプします",
-      "metadata": "最終更新ユーザー、最終更新日を更新します",
+      "metadata": "Remains last update user and updated date as is",
       "recursive": "配下のページも移動/名前変更します"
       "recursive": "配下のページも移動/名前変更します"
     }
     }
   },
   },

+ 6 - 6
packages/app/src/components/PageRenameModal.tsx

@@ -45,7 +45,7 @@ const PageRenameModal = (): JSX.Element => {
   const [existingPaths, setExistingPaths] = useState<string[]>([]);
   const [existingPaths, setExistingPaths] = useState<string[]>([]);
   const [isRenameRecursively, setIsRenameRecursively] = useState(true);
   const [isRenameRecursively, setIsRenameRecursively] = useState(true);
   const [isRenameRedirect, setIsRenameRedirect] = useState(false);
   const [isRenameRedirect, setIsRenameRedirect] = useState(false);
-  const [isRemainMetadata, setIsRemainMetadata] = useState(true);
+  const [isRemainMetadata, setIsRemainMetadata] = useState(false);
   const [expandOtherOptions, setExpandOtherOptions] = useState(false);
   const [expandOtherOptions, setExpandOtherOptions] = useState(false);
   const [subordinatedError] = useState(null);
   const [subordinatedError] = useState(null);
 
 
@@ -122,7 +122,7 @@ const PageRenameModal = (): JSX.Element => {
         revisionId: revision,
         revisionId: revision,
         isRecursively: isRenameRecursively,
         isRecursively: isRenameRecursively,
         isRenameRedirect,
         isRenameRedirect,
-        isRemainMetadata,
+        updateMetadata: !isRemainMetadata,
         newPagePath: pageNameInput,
         newPagePath: pageNameInput,
         path,
         path,
       });
       });
@@ -246,13 +246,13 @@ const PageRenameModal = (): JSX.Element => {
             <input
             <input
               className="custom-control-input"
               className="custom-control-input"
               name="remain_metadata"
               name="remain_metadata"
-              id="cbUpdateMetadata"
+              id="cbRemainMetadata"
               type="checkbox"
               type="checkbox"
-              checked={!isRemainMetadata}
+              checked={isRemainMetadata}
               onChange={() => setIsRemainMetadata(!isRemainMetadata)}
               onChange={() => setIsRemainMetadata(!isRemainMetadata)}
             />
             />
-            <label className="custom-control-label" htmlFor="cbUpdateMetadata">
-              { t('modal_rename.label.Update metadata') }
+            <label className="custom-control-label" htmlFor="cbRemainMetadata">
+              { t('modal_rename.label.Do not update metadata') }
               <p className="form-text text-muted mt-0">{ t('modal_rename.help.metadata') }</p>
               <p className="form-text text-muted mt-0">{ t('modal_rename.help.metadata') }</p>
             </label>
             </label>
           </div>
           </div>

+ 1 - 1
packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -187,7 +187,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
         revisionId: droppedPage.revision,
         revisionId: droppedPage.revision,
         newPagePath,
         newPagePath,
         isRenameRedirect: false,
         isRenameRedirect: false,
-        isRemainMetadata: false,
+        updateMetadata: true,
       });
       });
 
 
       await mutateChildren();
       await mutateChildren();

+ 4 - 4
packages/app/src/server/routes/apiv3/pages.js

@@ -176,7 +176,7 @@ module.exports = (crowi) => {
       body('newPagePath').isLength({ min: 1 }).withMessage('newPagePath is required'),
       body('newPagePath').isLength({ min: 1 }).withMessage('newPagePath is required'),
       body('isRecursively').if(value => value != null).isBoolean().withMessage('isRecursively must be boolean'),
       body('isRecursively').if(value => value != null).isBoolean().withMessage('isRecursively must be boolean'),
       body('isRenameRedirect').if(value => value != null).isBoolean().withMessage('isRenameRedirect must be boolean'),
       body('isRenameRedirect').if(value => value != null).isBoolean().withMessage('isRenameRedirect must be boolean'),
-      body('isRemainMetadata').if(value => value != null).isBoolean().withMessage('isRemainMetadata must be boolean'),
+      body('updateMetadata').if(value => value != null).isBoolean().withMessage('updateMetadata must be boolean'),
       body('isMoveMode').if(value => value != null).isBoolean().withMessage('isMoveMode must be boolean'),
       body('isMoveMode').if(value => value != null).isBoolean().withMessage('isMoveMode must be boolean'),
     ],
     ],
     duplicatePage: [
     duplicatePage: [
@@ -445,9 +445,9 @@ module.exports = (crowi) => {
    *                  isRenameRedirect:
    *                  isRenameRedirect:
    *                    type: boolean
    *                    type: boolean
    *                    description: whether redirect page
    *                    description: whether redirect page
-   *                  isRemainMetadata:
+   *                  updateMetadata:
    *                    type: boolean
    *                    type: boolean
-   *                    description: whether remain meta data
+   *                    description: whether update meta data
    *                  isRecursively:
    *                  isRecursively:
    *                    type: boolean
    *                    type: boolean
    *                    description: whether rename page with descendants
    *                    description: whether rename page with descendants
@@ -476,7 +476,7 @@ module.exports = (crowi) => {
     const options = {
     const options = {
       isRecursively: req.body.isRecursively,
       isRecursively: req.body.isRecursively,
       createRedirectPage: req.body.isRenameRedirect,
       createRedirectPage: req.body.isRenameRedirect,
-      updateMetadata: !req.body.isRemainMetadata,
+      updateMetadata: req.body.updateMetadata,
       isMoveMode: req.body.isMoveMode,
       isMoveMode: req.body.isMoveMode,
     };
     };