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

Revert "Show/hide settings for menuItems"

This reverts commit 9c92652cf5427b5f01a11f08e737561088076371.
Shun Miyazawa 1 год назад
Родитель
Сommit
d922dbb3fa

+ 1 - 1
apps/app/src/client/components/Bookmarks/BookmarkItem.tsx

@@ -193,7 +193,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
             isReadOnlyUser={isReadOnlyUser}
             isReadOnlyUser={isReadOnlyUser}
             pageInfo={pageInfo}
             pageInfo={pageInfo}
             isInstantRename
             isInstantRename
-            forceHideMenuItems={[MenuItemType.DUPLICATE, MenuItemType.SYNC_LATEST_REVISION_BODY]}
+            forceHideMenuItems={[MenuItemType.DUPLICATE]}
             onClickBookmarkMenuItem={bookmarkMenuItemClickHandler}
             onClickBookmarkMenuItem={bookmarkMenuItemClickHandler}
             onClickRenameMenuItem={renameMenuItemClickHandler}
             onClickRenameMenuItem={renameMenuItemClickHandler}
             onClickDeleteMenuItem={deleteMenuItemClickHandler}
             onClickDeleteMenuItem={deleteMenuItemClickHandler}

+ 0 - 1
apps/app/src/client/components/PrivateLegacyPages.tsx

@@ -443,7 +443,6 @@ const PrivateLegacyPages = (): JSX.Element => {
           MenuItemType.DUPLICATE,
           MenuItemType.DUPLICATE,
           MenuItemType.REVERT,
           MenuItemType.REVERT,
           MenuItemType.PATH_RECOVERY,
           MenuItemType.PATH_RECOVERY,
-          MenuItemType.SYNC_LATEST_REVISION_BODY,
         ]}
         ]}
         // Components
         // Components
         searchControl={searchControl}
         searchControl={searchControl}

+ 0 - 2
apps/app/src/client/components/SearchPage.tsx

@@ -10,7 +10,6 @@ import type { IFormattedSearchResult } from '~/interfaces/search';
 import { useShowPageLimitationL } from '~/stores-universal/context';
 import { useShowPageLimitationL } from '~/stores-universal/context';
 import { type ISearchConditions, type ISearchConfigurations, useSWRxSearch } from '~/stores/search';
 import { type ISearchConditions, type ISearchConfigurations, useSWRxSearch } from '~/stores/search';
 
 
-import { MenuItemType } from './Common/Dropdown/PageItemControl';
 import { NotAvailableForGuest } from './NotAvailableForGuest';
 import { NotAvailableForGuest } from './NotAvailableForGuest';
 import { NotAvailableForReadOnlyUser } from './NotAvailableForReadOnlyUser';
 import { NotAvailableForReadOnlyUser } from './NotAvailableForReadOnlyUser';
 import PaginationWrapper from './PaginationWrapper';
 import PaginationWrapper from './PaginationWrapper';
@@ -288,7 +287,6 @@ export const SearchPage = (): JSX.Element => {
       searchControl={searchControl}
       searchControl={searchControl}
       searchResultListHead={searchResultListHead}
       searchResultListHead={searchResultListHead}
       searchPager={searchPager}
       searchPager={searchPager}
-      forceHideMenuItems={[MenuItemType.SYNC_LATEST_REVISION_BODY]}
     />
     />
   );
   );
 };
 };

+ 3 - 4
apps/app/src/client/components/Sidebar/PageTreeItem/use-page-item-control.tsx

@@ -12,16 +12,16 @@ import { useTranslation } from 'next-i18next';
 import { DropdownToggle } from 'reactstrap';
 import { DropdownToggle } from 'reactstrap';
 import { debounce } from 'throttle-debounce';
 import { debounce } from 'throttle-debounce';
 
 
-import { AutosizeSubmittableInput, getAdjustedMaxWidthForAutosizeInput } from '~/client/components/Common/SubmittableInput';
-import { NotAvailableForGuest } from '~/client/components/NotAvailableForGuest';
 import { bookmark, unbookmark, resumeRenameOperation } from '~/client/services/page-operation';
 import { bookmark, unbookmark, resumeRenameOperation } from '~/client/services/page-operation';
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import { ValidationTarget, useInputValidator, type InputValidationResult } from '~/client/util/use-input-validator';
 import { ValidationTarget, useInputValidator, type InputValidationResult } from '~/client/util/use-input-validator';
+import { AutosizeSubmittableInput, getAdjustedMaxWidthForAutosizeInput } from '~/client/components/Common/SubmittableInput';
+import { NotAvailableForGuest } from '~/client/components/NotAvailableForGuest';
 import { useSWRMUTxCurrentUserBookmarks } from '~/stores/bookmark';
 import { useSWRMUTxCurrentUserBookmarks } from '~/stores/bookmark';
 import { useSWRMUTxPageInfo } from '~/stores/page';
 import { useSWRMUTxPageInfo } from '~/stores/page';
 
 
-import { MenuItemType, PageItemControl } from '../../Common/Dropdown/PageItemControl';
+import { PageItemControl } from '../../Common/Dropdown/PageItemControl';
 import type { TreeItemToolProps } from '../../TreeItem';
 import type { TreeItemToolProps } from '../../TreeItem';
 
 
 
 
@@ -111,7 +111,6 @@ export const usePageItemControl = (): UsePageItemControl => {
       <NotAvailableForGuest>
       <NotAvailableForGuest>
         <div className="grw-pagetree-control d-flex">
         <div className="grw-pagetree-control d-flex">
           <PageItemControl
           <PageItemControl
-            forceHideMenuItems={[MenuItemType.SYNC_LATEST_REVISION_BODY]}
             pageId={page._id}
             pageId={page._id}
             isEnableActions={isEnableActions}
             isEnableActions={isEnableActions}
             isReadOnlyUser={isReadOnlyUser}
             isReadOnlyUser={isReadOnlyUser}

+ 1 - 1
apps/app/src/client/components/TrashPageList.tsx

@@ -69,7 +69,7 @@ const DescendantsPageListForTrash = (): JSX.Element => {
     <DescendantsPageList
     <DescendantsPageList
       path="/trash"
       path="/trash"
       limit={limit}
       limit={limit}
-      forceHideMenuItems={[MenuItemType.RENAME, MenuItemType.SYNC_LATEST_REVISION_BODY]}
+      forceHideMenuItems={[MenuItemType.RENAME]}
     />
     />
   );
   );
 };
 };