update some filters

Expensify · Nov 6, 2024 · 13f03dc · 13f03dc
1 parent 95d29e9
commit 13f03dc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
@@ -110,13 +110,13 @@ key "key"
       / "category"
       / "to"
       / "tax-rate"
-      / "dard"
+      / "card"
       / "from"
       / "expense-type"
     )
 
 defaultKey "default key"
-  = @("type" / "status" / "sort-by" / "sort-order" / "workspacec")
+  = @("type" / "status" / "sort-by" / "sort-order" / "workspace")
 
 identifier
   = (","+)? parts:(quotedString / alphanumeric)|1.., ","+| empty:(","+)? {

diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
@@ -16,14 +16,15 @@ import Navigation from '@navigation/Navigation';
 import * as SearchActions from '@userActions/Search';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 
 function SearchFiltersCardPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
-    const currentCards = searchAdvancedFiltersForm?.cardID;
+    const currentCards = searchAdvancedFiltersForm?.[FILTER_KEYS.CARD_ID];
     const [newCards, setNewCards] = useState(currentCards ?? []);
 
     const sections = useMemo(() => {
@@ -52,7 +53,7 @@ function SearchFiltersCardPage() {
 
     const handleConfirmSelection = useCallback(() => {
         SearchActions.updateAdvancedFilters({
-            cardID: newCards,
+            [FILTER_KEYS.CARD_ID]: newCards,
         });
 
         Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);

diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -13,6 +13,7 @@ import * as SearchActions from '@userActions/Search';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 
 function SearchFiltersExpenseTypePage() {
     const styles = useThemeStyles();
@@ -21,7 +22,7 @@ function SearchFiltersExpenseTypePage() {
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const initiallySelectedItems = useMemo(
         () =>
-            searchAdvancedFiltersForm?.expenseType
+            searchAdvancedFiltersForm?.[FILTER_KEYS.EXPENSE_TYPE]
                 ?.filter((expenseType) => Object.values(CONST.SEARCH.TRANSACTION_TYPE).includes(expenseType as ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>))
                 .map((expenseType) => {
                     const expenseTypeName = translate(getExpenseTypeTranslationKey(expenseType as ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>));
@@ -38,7 +39,7 @@ function SearchFiltersExpenseTypePage() {
         });
     }, [allExpenseTypes, translate]);
 
-    const updateExpenseTypeFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({expenseType: values}), []);
+    const updateExpenseTypeFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({[CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE]: values}), []);
 
     return (
         <ScreenWrapper

diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
@@ -13,6 +13,7 @@ import * as SearchActions from '@userActions/Search';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 
 function SearchFiltersTaxRatePage() {
     const styles = useThemeStyles();
@@ -22,14 +23,14 @@ function SearchFiltersTaxRatePage() {
     const allTaxRates = getAllTaxRates();
     const selectedTaxesItems: SearchMultipleSelectionPickerItem[] = [];
     Object.entries(allTaxRates).forEach(([taxRateName, taxRateKeys]) => {
-        searchAdvancedFiltersForm?.taxRate?.forEach((taxRateKey) => {
+        searchAdvancedFiltersForm?.[FILTER_KEYS.TAX_RATE]?.forEach((taxRateKey) => {
             if (!taxRateKeys.includes(taxRateKey) || selectedTaxesItems.some((item) => item.name === taxRateName)) {
                 return;
             }
             selectedTaxesItems.push({name: taxRateName, value: taxRateKeys});
         });
     });
-    const policyID = searchAdvancedFiltersForm?.policyID ?? '-1';
+    const policyID = searchAdvancedFiltersForm?.[FILTER_KEYS.POLICY_ID] ?? '-1';
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const singlePolicyTaxRates = policy?.taxRates?.taxes;