Allow workspace and status filter to be negatable

src/CONST/index.ts

@@ -6837,7 +6837,6 @@ const CONST = {
         },
         STATUS: {
             EXPENSE: {
-                ALL: '',
                 UNREPORTED: 'unreported',
                 DRAFTS: 'drafts',
                 OUTSTANDING: 'outstanding',
@@ -6847,26 +6846,22 @@ const CONST = {
                 DELETED: 'deleted',
             },
             EXPENSE_REPORT: {
-                ALL: '',
                 DRAFTS: 'drafts',
                 OUTSTANDING: 'outstanding',
                 APPROVED: 'approved',
                 DONE: 'done',
                 PAID: 'paid',
             },
             INVOICE: {
-                ALL: '',
                 OUTSTANDING: 'outstanding',
                 PAID: 'paid',
             },
             TRIP: {
-                ALL: '',
                 CURRENT: 'current',
                 PAST: 'past',
             },
             CHAT: {},
             TASK: {
-                ALL: '',
                 OUTSTANDING: 'outstanding',
                 COMPLETED: 'completed',
             },
@@ -6956,7 +6951,6 @@ const CONST = {
         },
         SYNTAX_ROOT_KEYS: {
             TYPE: 'type',
-            STATUS: 'status',
             SORT_BY: 'sortBy',
             SORT_ORDER: 'sortOrder',
             VIEW: 'view',

src/components/Search/FilterComponents/AdvancedFilters/FilterList.tsx

@@ -1,6 +1,7 @@
 import Icon from '@components/Icon';
 import {PressableWithFeedback} from '@components/Pressable';
 import ScrollView from '@components/ScrollView';
+import type {Filter} from '@components/Search/types';
 import SpacerView from '@components/SpacerView';
 import Text from '@components/Text';
 
@@ -33,7 +34,7 @@ type FilterItemCallbacks = {
 
 type FilterListProps = FilterItemCallbacks & {
     type: SearchDataTypes | undefined;
-    policyID: string[] | undefined;
+    policyID: Filter;
     selectedFilter?: SearchFilter['key'];
     style?: StyleProp<ViewStyle>;
     contentContainerStyle?: StyleProp<ViewStyle>;

src/components/Search/FilterComponents/AdvancedFilters/SearchAdvancedFiltersContent.tsx

@@ -1,4 +1,4 @@
-import {isAmountFilterKey, isDateFilterKey, isTextFilterKey} from '@libs/SearchUIUtils';
+import {getFilterNegatableValue, isAmountFilterKey, isDateFilterKey, isTextFilterKey} from '@libs/SearchUIUtils';
 import type {SearchFilter} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
@@ -8,7 +8,6 @@ import React from 'react';
 
 import type {FilterComponentsProps} from '..';
 import type {AmountFilterContentProps} from './AmountFilterContent';
-import type {CommonFilterContentProps} from './CommonFilterContent';
 import type {DateFilterContentProps} from './DateFilterContent';
 import type {ReportFieldFilterContentProps} from './ReportFieldFilterContent';
 import type {TextInputFilterContentProps} from './TextInputFilterContent';
@@ -17,11 +16,10 @@ type TextInputFilterContentWrapperProps = Pick<TextInputFilterContentProps, 'fil
 type AmountFilterContentWrapperProps = Pick<AmountFilterContentProps, 'filterKey' | 'value' | 'onChange'>;
 type DateFilterContentWrapperProps = Pick<DateFilterContentProps, 'filterKey' | 'value' | 'hasFeed' | 'onChange'>;
 type ReportFieldFilterContentWrapperProps = Pick<ReportFieldFilterContentProps, 'values' | 'onChange'>;
-type CommonFilterContentWrapperProps = Omit<CommonFilterContentProps, 'selectionListTextInputStyle' | 'selectionListStyle' | 'autoFocus' | 'footer'>;
+type CommonFilterContentWrapperProps = Omit<FilterComponentsProps, 'selectionListTextInputStyle' | 'selectionListStyle' | 'autoFocus' | 'footer'>;
 type SearchAdvancedFiltersContentProps = {
     filterKey: SearchFilter['key'];
     values: Partial<SearchAdvancedFiltersForm> | undefined;
-    policyIDQuery: string[] | undefined;
     ready?: boolean;
     components: {
         Text: React.ComponentType<TextInputFilterContentWrapperProps>;
@@ -39,7 +37,7 @@ function getFilterFormValue<K extends FilterComponentsProps['filterKey']>(filter
     return update;
 }
 
-function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready, components, onChange}: SearchAdvancedFiltersContentProps) {
+function SearchAdvancedFiltersContent({filterKey, values, ready, components, onChange}: SearchAdvancedFiltersContentProps) {
     const {Text: TextFilter, Amount: AmountFilter, Date: DateFilter, ReportField: ReportFieldFilter, Common: CommonFilter} = components;
 
     if (isTextFilterKey(filterKey)) {
@@ -112,8 +110,7 @@ function SearchAdvancedFiltersContent({filterKey, values, policyIDQuery, ready,
             filterKey={filterKey}
             value={values?.[filterKey]}
             type={values?.type}
-            policyIDs={values?.policyID}
-            policyIDQuery={policyIDQuery}
+            policyID={getFilterNegatableValue(CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID, values)}
             ready={ready}
             onChange={(newValue) => onChange(getFilterFormValue(filterKey, newValue))}
         />

src/components/Search/FilterComponents/CategorySelector.tsx

@@ -1,14 +1,14 @@
-import type {SearchFilterCommonProps} from '@components/Search/types';
+import type {Filter, SearchFilterCommonProps} from '@components/Search/types';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
-import {sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils';
+import {getAllPolicyValues, sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyCategories, PolicyCategory} from '@src/types/onyx';
+import type {PolicyCategories} from '@src/types/onyx';
 import {getEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {OnyxCollection} from 'react-native-onyx';
@@ -18,10 +18,10 @@ import React from 'react';
 import MultiSelect from './MultiSelect';
 
 type CategorySelectorProps = SearchFilterCommonProps<string[] | undefined> & {
-    policyIDs: string[] | undefined;
+    policyID: Filter | undefined;
 };
 
-function CategorySelector({value = [], policyIDs = [], selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: CategorySelectorProps) {
+function CategorySelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: CategorySelectorProps) {
     const {translate, localeCompare} = useLocalize();
     const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
 
@@ -50,23 +50,13 @@ function CategorySelector({value = [], policyIDs = [], selectionListTextInputSty
         },
         [availableNonPersonalPolicyCategoriesSelector],
     );
-    const selectedPoliciesCategories: PolicyCategory[] = Object.keys(allPolicyCategories ?? {})
-        .filter((key) => policyIDs.map((policyID) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`)?.includes(key))
-        .map((key) => Object.values(allPolicyCategories?.[key] ?? {}))
-        .flat();
 
     const categoryItems = [{text: translate('search.noCategory'), value: CONST.SEARCH.CATEGORY_EMPTY_VALUE as string}];
-    const uniqueCategoryNames = new Set<string>();
-    if (policyIDs.length === 0) {
-        const categories = Object.values(allPolicyCategories ?? {}).flatMap((policyCategories) => Object.values(policyCategories ?? {}));
-        for (const category of categories) {
-            uniqueCategoryNames.add(category.name);
-        }
-    } else if (selectedPoliciesCategories.length > 0) {
-        for (const category of selectedPoliciesCategories) {
-            uniqueCategoryNames.add(category.name);
-        }
-    }
+    const uniqueCategoryNames = new Set<string>(
+        getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY_CATEGORIES, allPolicyCategories).flatMap((policyCategories) =>
+            Object.values(policyCategories ?? {}).map((category) => category.name),
+        ),
+    );
     categoryItems.push(
         ...Array.from(uniqueCategoryNames)
             .filter(Boolean)

src/components/Search/FilterComponents/ExportedToSelector.tsx

@@ -1,5 +1,5 @@
 import Icon from '@components/Icon';
-import type {SearchFilterCommonProps} from '@components/Search/types';
+import type {Filter, SearchFilterCommonProps} from '@components/Search/types';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -10,8 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getSearchValueForConnection} from '@libs/AccountingUtils';
 import {getExportTemplates} from '@libs/actions/Search';
-import {getConnectedIntegrationNamesForPolicies} from '@libs/PolicyUtils';
 import {getIntegrationIcon} from '@libs/ReportUtils';
+import {getAllPolicyValues, getConnectedIntegrationNamesForPolicies} from '@libs/SearchQueryUtils';
 
 import variables from '@styles/variables';
 
@@ -27,15 +27,15 @@ import {View} from 'react-native';
 import MultiSelect from './MultiSelect';
 
 type ExportedToSelectorProps = SearchFilterCommonProps<string[] | undefined> & {
-    policyIDs: string[] | undefined;
+    policyID: Filter | undefined;
 };
 
 const STANDARD_EXPORT_TEMPLATE_ID_TO_DISPLAY_LABEL: Record<string, string> = {
     [CONST.REPORT.EXPORT_OPTIONS.REPORT_LEVEL_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.REPORT_LEVEL_EXPORT,
     [CONST.REPORT.EXPORT_OPTIONS.EXPENSE_LEVEL_EXPORT]: CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT,
 };
 
-function ExportedToSelector({value = [], policyIDs = [], selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: ExportedToSelectorProps) {
+function ExportedToSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: ExportedToSelectorProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const StyleUtils = useStyleUtils();
@@ -56,7 +56,7 @@ function ExportedToSelector({value = [], policyIDs = [], selectionListTextInputS
     const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS);
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
 
-    const connectedIntegrationNames = getConnectedIntegrationNamesForPolicies(policies, policyIDs.length > 0 ? policyIDs : undefined);
+    const connectedIntegrationNames = getConnectedIntegrationNamesForPolicies(policies, policyID);
 
     const integrationConnectionNames = CONST.POLICY.CONNECTIONS.ACCOUNTING_CONNECTION_NAMES;
 
@@ -97,7 +97,7 @@ function ExportedToSelector({value = [], policyIDs = [], selectionListTextInputS
             });
 
         const usedPickerValueKeys = new Set(connectedIntegrationPickerItems.map((item) => item.value));
-        const policiesToLoadTemplatesFrom = policyIDs.length > 0 ? policyIDs.map((id) => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${id}`]).filter(Boolean) : Object.values(policies ?? {});
+        const policiesToLoadTemplatesFrom = getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY, policies);
         const exportTemplatesFromPolicies = policiesToLoadTemplatesFrom.flatMap((policy) => getExportTemplates([], {}, translate, policy, false));
         const exportTemplatesFromAccount = getExportTemplates(integrationsExportTemplates ?? [], csvExportLayouts ?? {}, translate, undefined, true);
         const allExportTemplates = [...exportTemplatesFromAccount, ...exportTemplatesFromPolicies];

src/components/Search/FilterComponents/TagSelector.tsx

@@ -1,10 +1,10 @@
-import type {SearchFilterCommonProps} from '@components/Search/types';
+import type {Filter, SearchFilterCommonProps} from '@components/Search/types';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 
 import {getCleanedTagName, getTagNamesFromTagsLists} from '@libs/PolicyUtils';
-import {sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils';
+import {getAllPolicyValues, sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -19,30 +19,17 @@ import React from 'react';
 import MultiSelect from './MultiSelect';
 
 type TagSelectorProps = SearchFilterCommonProps<string[] | undefined> & {
-    policyIDs: string[] | undefined;
+    policyID: Filter | undefined;
 };
 
-function TagSelector({value = [], policyIDs = [], selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: TagSelectorProps) {
+function TagSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: TagSelectorProps) {
     const {translate, localeCompare} = useLocalize();
     const [allPolicyTagLists = getEmptyObject<NonNullable<OnyxCollection<PolicyTagLists>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS, {selector: passthroughPolicyTagListSelector});
 
-    const selectedPoliciesTagLists = Object.keys(allPolicyTagLists ?? {})
-        .filter((key) => policyIDs.map((policyID) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`)?.includes(key))
-        ?.map((key) => getTagNamesFromTagsLists(allPolicyTagLists?.[key] ?? {}))
-        .flat();
-
     const tagItems = [{text: translate('search.noTag'), value: CONST.SEARCH.TAG_EMPTY_VALUE as string}];
-    const uniqueTagNames = new Set<string>();
-    if (policyIDs.length === 0) {
-        const tagListsUnpacked = Object.values(allPolicyTagLists ?? {}).filter((item) => !!item);
-        for (const tag of tagListsUnpacked.map(getTagNamesFromTagsLists).flat()) {
-            uniqueTagNames.add(tag);
-        }
-    } else if (selectedPoliciesTagLists.length > 0) {
-        for (const tag of selectedPoliciesTagLists) {
-            uniqueTagNames.add(tag);
-        }
-    }
+    const uniqueTagNames = new Set<string>(
+        getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY_TAGS, allPolicyTagLists).flatMap((policyTags) => getTagNamesFromTagsLists(policyTags ?? {})),
+    );
     tagItems.push(
         ...Array.from(uniqueTagNames)
             .map((tagName) => ({text: getCleanedTagName(tagName), value: tagName}))

src/components/Search/FilterComponents/TaxRateSelector.tsx

@@ -1,35 +1,28 @@
-import type {SearchFilterCommonProps} from '@components/Search/types';
+import type {Filter, SearchFilterCommonProps} from '@components/Search/types';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 
 import {getAllTaxRates} from '@libs/PolicyUtils';
+import {getAllPolicyValuesMap} from '@libs/SearchQueryUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
 
 import React from 'react';
 
 import MultiSelect from './MultiSelect';
 
 type TaxRateSelectorProps = SearchFilterCommonProps<string[] | undefined> & {
-    policyIDs: string[] | undefined;
+    policyID: Filter | undefined;
 };
 
-function TaxRateSelector({value = [], policyIDs = [], selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: TaxRateSelectorProps) {
+function TaxRateSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: TaxRateSelectorProps) {
     const {localeCompare} = useLocalize();
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
 
     const allTaxRates = getAllTaxRates(policies);
-    const selectedPoliciesMap = policyIDs?.reduce<Record<string, Policy>>((acc, policyID) => {
-        const key = `${ONYXKEYS.COLLECTION.POLICY}${policyID}`;
-        const policy = policies?.[key];
-        if (policy) {
-            acc[key] = policy;
-        }
-        return acc;
-    }, {});
+    const selectedPoliciesMap = getAllPolicyValuesMap(policyID, ONYXKEYS.COLLECTION.POLICY, policies);
     const scopedTaxRates = !selectedPoliciesMap || Object.keys(selectedPoliciesMap).length === 0 ? allTaxRates : getAllTaxRates(selectedPoliciesMap);
     const taxItems = Object.entries(scopedTaxRates)
         .map(([taxRateName, taxRateKeys]) => ({

src/components/Search/FilterComponents/TypeSelector.tsx

@@ -9,14 +9,15 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {emailSelector} from '@src/selectors/Session';
 import type {Policy} from '@src/types/onyx';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
 import React from 'react';
 
 import SingleSelect from './SingleSelect';
 
-type TypeSelectorProps = SearchFilterCommonProps<string | undefined>;
+type TypeSelectorProps = SearchFilterCommonProps<SearchDataTypes | undefined>;
 
 /**
  * Extracts only the fields needed by getTypeOptions (canSendInvoice check).