kaori 4 лет назад
Родитель
Сommit
04cb0aa25c

+ 3 - 5
packages/app/src/components/PageList/PageListItemL.tsx

@@ -33,7 +33,6 @@ type Props = {
   showPageUpdatedTime?: boolean, // whether to show page's updated time at the top-right corner of item
   showPageUpdatedTime?: boolean, // whether to show page's updated time at the top-right corner of item
   onCheckboxChanged?: (isChecked: boolean, pageId: string) => void,
   onCheckboxChanged?: (isChecked: boolean, pageId: string) => void,
   onClickItem?: (pageId: string) => void,
   onClickItem?: (pageId: string) => void,
-  onPageOperated?: () => void,
 }
 }
 
 
 const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (props: Props, ref): JSX.Element => {
 const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (props: Props, ref): JSX.Element => {
@@ -42,7 +41,7 @@ const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (pr
     page: { pageData, pageMeta }, isSelected, isEnableActions,
     page: { pageData, pageMeta }, isSelected, isEnableActions,
     forceHideMenuItems,
     forceHideMenuItems,
     showPageUpdatedTime,
     showPageUpdatedTime,
-    onClickItem, onCheckboxChanged, onPageOperated,
+    onClickItem, onCheckboxChanged,
   } = props;
   } = props;
 
 
   const inputRef = useRef<HTMLInputElement>(null);
   const inputRef = useRef<HTMLInputElement>(null);
@@ -102,11 +101,10 @@ const PageListItemLSubstance: ForwardRefRenderFunction<ISelectable, Props> = (pr
 
 
 
 
   const pageDeletedHandler: OnDeletedFunction = useCallback((pathOrPathsToDelete, isRecursively, isCompletely) => {
   const pageDeletedHandler: OnDeletedFunction = useCallback((pathOrPathsToDelete, isRecursively, isCompletely) => {
-    if (typeof pathOrPathsToDelete !== 'string' || onPageOperated == null) {
+    if (typeof pathOrPathsToDelete !== 'string') {
       return;
       return;
     }
     }
-    onPageOperated();
-  }, [onPageOperated]);
+  }, []);
 
 
   const deleteMenuItemClickHandler = useCallback((_id, pageInfo) => {
   const deleteMenuItemClickHandler = useCallback((_id, pageInfo) => {
     const { _id: pageId, revision: revisionId, path } = pageData;
     const { _id: pageId, revision: revisionId, path } = pageData;

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

@@ -119,7 +119,7 @@ export const SearchPage = (props: Props): JSX.Element => {
 
 
   const { data: isSearchServiceReachable } = useIsSearchServiceReachable();
   const { data: isSearchServiceReachable } = useIsSearchServiceReachable();
 
 
-  const { data, conditions, mutate: mutateSWRxFullTextSearch } = useSWRxFullTextSearch(keyword, {
+  const { data, conditions } = useSWRxFullTextSearch(keyword, {
     limit: INITIAL_PAGIONG_SIZE,
     limit: INITIAL_PAGIONG_SIZE,
     ...configurationsByControl,
     ...configurationsByControl,
     ...configurationsByPagination,
     ...configurationsByPagination,
@@ -271,7 +271,6 @@ export const SearchPage = (props: Props): JSX.Element => {
       searchControl={searchControl}
       searchControl={searchControl}
       searchResultListHead={searchResultListHead}
       searchResultListHead={searchResultListHead}
       searchPager={searchPager}
       searchPager={searchPager}
-      onPageOperated={mutateSWRxFullTextSearch}
     />
     />
   );
   );
 };
 };

+ 0 - 2
packages/app/src/components/SearchPage/SearchResultList.tsx

@@ -18,7 +18,6 @@ type Props = {
   forceHideMenuItems?: ForceHideMenuItems,
   forceHideMenuItems?: ForceHideMenuItems,
   onPageSelected?: (page?: IPageWithMeta<IPageSearchMeta>) => void,
   onPageSelected?: (page?: IPageWithMeta<IPageSearchMeta>) => void,
   onCheckboxChanged?: (isChecked: boolean, pageId: string) => void,
   onCheckboxChanged?: (isChecked: boolean, pageId: string) => void,
-  onPageOperated?: () => void,
 }
 }
 
 
 const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props> = (props:Props, ref) => {
 const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props> = (props:Props, ref) => {
@@ -96,7 +95,6 @@ const SearchResultListSubstance: ForwardRefRenderFunction<ISelectableAll, Props>
             forceHideMenuItems={forceHideMenuItems}
             forceHideMenuItems={forceHideMenuItems}
             onClickItem={clickItemHandler}
             onClickItem={clickItemHandler}
             onCheckboxChanged={props.onCheckboxChanged}
             onCheckboxChanged={props.onCheckboxChanged}
-            onPageOperated={props.onPageOperated}
           />
           />
         );
         );
       })}
       })}

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

@@ -28,8 +28,6 @@ type Props = {
   searchControl: React.ReactNode,
   searchControl: React.ReactNode,
   searchResultListHead: React.ReactNode,
   searchResultListHead: React.ReactNode,
   searchPager: React.ReactNode,
   searchPager: React.ReactNode,
-
-  onPageOperated?: () => void,
 }
 }
 
 
 const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturnSelectedPageIds, Props> = (props:Props, ref) => {
 const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturnSelectedPageIds, Props> = (props:Props, ref) => {
@@ -38,7 +36,7 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
     pages,
     pages,
     forceHideMenuItems,
     forceHideMenuItems,
     onSelectedPagesByCheckboxesChanged,
     onSelectedPagesByCheckboxesChanged,
-    searchControl, searchResultListHead, searchPager, onPageOperated,
+    searchControl, searchResultListHead, searchPager,
   } = props;
   } = props;
 
 
   const searchResultListRef = useRef<ISelectableAll|null>(null);
   const searchResultListRef = useRef<ISelectableAll|null>(null);
@@ -177,7 +175,6 @@ const SearchPageBaseSubstance: ForwardRefRenderFunction<ISelectableAll & IReturn
                       forceHideMenuItems={forceHideMenuItems}
                       forceHideMenuItems={forceHideMenuItems}
                       onPageSelected={page => setSelectedPageWithMeta(page)}
                       onPageSelected={page => setSelectedPageWithMeta(page)}
                       onCheckboxChanged={checkboxChangedHandler}
                       onCheckboxChanged={checkboxChangedHandler}
-                      onPageOperated={onPageOperated}
                     />
                     />
                   </div>
                   </div>
                 ) }
                 ) }