Merge pull request #53371 from margelo/cleanup/split-filtering-ordering

cleanup: split filtering & ordering in OptionsListUtils

Author: neil-marcellini

src/components/Search/SearchFiltersChatsSelector.tsx

@@ -66,10 +66,9 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
     }, [areOptionsInitialized, isScreenTransitionEnd, options]);
 
     const chatOptions = useMemo(() => {
-        return OptionsListUtils.filterOptions(defaultOptions, cleanSearchTerm, {
+        return OptionsListUtils.filterAndOrderOptions(defaultOptions, cleanSearchTerm, {
             selectedOptions,
             excludeLogins: CONST.EXPENSIFY_EMAILS,
-            maxRecentReportsToShow: 0,
         });
     }, [defaultOptions, cleanSearchTerm, selectedOptions]);
 

src/components/Search/SearchFiltersParticipantsSelector.tsx

@@ -54,21 +54,20 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
             return defaultListOptions;
         }
 
-        return OptionsListUtils.getOptions(
+        return OptionsListUtils.getValidOptions(
             {
                 reports: options.reports,
                 personalDetails: options.personalDetails,
             },
             {
                 selectedOptions,
                 excludeLogins: CONST.EXPENSIFY_EMAILS,
-                maxRecentReportsToShow: 0,
             },
         );
     }, [areOptionsInitialized, options.personalDetails, options.reports, selectedOptions]);
 
     const chatOptions = useMemo(() => {
-        return OptionsListUtils.filterOptions(defaultOptions, cleanSearchTerm, {
+        return OptionsListUtils.filterAndOrderOptions(defaultOptions, cleanSearchTerm, {
             selectedOptions,
             excludeLogins: CONST.EXPENSIFY_EMAILS,
             maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,

src/components/Search/SearchRouter/SearchRouterList.tsx

@@ -147,7 +147,7 @@ function SearchRouterList(
             return [];
         }
 
-        const filteredOptions = OptionsListUtils.getOptions(
+        const filteredOptions = OptionsListUtils.getValidOptions(
             {
                 reports: options.reports,
                 personalDetails: options.personalDetails,
@@ -378,7 +378,7 @@ function SearchRouterList(
         }
 
         Timing.start(CONST.TIMING.SEARCH_FILTER_OPTIONS);
-        const filteredOptions = OptionsListUtils.filterOptions(searchOptions, autocompleteQueryValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
+        const filteredOptions = OptionsListUtils.filterAndOrderOptions(searchOptions, autocompleteQueryValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
         Timing.end(CONST.TIMING.SEARCH_FILTER_OPTIONS);
 
         const reportOptions: OptionData[] = [...filteredOptions.recentReports, ...filteredOptions.personalDetails];