fix fb

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx

@@ -27,7 +27,6 @@ export const MenuItemType = {
   DELETE: 'delete',
   REVERT: 'revert',
   PATH_RECOVERY: 'pathRecovery',
-  SYNC_LATEST_REVISION_BODY: 'syncLatestRevisionBody',
   SWITCH_CONTENT_WIDTH: 'switch_content_width',
 } as const;
 export type MenuItemType = typeof MenuItemType[keyof typeof MenuItemType];
@@ -48,7 +47,6 @@ type CommonProps = {
   onClickDeleteMenuItem?: (pageId: string, pageInfo: IPageInfoAll | undefined) => Promise<void> | void,
   onClickRevertMenuItem?: (pageId: string) => Promise<void> | void,
   onClickPathRecoveryMenuItem?: (pageId: string) => Promise<void> | void,
-  onClickSyncLatestRevisionBodyMenuItem?: (pageId: string) => Promise<void> | void,
 
   additionalMenuItemOnTopRenderer?: React.FunctionComponent<AdditionalMenuItemsRendererProps>,
   additionalMenuItemRenderer?: React.FunctionComponent<AdditionalMenuItemsRendererProps>,
@@ -69,7 +67,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
   const {
     pageId, isLoading, pageInfo, isEnableActions, isReadOnlyUser, forceHideMenuItems, operationProcessData,
     onClickBookmarkMenuItem, onClickRenameMenuItem, onClickDuplicateMenuItem, onClickDeleteMenuItem,
-    onClickRevertMenuItem, onClickPathRecoveryMenuItem, onClickSyncLatestRevisionBodyMenuItem,
+    onClickRevertMenuItem, onClickPathRecoveryMenuItem,
     additionalMenuItemOnTopRenderer: AdditionalMenuItemsOnTop,
     additionalMenuItemRenderer: AdditionalMenuItems,
     isInstantRename, alignEnd,
@@ -110,14 +108,6 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
     await onClickRevertMenuItem(pageId);
   }, [onClickRevertMenuItem, pageId]);
 
