Merge pull request #51590 from Expensify/revert-51332-reapply-suffix-…

…search-tree Revert "Revert "Revert "Search suffix tree implementation""" (cherry picked from commit c2ef291) (CP triggered by AndrewGable)
Expensify · Oct 28, 2024 · 90d8615 · 90d8615
1 parent f2b39e8
commit 90d8615
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 736 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -1146,9 +1146,6 @@ const CONST = {
         SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
         RESIZE_DEBOUNCE_TIME: 100,
         UNREAD_UPDATE_DEBOUNCE_TIME: 300,
-        SEARCH_CONVERT_SEARCH_VALUES: 'search_convert_search_values',
-        SEARCH_MAKE_TREE: 'search_make_tree',
-        SEARCH_BUILD_TREE: 'search_build_tree',
         SEARCH_FILTER_OPTIONS: 'search_filter_options',
         USE_DEBOUNCED_STATE_DELAY: 300,
     },

diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx
@@ -12,7 +12,6 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import FastSearch from '@libs/FastSearch';
 import Log from '@libs/Log';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import {getAllTaxRates} from '@libs/PolicyUtils';
@@ -64,49 +63,6 @@ function SearchRouter({onRouterClose}: SearchRouterProps) {
         return OptionsListUtils.getSearchOptions(options, '', betas ?? []);
     }, [areOptionsInitialized, betas, options]);
 
-    /**
-     * Builds a suffix tree and returns a function to search in it.
-     */
-    const findInSearchTree = useMemo(() => {
-        const fastSearch = FastSearch.createFastSearch([
-            {
-                data: searchOptions.personalDetails,
-                toSearchableString: (option) => {
-                    const displayName = option.participantsList?.[0]?.displayName ?? '';
-                    return [option.login ?? '', option.login !== displayName ? displayName : ''].join();
-                },
-            },
-            {
-                data: searchOptions.recentReports,
-                toSearchableString: (option) => {
-                    const searchStringForTree = [option.text ?? '', option.login ?? ''];
-
-                    if (option.isThread) {
-                        if (option.alternateText) {
-                            searchStringForTree.push(option.alternateText);
-                        }
-                    } else if (!!option.isChatRoom || !!option.isPolicyExpenseChat) {
-                        if (option.subtitle) {
-                            searchStringForTree.push(option.subtitle);
-                        }
-                    }
-
-                    return searchStringForTree.join();
-                },
-            },
-        ]);
-        function search(searchInput: string) {
-            const [personalDetails, recentReports] = fastSearch.search(searchInput);
-
-            return {
-                personalDetails,
-                recentReports,
-            };
-        }
-
-        return search;
-    }, [searchOptions.personalDetails, searchOptions.recentReports]);
-
     const filteredOptions = useMemo(() => {
         if (debouncedInputValue.trim() === '') {
             return {
@@ -117,25 +73,15 @@ function SearchRouter({onRouterClose}: SearchRouterProps) {
         }
 
         Timing.start(CONST.TIMING.SEARCH_FILTER_OPTIONS);
-        const newOptions = findInSearchTree(debouncedInputValue);
+        const newOptions = OptionsListUtils.filterOptions(searchOptions, debouncedInputValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
         Timing.end(CONST.TIMING.SEARCH_FILTER_OPTIONS);
 
-        const recentReports = newOptions.recentReports.concat(newOptions.personalDetails);
-
-        const userToInvite = OptionsListUtils.pickUserToInvite({
-            canInviteUser: true,
+        return {
             recentReports: newOptions.recentReports,
             personalDetails: newOptions.personalDetails,
-            searchValue: debouncedInputValue,
-            optionsToExclude: [{login: CONST.EMAIL.NOTIFICATIONS}],
-        });
-
-        return {
-            recentReports,
-            personalDetails: [],
-            userToInvite,
+            userToInvite: newOptions.userToInvite,
         };
-    }, [debouncedInputValue, findInSearchTree]);
+    }, [debouncedInputValue, searchOptions]);
 
     const recentReports: OptionData[] = useMemo(() => {
         if (debouncedInputValue === '') {

diff --git a/src/libs/FastSearch.ts b/src/libs/FastSearch.ts
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -2477,31 +2477,6 @@ function getPersonalDetailSearchTerms(item: Partial<ReportUtils.OptionData>) {
 function getCurrentUserSearchTerms(item: ReportUtils.OptionData) {
     return [item.text ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? ''];
 }
-
-type PickUserToInviteParams = {
-    canInviteUser: boolean;
-    recentReports: ReportUtils.OptionData[];
-    personalDetails: ReportUtils.OptionData[];
-    searchValue: string;
-    config?: FilterOptionsConfig;
-    optionsToExclude: Option[];
-};
-
-const pickUserToInvite = ({canInviteUser, recentReports, personalDetails, searchValue, config, optionsToExclude}: PickUserToInviteParams) => {
-    let userToInvite = null;
-    if (canInviteUser) {
-        if (recentReports.length === 0 && personalDetails.length === 0) {
-            userToInvite = getUserToInviteOption({
-                searchValue,
-                selectedOptions: config?.selectedOptions,
-                optionsToExclude,
-            });
-        }
-    }
-
-    return userToInvite;
-};
-
 /**
  * Filters options based on the search input value
  */
@@ -2589,7 +2564,16 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
         recentReports = orderOptions(recentReports, searchValue);
     }
 
-    const userToInvite = pickUserToInvite({canInviteUser, recentReports, personalDetails, searchValue, config, optionsToExclude});
+    let userToInvite = null;
+    if (canInviteUser) {
+        if (recentReports.length === 0 && personalDetails.length === 0) {
+            userToInvite = getUserToInviteOption({
+                searchValue,
+                selectedOptions: config?.selectedOptions,
+                optionsToExclude,
+            });
+        }
+    }
 
     if (maxRecentReportsToShow > 0 && recentReports.length > maxRecentReportsToShow) {
         recentReports.splice(maxRecentReportsToShow);
@@ -2659,7 +2643,6 @@ export {
     formatMemberForList,
     formatSectionsFromSearchTerm,
     getShareLogOptions,
-    orderOptions,
     filterOptions,
     createOptionList,
     createOptionFromReport,
@@ -2674,7 +2657,6 @@ export {
     shouldUseBoldText,
     getAttendeeOptions,
     getAlternateText,
-    pickUserToInvite,
     hasReportErrors,
 };