Răsfoiți Sursa

Revert "89536 - wip defined method"

This reverts commit 1734ef93843dee60be64ebdc7f6e40258a1883bb.
SULLEY\ryo-h 4 ani în urmă
părinte
comite
201e36110a

+ 1 - 3
packages/app/src/components/Navbar/SubNavButtons.tsx

@@ -29,7 +29,6 @@ type CommonProps = {
   onClickDuplicateMenuItem?: (pageToDuplicate: IPageForPageDuplicateModal) => void,
   onClickRenameMenuItem?: (pageToRename: IPageToRenameWithMeta) => void,
   onClickDeleteMenuItem?: (pageToDelete: IPageToDeleteWithMeta) => void,
-  hoge?: () => void,
 }
 
 type SubNavButtonsSubstanceProps = CommonProps & {
@@ -45,7 +44,7 @@ const SubNavButtonsSubstance = (props: SubNavButtonsSubstanceProps): JSX.Element
     pageInfo,
     pageId, revisionId, path, shareLinkId,
     isCompactMode, disableSeenUserInfoPopover, showPageControlDropdown, forceHideMenuItems, additionalMenuItemRenderer,
-    onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, hoge,
+    onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem,
   } = props;
 
   const { data: isGuestUser } = useIsGuestUser();
@@ -83,7 +82,6 @@ const SubNavButtonsSubstance = (props: SubNavButtonsSubstanceProps): JSX.Element
     }
 
     await toggleLike(pageId, pageInfo.isLiked);
-    hoge?.();
     mutatePageInfo();
   }, [isGuestUser, mutatePageInfo, pageId, pageInfo]);
 

+ 2 - 10
packages/app/src/components/SearchPage.tsx

@@ -6,8 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { parse as parseQuerystring } from 'querystring';
 
 import AppContainer from '~/client/services/AppContainer';
-import { IPageWithMeta } from '~/interfaces/page';
-import { IFormattedSearchResult, IPageSearchMeta } from '~/interfaces/search';
+import { IFormattedSearchResult } from '~/interfaces/search';
 import { ISelectableAll, ISelectableAndIndeterminatable } from '~/client/interfaces/selectable-all';
 import { useIsSearchServiceReachable } from '~/stores/context';
 import { ISearchConditions, ISearchConfigurations, useSWRxFullTextSearch } from '~/stores/search';
@@ -114,7 +113,6 @@ export const SearchPage = (props: Props): JSX.Element => {
   const [offset, setOffset] = useState<number>(0);
   const [limit, setLimit] = useState<number>(INITIAL_PAGIONG_SIZE);
   const [configurationsByControl, setConfigurationsByControl] = useState<Partial<ISearchConfigurations>>({});
-  const [searchResultPages, setSearchResultPages] = useState<IPageWithMeta<IPageSearchMeta>[] | undefined>(undefined);
 
   const selectAllControlRef = useRef<ISelectableAndIndeterminatable|null>(null);
   const searchPageBaseRef = useRef<ISelectableAll & IReturnSelectedPageIds|null>(null);
@@ -172,11 +170,6 @@ export const SearchPage = (props: Props): JSX.Element => {
     mutate();
   }, [mutate]);
 
-  const hoge = useCallback(() => {
-    setSearchResultPages(data?.data);
-    mutate();
-  }, [mutate]);
-
   const pagingNumberChangedHandler = useCallback((activePage: number) => {
     setOffset((activePage - 1) * limit);
     mutate();
@@ -275,14 +268,13 @@ export const SearchPage = (props: Props): JSX.Element => {
     <SearchPageBase
       ref={searchPageBaseRef}
       appContainer={appContainer}
-      pages={searchResultPages}
+      pages={data?.data}
       searchingKeyword={keyword}
       onSelectedPagesByCheckboxesChanged={selectedPagesByCheckboxesChangedHandler}
       // Components
       searchControl={searchControl}
       searchResultListHead={searchResultListHead}
       searchPager={searchPager}
-      hoge={hoge}
     />
   );
 };

+ 0 - 3
packages/app/src/components/SearchPage/SearchResultContent.tsx

@@ -55,7 +55,6 @@ type Props ={
   highlightKeywords?: string[],
   showPageControlDropdown?: boolean,
   forceHideMenuItems?: ForceHideMenuItems,
-  hoge?: () => void,
 }
 
 const scrollTo = (scrollElement:HTMLElement) => {
@@ -108,7 +107,6 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
     highlightKeywords,
     showPageControlDropdown,
     forceHideMenuItems,
-    hoge,
   } = props;
 
   const { t } = useTranslation();
@@ -188,7 +186,6 @@ export const SearchResultContent: FC<Props> = (props: Props) => {
             onClickDuplicateMenuItem={duplicateItemClickedHandler}
             onClickRenameMenuItem={renameItemClickedHandler}
             onClickDeleteMenuItem={deleteItemClickedHandler}
-            hoge={hoge}
           />
         </div>
         <div className="h-50 d-flex flex-column align-items-end justify-content-center">

+ 1 - 3
packages/app/src/components/SearchPage2/SearchPageBase.tsx

@@ -35,7 +35,7 @@ type Props = {
   forceHideMenuItems?: ForceHideMenuItems,
 
   onSelectedPagesByCheckboxesChanged?: (selectedCount: number, totalCount: number) => void,
-  hoge?: () => void,
+
   searchControl: React.ReactNode,
   searchResultListHead: React.ReactElement,
   searchPager: React.ReactNode,
@@ -48,7 +48,6 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
     searchingKeyword,
     forceHideMenuItems,
     onSelectedPagesByCheckboxesChanged,
-    hoge,
     searchControl, searchResultListHead, searchPager,
   } = props;
 
@@ -209,7 +208,6 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
               highlightKeywords={highlightKeywords}
               showPageControlDropdown={!isGuestUser}
               forceHideMenuItems={forceHideMenuItems}
-              hoge={hoge}
             />
           )}
         </div>