-  const syncLatestRevisionBodyHandler = useCallback(async() => {
-    if (onClickSyncLatestRevisionBodyMenuItem == null) {
-      return;
-    }
-    await onClickSyncLatestRevisionBodyMenuItem(pageId);
-  }, [onClickSyncLatestRevisionBodyMenuItem, pageId]);
-
-
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const deleteItemClickedHandler = useCallback(async() => {
     if (pageInfo == null || onClickDeleteMenuItem == null) {
@@ -220,17 +210,6 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
           </DropdownItem>
         ) }
 
-        {/* SyncLatestRevisionBody */}
-        { !forceHideMenuItems?.includes(MenuItemType.SYNC_LATEST_REVISION_BODY) && isEnableActions && !isReadOnlyUser && (
-          <DropdownItem
-            onClick={syncLatestRevisionBodyHandler}
-            className="grw-page-control-dropdown-item"
-          >
-            <span className="material-symbols-outlined me-1 grw-page-control-dropdown-icon">sync</span>
-            {t('SyncLatestRevisionBody')}
-          </DropdownItem>
-        )}
-
         { AdditionalMenuItems && (
           <>
             { showDeviderBeforeAdditionalMenuItems && <DropdownItem divider /> }

apps/app/src/client/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -76,8 +76,24 @@ const PageOperationMenuItems = (props: PageOperationMenuItemsProps): JSX.Element
   const { open: openPresentationModal } = usePagePresentationModal();
   const { open: openAccessoriesModal } = usePageAccessoriesModal();
 
+  const syncLatestRevisionBodyHandler = useCallback(async() => {
+    // eslint-disable-next-line no-alert
+    const answer = window.confirm(t('sync-latest-reevision-body.confirm'));
+    if (answer) {
+      // TODO: https://redmine.weseek.co.jp/issues/149418
+    }
+  }, [t]);
+
   return (
     <>
+      <DropdownItem
+        onClick={() => syncLatestRevisionBodyHandler()}
+        className="grw-page-control-dropdown-item"
+      >
+        <span className="material-symbols-outlined me-1 grw-page-control-dropdown-icon">sync</span>
+        {t('SyncLatestRevisionBody')}
+      </DropdownItem>
+
       {/* Presentation */}
       <DropdownItem
         onClick={() => openPresentationModal()}
@@ -256,14 +272,6 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
     openDeleteModal([pageWithMeta], { onDeleted: deletedHandler });
   }, [currentPathname, mutateCurrentPage, openDeleteModal, router, mutatePageInfo]);
 
-  const syncLatestRevisionBodyHandler = useCallback(async(pageId: string) => {
-    // eslint-disable-next-line no-alert
-    const answer = window.confirm(t('sync-latest-reevision-body.confirm'));
-    if (answer) {
-      // TODO: https://redmine.weseek.co.jp/issues/149418
-    }
-  }, [t]);
-
   const switchContentWidthHandler = useCallback(async(pageId: string, value: boolean) => {
     if (!isSharedPage) {
       await updateContentWidth(pageId, value);
@@ -339,7 +347,6 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
                 onClickDuplicateMenuItem={duplicateItemClickedHandler}
                 onClickRenameMenuItem={renameItemClickedHandler}
                 onClickDeleteMenuItem={deleteItemClickedHandler}
-                onClickSyncLatestRevisionBodyMenuItem={syncLatestRevisionBodyHandler}
                 onClickSwitchContentWidth={switchContentWidthHandler}
               />
             )}

apps/app/src/client/components/PageControls/PageControls.tsx

@@ -113,7 +113,6 @@ type CommonProps = {
   onClickDuplicateMenuItem?: (pageToDuplicate: IPageForPageDuplicateModal) => void,
   onClickRenameMenuItem?: (pageToRename: IPageToRenameWithMeta) => void,
   onClickDeleteMenuItem?: (pageToDelete: IPageToDeleteWithMeta) => void,
-  onClickSyncLatestRevisionBodyMenuItem?: (pageId: string) => void,
   onClickSwitchContentWidth?: (pageId: string, value: boolean) => void,
 }
 
@@ -127,8 +126,7 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
     pageInfo,
     pageId, revisionId, path, shareLinkId, expandContentWidth,
     disableSeenUserInfoPopover, hideSubControls, showPageControlDropdown, forceHideMenuItems, additionalMenuItemRenderer,
-    onClickEditTagsButton, onClickDuplicateMenuItem, onClickRenameMenuItem,
-    onClickDeleteMenuItem, onClickSyncLatestRevisionBodyMenuItem, onClickSwitchContentWidth,
+    onClickEditTagsButton, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, onClickSwitchContentWidth,
   } = props;
 
   const { data: isGuestUser } = useIsGuestUser();
@@ -227,14 +225,6 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
     onClickDeleteMenuItem(pageToDelete);
   }, [onClickDeleteMenuItem, pageId, pageInfo, path, revisionId]);
 
-  const syncLatestRevisionBodyMenuItemClickHandler = useCallback(async() => {
-    if (onClickSyncLatestRevisionBodyMenuItem == null || path == null) {
-      return;
-    }
-
-    onClickSyncLatestRevisionBodyMenuItem(pageId);
-  }, [onClickSyncLatestRevisionBodyMenuItem, pageId, path]);
-
   const switchContentWidthClickHandler = useCallback(() => {
 
     const newValue = !expandContentWidth;
@@ -341,7 +331,6 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
           additionalMenuItemRenderer={additionalMenuItemRenderer}
           onClickRenameMenuItem={renameMenuItemClickHandler}
           onClickDuplicateMenuItem={duplicateMenuItemClickHandler}
-          onClickSyncLatestRevisionBodyMenuItem={syncLatestRevisionBodyMenuItemClickHandler}
           onClickDeleteMenuItem={deleteMenuItemClickHandler}
         />
       )}