Merge pull request Expensify#71495 from Expensify/jsenyitko-negation

Add negation to filters

Author: luacmartins

src/CONST/index.ts

@@ -6709,6 +6709,7 @@ const CONST = {
                 [this.STATUS.EXPENSE.DRAFTS]: 'draft',
             };
         },
+        NOT_MODIFIER: 'Not',
         DATE_MODIFIERS: {
             ON: 'On',
             AFTER: 'After',

src/components/Search/SearchPageHeader/SearchFiltersBar.tsx

@@ -41,14 +41,7 @@ import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getActiveAdminWorkspaces, getAllTaxRates, isPaidGroupPolicy} from '@libs/PolicyUtils';
 import {isExpenseReport} from '@libs/ReportUtils';
-import {
-    buildFilterFormValuesFromQuery,
-    buildQueryStringFromFilterFormValues,
-    buildSearchQueryJSON,
-    buildSearchQueryString,
-    isFilterSupported,
-    isSearchDatePreset,
-} from '@libs/SearchQueryUtils';
+import {buildFilterFormValuesFromQuery, buildQueryStringFromFilterFormValues, isFilterSupported, isSearchDatePreset} from '@libs/SearchQueryUtils';
 import {getDatePresets, getFeedOptions, getGroupByOptions, getGroupCurrencyOptions, getHasOptions, getStatusOptions, getTypeOptions, getWithdrawalTypeOptions} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -254,9 +247,7 @@ function SearchFiltersBar({
                 updatedFilterFormValues.status = CONST.SEARCH.STATUS.EXPENSE.ALL;
             }
 
-            const filterString = buildQueryStringFromFilterFormValues(updatedFilterFormValues);
-            const searchQueryJSON = buildSearchQueryJSON(filterString);
-            const queryString = buildSearchQueryString(searchQueryJSON);
+            const queryString = buildQueryStringFromFilterFormValues(updatedFilterFormValues);
 
             close(() => {
                 Navigation.setParams({q: queryString});

src/libs/SearchParser/autocompleteParser.js

@@ -18,7 +18,14 @@
 // Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 }}
 // per-parser initializer (code executed before every parse).
-{ let autocomplete = null; }
+{ 
+  let autocomplete = null; 
+
+  // List fields where you cannot prefix it with "-" to negate it
+  const nonNegatableKeys = new Set([
+    "type", "keyword", "groupCurrency", "groupBy"
+  ]);
+}
 
 query = _ ranges:filterList? _ { return { autocomplete, ranges }; }
 
@@ -28,12 +35,15 @@ filterList
 filter = @(defaultFilter / freeTextFilter)
 
 defaultFilter
-  = _ key:filterKey _ op:filterOperator _ value:identifier? {
+  = _ neg:"-"? key:filterKey _ op:filterOperator _ value:identifier? {
       expectingNestedQuote = false; nameOperator = false; // Reset string parser
 
+      const isNegated = !!neg && !nonNegatableKeys.has(key);
+
       if (!value) {
         autocomplete = {
           key,
+          negated: isNegated,
           value: "",
           start: location().end.offset,
           length: 0,
@@ -43,13 +53,15 @@ defaultFilter
 
       autocomplete = {
         key,
+        negated: isNegated,
         ...value[value.length - 1],
       };
       return value
-        .filter((filter) => filter.length > 0)
-        .map((filter) => ({
+        .filter((v) => v.length > 0)
+        .map((v) => ({
           key,
-          ...filter,
+          negated: isNegated,
+          ...v,
         }));
     }
 
@@ -105,7 +117,7 @@ filterKey
   = k:autocompleteKey {
       nameOperator = (k === "from" || k === "to" || k === "payer" || k === "exporter" || k === "attendee" || k === "createdBy" || k === "assignee");
       return k;
-}
+    }
 
 identifier
   = parts:(quotedString / alphanumeric)|1.., ","| empty:","? {