Correctly saved policyID in saved searches

Expensify · Sep 27, 2024 · ea1cd8a · ea1cd8a
1 parent a195955
commit ea1cd8a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
@@ -296,8 +296,9 @@ function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModa
     }
 
     const onPress = () => {
-        const values = SearchUtils.buildFilterFormValuesFromQuery(queryJSON);
-        SearchActions.updateAdvancedFilters(values);
+        const filterFormValues = SearchUtils.buildFilterFormValuesFromQuery(queryJSON);
+        SearchActions.updateAdvancedFilters(filterFormValues);
+
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS);
     };
 

diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
@@ -576,7 +576,7 @@ function buildSearchQueryString(queryJSON?: SearchQueryJSON) {
  */
 function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvancedFiltersForm>) {
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
-    const {type, status, ...otherFilters} = filterValues;
+    const {type, status, policyID, ...otherFilters} = filterValues;
     const filtersString: string[] = [];
 
     if (type) {
@@ -589,6 +589,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
         filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${sanitizedStatus}`);
     }
 
+    if (policyID) {
+        const sanitizedPolicyID = sanitizeString(policyID);
+        filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${sanitizedPolicyID}`);
+    }
+
     const mappedFilters = Object.entries(otherFilters)
         .map(([filterKey, filterValue]) => {
             if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID) && filterValue) {
@@ -685,6 +690,9 @@ function buildFilterFormValuesFromQuery(queryJSON: SearchQueryJSON) {
 
     filtersForm[FILTER_KEYS.TYPE] = queryJSON.type;
     filtersForm[FILTER_KEYS.STATUS] = queryJSON.status;
+    if (queryJSON.policyID) {
+        filtersForm[FILTER_KEYS.POLICY_ID] = queryJSON.policyID;
+    }
 
     return filtersForm;
 }

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, SearchQueryJSON} from '@components/Search/types';
+import type {AdvancedFiltersKeys} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -230,8 +230,8 @@ function AdvancedSearchFilters() {
     const personalDetails = usePersonalDetails();
     const currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
 
-    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterFormValues(searchAdvancedFilters) || '', [searchAdvancedFilters]);
-    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()) ?? ({} as SearchQueryJSON), [queryString]);
+    const queryString = useMemo(() => SearchUtils.buildQueryStringFromFilterFormValues(searchAdvancedFilters), [searchAdvancedFilters]);
+    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(queryString || SearchUtils.buildCannedSearchQuery()), [queryString]);
 
     const applyFiltersAndNavigate = () => {
         SearchActions.clearAllFilters();
@@ -245,7 +245,7 @@ function AdvancedSearchFilters() {
 
     const onSaveSearch = () => {
         const savedSearchKeys = Object.keys(savedSearches ?? {});
-        if (savedSearches && savedSearchKeys.includes(String(queryJSON.hash))) {
+        if (!queryJSON || (savedSearches && savedSearchKeys.includes(String(queryJSON.hash)))) {
             // If the search is already saved, return early to prevent unnecessary API calls
             Navigation.dismissModal();
             return;
@@ -299,6 +299,8 @@ function AdvancedSearchFilters() {
         };
     });
 
+    const displaySearchButton = queryJSON && !SearchUtils.isCannedSearchQuery(queryJSON);
+
     return (
         <>
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
@@ -320,8 +322,7 @@ function AdvancedSearchFilters() {
                     })}
                 </View>
             </ScrollView>
-
-            {!SearchUtils.isCannedSearchQuery(queryJSON) && (
+            {displaySearchButton && (
                 <Button
                     text={translate('search.saveSearch')}
                     onPress={onSaveSearch}