Merge branch 'feat/integrate-branch-resume-page-operations' into feat/show-draw-attention-icon-for-broken-path

packages/app/resource/locales/en_US/translation.json

@@ -1114,7 +1114,6 @@
   },
   "page_operation":{
     "paths_recovered": "Paths recovered successfully",
-    "path_recovery_failed":"Path recovery failed",
-    "forbidden_user": "The operation is forbidden for this user"
+    "path_recovery_failed":"Path recovery failed"
   }
 }

packages/app/resource/locales/ja_JP/translation.json

@@ -1107,7 +1107,6 @@
   },
   "page_operation":{
     "paths_recovered": "パスを修復しました",
-    "path_recovery_failed":"パスを修復できませんでした",
-    "forbidden_user": "操作権限がありません"
+    "path_recovery_failed":"パスを修復できませんでした"
   }
 }

packages/app/resource/locales/zh_CN/translation.json

@@ -1117,7 +1117,6 @@
   },
   "page_operation":{
     "paths_recovered": "成功恢复了页面路径",
-    "path_recovery_failed":"路径恢复失败",
-    "forbidden_user": "该操作对该用户来说是被禁止的"
+    "path_recovery_failed":"路径恢复失败"
   }
 }

packages/app/src/components/Common/Dropdown/PageItemControl.tsx

@@ -134,7 +134,8 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
     const showDeviderBeforeDelete = AdditionalMenuItems != null || showDeviderBeforeAdditionalMenuItems;
 
     // PathRecovery
-    const shouldFixPath = operationProcessData?.Rename != null ? operationProcessData?.Rename.isProcessable : false;
+    // Todo: It is wanted to find a better way to pass operationProcessData to PageItemControl
+    const shouldShowPathRecoveryButton = operationProcessData?.Rename != null ? operationProcessData?.Rename.isProcessable : false;
 
     contents = (
       <>
@@ -200,7 +201,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
         ) }
 
         {/* PathRecovery */}
-        { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && shouldFixPath && (
+        { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && shouldShowPathRecoveryButton && (
           <DropdownItem
             onClick={pathRecoveryItemClickedHandler}
             className="grw-page-control-dropdown-item"

packages/app/src/components/Sidebar/PageTree/Item.tsx

@@ -378,7 +378,7 @@ const Item: FC<ItemProps> = (props: ItemProps) => {
 
       toastSuccess(t('page_operation.paths_recovered'));
     }
-    catch (e) {
+    catch {
       toastError(t('page_operation.path_recovery_failed'));
     }
   };

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

@@ -565,7 +565,7 @@ module.exports = (crowi) => {
     // The user has permission to resume rename operation if page is returned.
     const page = await Page.findByIdAndViewer(pageId, user, null, true);
     if (page == null) {
-      const msg = 'page_operation.forbidden_user';
+      const msg = 'The operation is forbidden for this user';
       const code = 'forbidden-user';
       return res.apiv3Err(new ErrorV3(msg, code), 403);
     }