Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/Search/FilterDropdowns/DropdownButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ function DropdownButton({label, value, viewportOffsetTop, PopoverComponent}: Dro

const popoverContent = useMemo(() => {
return PopoverComponent({closeOverlay: toggleOverlay});
// PopoverComponent is stable so we don't need it here as a dep.
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
}, [toggleOverlay]);
}, [PopoverComponent, toggleOverlay]);

return (
<View ref={anchorRef}>
Expand Down
56 changes: 56 additions & 0 deletions src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import usePolicy from '@hooks/usePolicy';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useWorkspaceList from '@hooks/useWorkspaceList';
import {close} from '@libs/actions/Modal';
import {handleBulkPayItemSelected, updateAdvancedFilters} from '@libs/actions/Search';
import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils';
Expand Down Expand Up @@ -116,6 +117,29 @@ function SearchFiltersBar({
const expensifyIcons = useMemoizedLazyExpensifyIcons(['Filter'] as const);

const taxRates = getAllTaxRates(allPolicies);

// Get workspace data for the filter
const {sections: workspaces} = useWorkspaceList({
policies: allPolicies,
currentUserLogin: email,
shouldShowPendingDeletePolicy: false,
selectedPolicyIDs: undefined,
searchTerm: '',
localeCompare,
});

const shouldDisplayWorkspaceFilter = useMemo(() => workspaces.some((section) => section.data.length > 1), [workspaces]);

const workspaceOptions = useMemo<Array<MultiSelectItem<string>>>(() => {
return workspaces
.flatMap((section) => section.data)
.filter((workspace): workspace is typeof workspace & {policyID: string} => !!workspace.policyID)
.map((workspace) => ({
text: workspace.text,
value: workspace.policyID,
}));
}, [workspaces]);

const allCards = useMemo(() => mergeCardListWithWorkspaceFeeds(workspaceCardFeeds ?? CONST.EMPTY_OBJECT, userCardList), [userCardList, workspaceCardFeeds]);
const selectedTransactionsKeys = useMemo(() => Object.keys(selectedTransactions ?? {}), [selectedTransactions]);
const hasMultipleOutputCurrency = useMemo(() => {
Expand All @@ -128,6 +152,16 @@ function SearchFiltersBar({
return buildFilterFormValuesFromQuery(queryJSON, policyCategories, policyTagsLists, currencyList, personalDetails, allCards, reports, taxRates);
}, [allCards, currencyList, personalDetails, policyCategories, policyTagsLists, queryJSON, reports, taxRates]);

// Get selected workspace options from filterFormValues or queryJSON
const selectedWorkspaceOptions = useMemo(() => {
const policyIDs = filterFormValues.policyID ?? queryJSON.policyID;
if (!policyIDs) {
return [];
}
const normalizedIDs = Array.isArray(policyIDs) ? policyIDs : [policyIDs];
return workspaceOptions.filter((option) => normalizedIDs.includes(option.value));
}, [filterFormValues.policyID, queryJSON.policyID, workspaceOptions]);

const hasErrors = Object.keys(searchResultsErrors ?? {}).length > 0 && !isOffline;
const shouldShowSelectedDropdown = headerButtonsOptions.length > 0 && (!shouldUseNarrowLayout || isMobileSelectionModeEnabled);

Expand Down Expand Up @@ -475,6 +509,15 @@ function SearchFiltersBar({
[filterFormValues.from, updateFilterForm],
);

const workspaceComponent = useMemo(() => {
const updateWorkspaceFilterForm = (items: Array<MultiSelectItem<string>>) => {
updateFilterForm({policyID: items.map((item) => item.value)});
};
return createMultiSelectComponent('workspace.common.workspace', workspaceOptions, selectedWorkspaceOptions, updateWorkspaceFilterForm);
}, [createMultiSelectComponent, workspaceOptions, selectedWorkspaceOptions, updateFilterForm]);

const workspaceValue = useMemo(() => selectedWorkspaceOptions.map((option) => option.text), [selectedWorkspaceOptions]);

const {typeFiltersKeys} = useAdvancedSearchFilters();

/**
Expand Down Expand Up @@ -596,6 +639,16 @@ function SearchFiltersBar({
value: fromValue,
filterKey: FILTER_KEYS.FROM,
},
...(shouldDisplayWorkspaceFilter
? [
{
label: translate('workspace.common.workspace'),
PopoverComponent: workspaceComponent,
value: workspaceValue,
filterKey: FILTER_KEYS.POLICY_ID,
},
]
: []),
].filter((filterItem) => isFilterSupported(filterItem.filterKey, type?.value ?? CONST.SEARCH.DATA_TYPES.EXPENSE));

return filterList;
Expand Down Expand Up @@ -636,6 +689,9 @@ function SearchFiltersBar({
hasMultipleOutputCurrency,
has,
is,
shouldDisplayWorkspaceFilter,
workspaceComponent,
workspaceValue,
]);

const hiddenSelectedFilters = useMemo(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useAdvancedSearchFilters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ function useAdvancedSearchFilters() {
const shouldDisplayTagFilter = shouldDisplayFilter(tagListsUnpacked.length, areTagsEnabled, !!selectedPolicyTagLists);
const shouldDisplayCardFilter = shouldDisplayFilter(Object.keys(allCards).length, areCardsEnabled);
const shouldDisplayTaxFilter = shouldDisplayFilter(Object.keys(taxRates).length, areTaxEnabled);
const shouldDisplayWorkspaceFilter = workspaces.some((section) => section.data.length !== 0);
const shouldDisplayWorkspaceFilter = workspaces.some((section) => section.data.length > 1);
const shouldDisplayGroupByFilter = !!groupBy;
const shouldDisplayGroupCurrencyFilter = shouldDisplayGroupByFilter;
const shouldDisplayReportFieldFilter = Object.values(policies).some((policy): policy is NonNullable<Policy> => {
Expand Down