Skip to content

Commit 16e9e3c

Browse files
committed
Cleanup Search Utils and add jsdoc for all methods
1 parent ea1271e commit 16e9e3c

File tree

6 files changed

+247
-125
lines changed

6 files changed

+247
-125
lines changed

src/components/Search/SearchPageHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function SearchPageHeader({queryJSON, hash}: SearchPageHeaderProps) {
137137

138138
const {status, type} = queryJSON;
139139
const isCannedQuery = SearchQueryUtils.isCannedSearchQuery(queryJSON);
140-
const headerText = isCannedQuery ? translate(getHeaderContent(type).titleText) : SearchQueryUtils.getSearchHeaderTitle(queryJSON, personalDetails, cardList, reports, taxRates);
140+
const headerText = isCannedQuery ? translate(getHeaderContent(type).titleText) : SearchQueryUtils.buildUserReadableQueryString(queryJSON, personalDetails, cardList, reports, taxRates);
141141
const [inputValue, setInputValue] = useState(headerText);
142142

143143
useEffect(() => {

src/components/Search/SearchRouter/SearchRouterList.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ const setPerformanceTimersEnd = () => {
5555
Performance.markEnd(CONST.TIMING.SEARCH_ROUTER_RENDER);
5656
};
5757

58+
function getContextualSearchQuery(reportID: string) {
59+
return `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${CONST.SEARCH.DATA_TYPES.CHAT} in:${reportID}`;
60+
}
61+
5862
function isSearchQueryItem(item: OptionData | SearchQueryItem): item is SearchQueryItem {
5963
if ('singleIcon' in item && item.singleIcon && 'query' in item && item.query) {
6064
return true;
@@ -120,7 +124,7 @@ function SearchRouterList(
120124
{
121125
text: `${translate('search.searchIn')} ${reportForContextualSearch.text ?? reportForContextualSearch.alternateText}`,
122126
singleIcon: Expensicons.MagnifyingGlass,
123-
query: SearchQueryUtils.getContextualSuggestionQuery(reportForContextualSearch.reportID),
127+
query: getContextualSearchQuery(reportForContextualSearch.reportID),
124128
itemStyle: styles.activeComponentBG,
125129
keyForList: 'contextualSearch',
126130
isContextualSearchItem: true,
@@ -132,7 +136,7 @@ function SearchRouterList(
132136
const recentSearchesData = recentSearches?.map(({query}) => {
133137
const searchQueryJSON = SearchQueryUtils.buildSearchQueryJSON(query);
134138
return {
135-
text: searchQueryJSON ? SearchQueryUtils.getSearchHeaderTitle(searchQueryJSON, personalDetails, cardList, reports, taxRates) : query,
139+
text: searchQueryJSON ? SearchQueryUtils.buildUserReadableQueryString(searchQueryJSON, personalDetails, cardList, reports, taxRates) : query,
136140
singleIcon: Expensicons.History,
137141
query,
138142
keyForList: query,

src/libs/Navigation/AppNavigator/createCustomPlatformStackBottomTabNavigator/TopBar.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import useLocalize from '@hooks/useLocalize';
1010
import usePolicy from '@hooks/usePolicy';
1111
import useThemeStyles from '@hooks/useThemeStyles';
1212
import Navigation from '@libs/Navigation/Navigation';
13-
import Performance from '@libs/Performance';
1413
import * as SearchQueryUtils from '@libs/SearchQueryUtils';
1514
import SignInButton from '@pages/home/sidebar/SignInButton';
1615
import * as Session from '@userActions/Session';

0 commit comments

Comments
 (0)