Yuki Takei 1 год назад
Родитель
Сommit
38eabe9f41
2 измененных файлов с 1 добавлено и 17 удалено
  1. 1 7
      apps/app/src/components/SearchPage.tsx
  2. 0 10
      apps/app/src/components/SearchPage/SearchControl.tsx

+ 1 - 7
apps/app/src/components/SearchPage.tsx

@@ -95,8 +95,6 @@ export const SearchPage = (): JSX.Element => {
   const selectAllControlRef = useRef<ISelectableAndIndeterminatable|null>(null);
   const selectAllControlRef = useRef<ISelectableAndIndeterminatable|null>(null);
   const searchPageBaseRef = useRef<ISelectableAll & IReturnSelectedPageIds|null>(null);
   const searchPageBaseRef = useRef<ISelectableAll & IReturnSelectedPageIds|null>(null);
 
 
-  const { data: isSearchServiceReachable } = useIsSearchServiceReachable();
-
   const { data, conditions, mutate } = useSWRxSearch(keyword ?? '', null, {
   const { data, conditions, mutate } = useSWRxSearch(keyword ?? '', null, {
     ...configurationsByControl,
     ...configurationsByControl,
     offset,
     offset,
@@ -220,12 +218,8 @@ export const SearchPage = (): JSX.Element => {
 
 
 
 
   const searchControl = useMemo(() => {
   const searchControl = useMemo(() => {
-    if (!isSearchServiceReachable) {
-      return <></>;
-    }
     return (
     return (
       <SearchControl
       <SearchControl
-        isSearchServiceReachable={isSearchServiceReachable}
         isEnableSort
         isEnableSort
         isEnableFilter
         isEnableFilter
         initialSearchConditions={initialSearchConditions}
         initialSearchConditions={initialSearchConditions}
@@ -235,7 +229,7 @@ export const SearchPage = (): JSX.Element => {
         isCollapsed={isCollapsed}
         isCollapsed={isCollapsed}
       />
       />
     );
     );
-  }, [allControl, collapseContents, initialSearchConditions, isCollapsed, isSearchServiceReachable, searchInvokedHandler]);
+  }, [allControl, collapseContents, initialSearchConditions, isCollapsed, searchInvokedHandler]);
 
 
   const searchResultListHead = useMemo(() => {
   const searchResultListHead = useMemo(() => {
     if (data == null) {
     if (data == null) {

+ 0 - 10
apps/app/src/components/SearchPage/SearchControl.tsx

@@ -15,7 +15,6 @@ import SortControl from './SortControl';
 import styles from './SearchControl.module.scss';
 import styles from './SearchControl.module.scss';
 
 
 type Props = {
 type Props = {
-  isSearchServiceReachable: boolean,
   isEnableSort: boolean,
   isEnableSort: boolean,
   isEnableFilter: boolean,
   isEnableFilter: boolean,
   initialSearchConditions: Partial<ISearchConditions>,
   initialSearchConditions: Partial<ISearchConditions>,
@@ -31,7 +30,6 @@ type Props = {
 const SearchControl = React.memo((props: Props): JSX.Element => {
 const SearchControl = React.memo((props: Props): JSX.Element => {
 
 
   const {
   const {
-    isSearchServiceReachable,
     isEnableSort,
     isEnableSort,
     isEnableFilter,
     isEnableFilter,
     initialSearchConditions,
     initialSearchConditions,
@@ -52,14 +50,6 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
 
 
   const { t } = useTranslation('');
   const { t } = useTranslation('');
 
 
-  const searchFormSubmittedHandler = useCallback((input: string) => {
-    setKeyword(input);
-
-    onSearchInvoked?.(input, {
-      sort, order, includeUserPages, includeTrashPages,
-    });
-  }, [includeTrashPages, includeUserPages, onSearchInvoked, order, sort]);
-
   const changeSortHandler = useCallback((nextSort: SORT_AXIS, nextOrder: SORT_ORDER) => {
   const changeSortHandler = useCallback((nextSort: SORT_AXIS, nextOrder: SORT_ORDER) => {
     setSort(nextSort);
     setSort(nextSort);
     setOrder(nextOrder);
     setOrder(nextOrder);