Skip to content

Commit 1a95147

Browse files
Merge pull request #53371 from margelo/cleanup/split-filtering-ordering
cleanup: split filtering & ordering in OptionsListUtils
2 parents 134d5d4 + 25a1352 commit 1a95147

16 files changed

+359
-319
lines changed

src/components/Search/SearchFiltersChatsSelector.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
6666
}, [areOptionsInitialized, isScreenTransitionEnd, options]);
6767

6868
const chatOptions = useMemo(() => {
69-
return OptionsListUtils.filterOptions(defaultOptions, cleanSearchTerm, {
69+
return OptionsListUtils.filterAndOrderOptions(defaultOptions, cleanSearchTerm, {
7070
selectedOptions,
7171
excludeLogins: CONST.EXPENSIFY_EMAILS,
72-
maxRecentReportsToShow: 0,
7372
});
7473
}, [defaultOptions, cleanSearchTerm, selectedOptions]);
7574

src/components/Search/SearchFiltersParticipantsSelector.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,20 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
5454
return defaultListOptions;
5555
}
5656

57-
return OptionsListUtils.getOptions(
57+
return OptionsListUtils.getValidOptions(
5858
{
5959
reports: options.reports,
6060
personalDetails: options.personalDetails,
6161
},
6262
{
6363
selectedOptions,
6464
excludeLogins: CONST.EXPENSIFY_EMAILS,
65-
maxRecentReportsToShow: 0,
6665
},
6766
);
6867
}, [areOptionsInitialized, options.personalDetails, options.reports, selectedOptions]);
6968

7069
const chatOptions = useMemo(() => {
71-
return OptionsListUtils.filterOptions(defaultOptions, cleanSearchTerm, {
70+
return OptionsListUtils.filterAndOrderOptions(defaultOptions, cleanSearchTerm, {
7271
selectedOptions,
7372
excludeLogins: CONST.EXPENSIFY_EMAILS,
7473
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,

src/components/Search/SearchRouter/SearchRouterList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function SearchRouterList(
147147
return [];
148148
}
149149

150-
const filteredOptions = OptionsListUtils.getOptions(
150+
const filteredOptions = OptionsListUtils.getValidOptions(
151151
{
152152
reports: options.reports,
153153
personalDetails: options.personalDetails,
@@ -378,7 +378,7 @@ function SearchRouterList(
378378
}
379379

380380
Timing.start(CONST.TIMING.SEARCH_FILTER_OPTIONS);
381-
const filteredOptions = OptionsListUtils.filterOptions(searchOptions, autocompleteQueryValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
381+
const filteredOptions = OptionsListUtils.filterAndOrderOptions(searchOptions, autocompleteQueryValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
382382
Timing.end(CONST.TIMING.SEARCH_FILTER_OPTIONS);
383383

384384
const reportOptions: OptionData[] = [...filteredOptions.recentReports, ...filteredOptions.personalDetails];

0 commit comments

Comments
 (0)