fix params for all getFilteredOptions calls

Expensify · Oct 16, 2024 · dfab13e · dfab13e
1 parent b69ea35
commit dfab13e
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 257 deletions.
diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
@@ -44,20 +44,14 @@ function CategoryPicker({selectedCategory, policyID, onSubmit}: CategoryPickerPr
     const [sections, headerMessage, shouldShowTextInput] = useMemo(() => {
         const categories = policyCategories ?? policyCategoriesDraft ?? {};
         const validPolicyRecentlyUsedCategories = policyRecentlyUsedCategories?.filter?.((p) => !isEmptyObject(p));
-        const {categoryOptions} = OptionsListUtils.getFilteredOptions(
-            [],
-            [],
-            [],
-            debouncedSearchValue,
+        const {categoryOptions} = OptionsListUtils.getFilteredOptions({
+            searchValue: debouncedSearchValue,
             selectedOptions,
-            [],
-            false,
-            false,
-            true,
+            includeP2P: false,
+            includeCategories: true,
             categories,
-            validPolicyRecentlyUsedCategories,
-            false,
-        );
+            recentlyUsedCategories: validPolicyRecentlyUsedCategories,
+        });
 
         const categoryData = categoryOptions?.at(0)?.data ?? [];
         const header = OptionsListUtils.getHeaderMessageForNonUserList(categoryData.length > 0, debouncedSearchValue);

diff --git a/src/components/Search/SearchFiltersParticipantsSelector.tsx b/src/components/Search/SearchFiltersParticipantsSelector.tsx
@@ -57,28 +57,13 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
             return defaultListOptions;
         }
 
-        return OptionsListUtils.getFilteredOptions(
-            options.reports,
-            options.personalDetails,
-            undefined,
-            '',
+        return OptionsListUtils.getFilteredOptions({
+            reports: options.reports,
+            personalDetails: options.personalDetails,
             selectedOptions,
-            CONST.EXPENSIFY_EMAILS,
-            false,
-            true,
-            false,
-            {},
-            [],
-            false,
-            {},
-            [],
-            true,
-            false,
-            false,
-            0,
-            undefined,
-            false,
-        );
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+            maxRecentReportsToShow: 0,
+        });
     }, [areOptionsInitialized, options.personalDetails, options.reports, selectedOptions]);
 
     const chatOptions = useMemo(() => {

diff --git a/src/components/TagPicker/index.tsx b/src/components/TagPicker/index.tsx
@@ -87,7 +87,16 @@ function TagPicker({selectedTag, tagListName, policyTags, tagListIndex, policyRe
     }, [selectedOptions, policyTagList, shouldShowDisabledAndSelectedOption]);
 
     const sections = useMemo(
-        () => OptionsListUtils.getFilteredOptions([], [], [], searchValue, selectedOptions, [], false, false, false, {}, [], true, enabledTags, policyRecentlyUsedTagsList, false).tagOptions,
+        () =>
+            OptionsListUtils.getFilteredOptions({
+                searchValue,
+                selectedOptions,
+                includeP2P: false,
+                includeTags: true,
+                tags: enabledTags,
+                recentlyUsedTags: policyRecentlyUsedTagsList,
+                canInviteUser: false,
+            }).tagOptions,
         [searchValue, enabledTags, selectedOptions, policyRecentlyUsedTagsList],
     );
 

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -2236,12 +2236,9 @@ type FilteredOptionsParams = {
 
 type FilteredOptionsParamsWithDefaultSearchValue = Omit<FilteredOptionsParams, 'searchValue'> & {searchValue?: ''};
 
-type FilteredOptionsParamsWithoutOptions = Omit<FilteredOptionsParams, 'reports' | 'personalDetails'> & { reports?: []; personalDetails?: [] };
-
-function getFilteredOptions(
-    params: FilteredOptionsParamsWithDefaultSearchValue | FilteredOptionsParamsWithoutOptions,
-) {
+type FilteredOptionsParamsWithoutOptions = Omit<FilteredOptionsParams, 'reports' | 'personalDetails'> & {reports?: []; personalDetails?: []};
 
+function getFilteredOptions(params: FilteredOptionsParamsWithDefaultSearchValue | FilteredOptionsParamsWithoutOptions) {
     const {
         reports = [],
         personalDetails = [],

diff --git a/src/pages/EditReportFieldDropdown.tsx b/src/pages/EditReportFieldDropdown.tsx
@@ -73,13 +73,13 @@ function EditReportFieldDropdownPage({onSubmit, fieldKey, fieldValue, fieldOptio
                     text: fieldValue,
                 },
             ],
-            
+
             includeP2P: false,
             canInviteUser: false,
             includePolicyReportFieldOptions: true,
             policyReportFieldOptions: validFieldOptions,
             recentlyUsedPolicyReportFieldOptions: recentlyUsedOptions,
-    });
+        });
 
         const policyReportFieldData = policyReportFieldOptions?.[0]?.data ?? [];
         const header = OptionsListUtils.getHeaderMessageForNonUserList(policyReportFieldData.length > 0, debouncedSearchValue);

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
@@ -52,28 +52,15 @@ function useOptions({isGroupChat}: NewChatPageProps) {
     });
 
     const defaultOptions = useMemo(() => {
-        const filteredOptions = OptionsListUtils.getFilteredOptions(
-            listOptions.reports ?? [],
-            listOptions.personalDetails ?? [],
-            betas ?? [],
-            '',
+        const filteredOptions = OptionsListUtils.getFilteredOptions({
+            reports: listOptions.reports ?? [],
+            personalDetails: listOptions.personalDetails ?? [],
+            betas: betas ?? [],
             selectedOptions,
-            isGroupChat ? excludedGroupEmails : [],
-            false,
-            true,
-            false,
-            {},
-            [],
-            false,
-            {},
-            [],
-            true,
-            undefined,
-            undefined,
-            0,
-            undefined,
-            true,
-        );
+            excludeLogins: isGroupChat ? excludedGroupEmails : [],
+            maxRecentReportsToShow: 0,
+            includeSelfDM: true,
+        });
         return filteredOptions;
     }, [betas, isGroupChat, listOptions.personalDetails, listOptions.reports, selectedOptions]);
 

diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -133,7 +133,7 @@ function MoneyRequestParticipantsSelector({
             action,
             sortByReportTypeInSearch: isPaidGroupPolicy,
             searchValue: '',
-    });
+        });
 
         return optionList;
     }, [
@@ -149,7 +149,7 @@ function MoneyRequestParticipantsSelector({
         options.reports,
         participants,
         isPaidGroupPolicy,
-        debouncedSearchTerm
+        debouncedSearchTerm,
     ]);
 
     const chatOptions = useMemo(() => {

diff --git a/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx b/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
@@ -27,26 +27,15 @@ function useOptions() {
     const existingDelegates = useMemo(() => account?.delegatedAccess?.delegates?.map((delegate) => delegate.email) ?? [], [account?.delegatedAccess?.delegates]);
 
     const defaultOptions = useMemo(() => {
-        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions(
-            optionsList.reports,
-            optionsList.personalDetails,
-            betas,
-            '',
-            [],
-            [...CONST.EXPENSIFY_EMAILS, ...existingDelegates],
-            false,
-            true,
-            false,
-            {},
-            [],
-            false,
-            {},
-            [],
-            true,
-            false,
-            false,
-            0,
-        );
+        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions({
+            reports: optionsList.reports,
+            personalDetails: optionsList.personalDetails,
+            betas: betas,
+
+            excludeLogins: [...CONST.EXPENSIFY_EMAILS, ...existingDelegates],
+
+            maxRecentReportsToShow: 0,
+        });
 
         const headerMessage = OptionsListUtils.getHeaderMessage((recentReports?.length || 0) + (personalDetails?.length || 0) !== 0, !!userToInvite, '');
 

diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.tsx b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
@@ -40,26 +40,14 @@ function useOptions() {
     const {options: optionsList, areOptionsInitialized} = useOptionsList();
 
     const defaultOptions = useMemo(() => {
-        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions(
-            optionsList.reports,
-            optionsList.personalDetails,
+        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions({
+            reports: optionsList.reports,
+            personalDetails: optionsList.personalDetails,
             betas,
-            '',
-            [],
-            CONST.EXPENSIFY_EMAILS,
-            false,
-            true,
-            false,
-            {},
-            [],
-            false,
-            {},
-            [],
-            true,
-            false,
-            false,
-            0,
-        );
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+
+            maxRecentReportsToShow: 0,
+        });
 
         const headerMessage = OptionsListUtils.getHeaderMessage((recentReports?.length || 0) + (personalDetails?.length || 0) !== 0 || !!currentUserOption, !!userToInvite, '');
 

diff --git a/tests/perf-test/OptionsListUtils.perf-test.ts b/tests/perf-test/OptionsListUtils.perf-test.ts
@@ -105,9 +105,12 @@ describe('OptionsListUtils', () => {
     });
 
     /* Testing getFilteredOptions */
-    test('[OptionsListUtils] getFilteredOptions with search value', async () => {
+    test('[OptionsListUtils] getFilteredOptions', async () => {
         await waitForBatchedUpdates();
-        await measureFunction(() => OptionsListUtils.getFilteredOptions(options.reports, options.personalDetails, mockedBetas, SEARCH_VALUE));
+        // Ideally getFilteredOptions should not be used with both options and search value
+        // The more performant filterOptions should be used instead to pass search value with options containing reports and personal details
+        // @ts-expect-error
+        await measureFunction(() => OptionsListUtils.getFilteredOptions({reports: options.reports, personalDetails: options.personalDetails, betas: mockedBetas, searchValue: SEARCH_VALUE}));
     });
 
     /* Testing getShareDestinationOptions */