improve code

Expensify · Sep 13, 2024 · 2dc08e9 · 2dc08e9
1 parent 8b4f4e0
commit 2dc08e9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -9,7 +9,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import ScrollView from '@components/ScrollView';
-import type {AdvancedFiltersKeys} from '@components/Search/types';
+import type {AdvancedFiltersKeys, SearchQueryJSON} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -227,8 +227,8 @@ function AdvancedSearchFilters() {
     const personalDetails = usePersonalDetails();
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
-    const CANNED_SEARCH_QUERY = 'type:expense status:all';
-    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterValues(searchAdvancedFilters), [searchAdvancedFilters]);
+    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterValues(searchAdvancedFilters) || '', [searchAdvancedFilters]);
+    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()) ?? ({} as SearchQueryJSON), [queryString]);
 
     const applyFiltersAndNavigate = () => {
         SearchActions.clearAllFilters();
@@ -241,11 +241,6 @@ function AdvancedSearchFilters() {
     };
 
     const onSaveSearch = () => {
-        const queryJSON = SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery());
-        if (!queryJSON) {
-            return;
-        }
-
         SearchActions.saveSearch({
             queryJSON,
         });
@@ -311,7 +306,8 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-            {queryString !== CANNED_SEARCH_QUERY && (
+
+            {!SearchUtils.isCannedSearchQuery(queryJSON) && (
                 <Button
                     text={translate('search.saveSearch')}
                     onPress={onSaveSearch}

diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
@@ -14,6 +14,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as SearchUtils from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
@@ -27,8 +28,6 @@ function SearchPageBottomTab() {
     const {clearSelectedTransactions} = useSearchContext();
     const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
 
-    const EXPENSE_FILTERS_TYPE = 'expense';
-
     const {queryJSON, policyID, isExpenseFilterPage} = useMemo(() => {
         if (activeCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE) {
             return {queryJSON: undefined, policyID: undefined, isExpenseFilterPage: undefined};
@@ -39,7 +38,7 @@ function SearchPageBottomTab() {
         return {
             queryJSON: parsedQuery,
             policyID: parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery),
-            isExpenseFilterPage: parsedQuery?.type === EXPENSE_FILTERS_TYPE,
+            isExpenseFilterPage: parsedQuery?.type === CONST.SEARCH.DATA_TYPES.EXPENSE,
         };
     }, [activeCentralPaneRoute]);
 
@@ -62,7 +61,7 @@ function SearchPageBottomTab() {
                             activeWorkspaceID={policyID}
                             breadcrumbLabel={translate('common.search')}
                             shouldDisplaySearch={false}
-                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && queryJSON?.inputQuery !== SearchUtils.buildCannedSearchQuery()}
+                            isCustomSearchQuery={shouldUseNarrowLayout && isExpenseFilterPage && !SearchUtils.isCannedSearchQuery(queryJSON)}
                         />
                         <SearchTypeMenu queryJSON={queryJSON} />
                     </>

diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
@@ -223,8 +223,12 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
                     );
                 })}
             </View>
-            <ScrollView>{savedSearches && Object.keys(savedSearches).length > 0 && renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
-            <DeleteConfirmModal />
+            {savedSearches && Object.keys(savedSearches).length > 0 && (
+                <>
+                    <ScrollView>{renderSavedSearchesSection(savedSearchesMenuItems())}</ScrollView>
+                    <DeleteConfirmModal />
+                </>
+            )}
         </>
     );
 }