remove cq and add isCustomQuery

Author: adamgrzybowski

src/CONST.ts

@@ -5271,10 +5271,6 @@ const CONST = {
             REPORT_ID: 'reportID',
             KEYWORD: 'keyword',
         },
-        QUERY_KIND: {
-            CANNED_QUERY: 'cannedQuery',
-            CUSTOM_QUERY: 'customQuery',
-        },
     },
 
     REFERRER: {

src/ROUTES.ts

@@ -1,6 +1,6 @@
 import type {TupleToUnion, ValueOf} from 'type-fest';
-import type {QueryKind, SearchQueryString} from './components/Search/types';
-import CONST from './CONST';
+import type {SearchQueryString} from './components/Search/types';
+import type CONST from './CONST';
 import type {IOUAction, IOUType} from './CONST';
 import type {IOURequestType} from './libs/actions/IOU';
 import type {ConnectionName, SageIntacctMappingName} from './types/onyx/Policy';
@@ -37,8 +37,8 @@ const ROUTES = {
 
     SEARCH_CENTRAL_PANE: {
         route: 'search',
-        getRoute: ({query, queryKind = CONST.SEARCH.QUERY_KIND.CANNED_QUERY, policyIDs}: {query: SearchQueryString; queryKind?: QueryKind; policyIDs?: string}) =>
-            `search?${queryKind === CONST.SEARCH.QUERY_KIND.CANNED_QUERY ? 'q' : 'cq'}=${query}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
+        getRoute: ({query, isCustomQuery = false, policyIDs}: {query: SearchQueryString; isCustomQuery?: boolean; policyIDs?: string}) =>
+            `search?q=${query}&isCustomQuery=${isCustomQuery}${policyIDs ? `&policyIDs=${policyIDs}` : ''}` as const,
     },
 
     SEARCH_ADVANCED_FILTERS: 'search/filters',

src/components/Search/index.tsx

@@ -153,17 +153,15 @@ function Search({queryJSON, policyIDs, isMobileSelectionModeActive, setIsMobileS
         }
 
         const currentSearchParams = SearchUtils.getCurrentSearchParams();
-        const currentQueryString = SearchUtils.getQueryStringFromParams(currentSearchParams);
-        const isCustomQuery = SearchUtils.isCustomQueryFromParams(currentSearchParams);
-        const currentQueryJSON = SearchUtils.buildSearchQueryJSON(currentQueryString);
+        const currentQueryJSON = SearchUtils.buildSearchQueryJSON(currentSearchParams.q);
 
         if (!currentQueryJSON) {
             return;
         }
 
         const newQuery = SearchUtils.buildSearchQueryString({...currentQueryJSON, offset: String(Number(currentQueryJSON.offset) + CONST.SEARCH.RESULTS_PAGE_SIZE)});
 
-        navigation.setParams(isCustomQuery ? {cq: newQuery} : {q: newQuery});
+        navigation.setParams({q: newQuery});
     };
 
     const type = SearchUtils.getSearchType(searchResults?.search);
@@ -180,12 +178,10 @@ function Search({queryJSON, policyIDs, isMobileSelectionModeActive, setIsMobileS
 
     const onSortPress = (column: SearchColumnType, order: SortOrder) => {
         const currentSearchParams = SearchUtils.getCurrentSearchParams();
-        const currentQueryString = SearchUtils.getQueryStringFromParams(currentSearchParams);
-        const isCustomQuery = SearchUtils.isCustomQueryFromParams(currentSearchParams);
-        const currentQueryJSON = SearchUtils.buildSearchQueryJSON(currentQueryString);
+        const currentQueryJSON = SearchUtils.buildSearchQueryJSON(currentSearchParams.q);
 
         const newQuery = SearchUtils.buildSearchQueryString({...currentQueryJSON, sortBy: column, sortOrder: order});
-        navigation.setParams(isCustomQuery ? {cq: newQuery} : {q: newQuery});
+        navigation.setParams({q: newQuery});
     };
 
     const isSortingAllowed = sortableSearchTabs.includes(status);

src/components/Search/types.ts

@@ -50,8 +50,6 @@ type QueryFilters = {
     [K in AllFieldKeys]: QueryFilter | QueryFilter[];
 };
 
-type QueryKind = ValueOf<typeof CONST.SEARCH.QUERY_KIND>;
-
 type SearchQueryString = string;
 
 type SearchQueryAST = {
@@ -69,7 +67,6 @@ type SearchQueryJSON = {
 } & SearchQueryAST;
 
 export type {
-    QueryKind,
     SelectedTransactionInfo,
     SelectedTransactions,
     SearchColumnType,

src/libs/Navigation/types.ts

@@ -70,7 +70,11 @@ type CentralPaneScreensParamList = {
     [SCREENS.SETTINGS.WORKSPACES]: undefined;
 
     // Param types of the search central pane are also used for the search bottom tab screen.
-    [SCREENS.SEARCH.CENTRAL_PANE]: ({cq: SearchQueryString; q?: never} | {q: SearchQueryString; cq?: never}) & {policyIDs?: string};
+    [SCREENS.SEARCH.CENTRAL_PANE]: {
+        q: SearchQueryString;
+        isCustomQuery: boolean;
+        policyIDs?: string;
+    };
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: undefined;
     [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: undefined;
 };

src/libs/SearchUtils.ts

@@ -5,7 +5,6 @@ import TransactionListItem from '@components/SelectionList/Search/TransactionLis
 import type {ListItem, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SearchAccountDetails, SearchDataTypes, SearchPersonalDetails, SearchTransaction, SearchTypeToItemMap, SectionsType} from '@src/types/onyx/SearchResults';
 import type SearchResults from '@src/types/onyx/SearchResults';
@@ -305,15 +304,6 @@ function getCurrentSearchParams() {
     return topmostCentralPaneRoute?.params as AuthScreensParamList['Search_Central_Pane'];
 }
 
-// Query may be in the q or cq parameter
-function getQueryStringFromParams(params: AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE]) {
-    return params.q ?? params.cq;
-}
-
-function isCustomQueryFromParams(params: AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE]) {
-    return !!params.cq;
-}
-
 function isSearchResultsEmpty(searchResults: SearchResults) {
     return !Object.keys(searchResults?.data).some((key) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION));
 }
@@ -417,10 +407,8 @@ function getFilters(query: SearchQueryString, fields: Array<Partial<AllFieldKeys
 }
 
 export {
-    isCustomQueryFromParams,
     buildSearchQueryJSON,
     buildSearchQueryString,
-    getQueryStringFromParams,
     getCurrentSearchParams,
     getListItem,
     getQueryHash,

src/pages/Search/SearchPage.tsx

@@ -7,7 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {buildSearchQueryJSON, getQueryStringFromParams} from '@libs/SearchUtils';
+import {buildSearchQueryJSON} from '@libs/SearchUtils';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -18,7 +18,7 @@ function SearchPage({route}: SearchPageProps) {
     const {isSmallScreenWidth} = useWindowDimensions();
     const styles = useThemeStyles();
 
-    const queryJSON = useMemo(() => buildSearchQueryJSON(getQueryStringFromParams(route.params)), [route.params]);
+    const queryJSON = useMemo(() => buildSearchQueryJSON(route.params.q), [route.params]);
 
     const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: CONST.SEARCH.TAB.EXPENSE.ALL}));
 

src/pages/Search/SearchPageBottomTab.tsx

@@ -9,7 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
-import {buildSearchQueryJSON, getQueryStringFromParams} from '@libs/SearchUtils';
+import {buildSearchQueryJSON} from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -32,7 +32,7 @@ function SearchPageBottomTab() {
         const searchParams = activeCentralPaneRoute.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
 
         return {
-            queryJSON: buildSearchQueryJSON(getQueryStringFromParams(searchParams)),
+            queryJSON: buildSearchQueryJSON(searchParams.q),
             policyIDs: searchParams.policyIDs,
         };
     }, [activeCentralPaneRoute]);

src/pages/Search/SearchStatusMenu.tsx

@@ -64,7 +64,7 @@ function SearchStatusMenu({status}: SearchStatusMenuProps) {
     if (isSmallScreenWidth) {
         return (
             <SearchStatusMenuNarrow
-                filterItems={statusMenuItems}
+                statusMenuItems={statusMenuItems}
                 activeItemIndex={activeItemIndex}
             />
         );