From eb134eaf98954e5d9a86c03173520e232c48d321 Mon Sep 17 00:00:00 2001 From: jay Date: Wed, 15 Jan 2025 19:45:32 +0100 Subject: [PATCH 1/7] fix(search): tag names with colon showed \: instead of : --- src/components/Search/SearchRouter/SearchRouterList.tsx | 8 +++++--- src/libs/PolicyUtils.ts | 2 +- src/libs/SearchQueryUtils.ts | 5 ++++- src/pages/Search/AdvancedSearchFilters.tsx | 4 ++-- .../SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx | 8 ++++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx index b38901a78ce0..0169c4d27b8e 100644 --- a/src/components/Search/SearchRouter/SearchRouterList.tsx +++ b/src/components/Search/SearchRouter/SearchRouterList.tsx @@ -22,7 +22,7 @@ import {getCardDescription, isCard, isCardIssued, mergeCardListWithWorkspaceFeed import {combineOrderingOfReportsAndPersonalDetails, getSearchOptions, getValidOptions} from '@libs/OptionsListUtils'; import type {Options, SearchOption} from '@libs/OptionsListUtils'; import Performance from '@libs/Performance'; -import {getAllTaxRates} from '@libs/PolicyUtils'; +import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; import type {OptionData} from '@libs/ReportUtils'; import { getAutocompleteCategories, @@ -229,13 +229,15 @@ function SearchRouterList( case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG: { const autocompleteList = autocompleteValue ? tagAutocompleteList : recentTagsAutocompleteList ?? []; const filteredTags = autocompleteList - .filter((tag) => tag.toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(tag)) + .filter((tag) => tag.toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(tag.toLowerCase())) .sort() .slice(0, 10); return filteredTags.map((tagName) => ({ filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.TAG, - text: tagName, + text: getCleanedTagName(tagName), + autocompleteID: tagName, + mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, })); } case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY: { diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index 4b35152c7677..9e5e03acd1b0 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -363,7 +363,7 @@ function getTagNamesFromTagsLists(policyTagLists: PolicyTagLists): string[] { for (const policyTagList of Object.values(policyTagLists ?? {})) { for (const tag of Object.values(policyTagList.tags ?? {})) { - uniqueTagNames.add(getCleanedTagName(tag.name)); + uniqueTagNames.add(tag.name); } } return Array.from(uniqueTagNames); diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts index a71fb32c75e5..e754107fd0b9 100644 --- a/src/libs/SearchQueryUtils.ts +++ b/src/libs/SearchQueryUtils.ts @@ -14,7 +14,7 @@ import localeCompare from './LocaleCompare'; import Log from './Log'; import {validateAmount} from './MoneyRequestUtils'; import {getPersonalDetailByEmail} from './PersonalDetailsUtils'; -import {getTagNamesFromTagsLists} from './PolicyUtils'; +import {getCleanedTagName, getTagNamesFromTagsLists} from './PolicyUtils'; import {getReportName} from './ReportUtils'; import {parse as parseSearchQuery} from './SearchParser/searchParser'; import {hashText} from './UserUtils'; @@ -559,6 +559,9 @@ function getFilterDisplayValue( const frontendAmount = convertToFrontendAmountAsInteger(Number(filterValue)); return Number.isNaN(frontendAmount) ? filterValue : frontendAmount.toString(); } + if (filterName === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG) { + return getCleanedTagName(filterValue); + } return filterValue; } diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index d1c4b3649c7e..005c5c96837b 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -21,7 +21,7 @@ import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils'; import localeCompare from '@libs/LocaleCompare'; import Navigation from '@libs/Navigation/Navigation'; import {createDisplayName} from '@libs/PersonalDetailsUtils'; -import {getAllTaxRates, getTagNamesFromTagsLists, isPolicyFeatureEnabled} from '@libs/PolicyUtils'; +import {getAllTaxRates, getCleanedTagName, getTagNamesFromTagsLists, isPolicyFeatureEnabled} from '@libs/PolicyUtils'; import {getReportName} from '@libs/ReportUtils'; import {buildCannedSearchQuery, buildQueryStringFromFilterFormValues, buildSearchQueryJSON, isCannedSearchQuery} from '@libs/SearchQueryUtils'; import {getExpenseTypeTranslationKey} from '@libs/SearchUIUtils'; @@ -306,7 +306,7 @@ function getFilterDisplayTitle(filters: Partial, filt const filterArray = filters[nonDateFilterKey] ?? []; return filterArray .sort(sortOptionsWithEmptyValue) - .map((value) => (value === CONST.SEARCH.EMPTY_VALUE ? translate('search.noTag') : value)) + .map((value) => (value === CONST.SEARCH.EMPTY_VALUE ? translate('search.noTag') : getCleanedTagName(value))) .join(', '); } diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx index 6c58c046920b..c2249842ded9 100644 --- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx +++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx @@ -7,7 +7,7 @@ import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSele import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; -import {getTagNamesFromTagsLists} from '@libs/PolicyUtils'; +import {getCleanedTagName, getTagNamesFromTagsLists} from '@libs/PolicyUtils'; import * as SearchActions from '@userActions/Search'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -23,7 +23,7 @@ function SearchFiltersTagPage() { if (tag === CONST.SEARCH.EMPTY_VALUE) { return {name: translate('search.noTag'), value: tag}; } - return {name: tag, value: tag}; + return {name: getCleanedTagName(tag), value: tag}; }); const policyID = searchAdvancedFiltersForm?.policyID; const [allPolicyTagLists = {}] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS); @@ -38,9 +38,9 @@ function SearchFiltersTagPage() { .map(getTagNamesFromTagsLists) .flat() .forEach((tag) => uniqueTagNames.add(tag)); - items.push(...Array.from(uniqueTagNames).map((tagName) => ({name: tagName, value: tagName}))); + items.push(...Array.from(uniqueTagNames).map((tagName) => ({name: getCleanedTagName(tagName), value: tagName}))); } else { - items.push(...getTagNamesFromTagsLists(singlePolicyTagLists).map((name) => ({name, value: name}))); + items.push(...getTagNamesFromTagsLists(singlePolicyTagLists).map((name) => ({name: getCleanedTagName(name), value: name}))); } return items; }, [allPolicyTagLists, singlePolicyTagLists, translate]); From ba91e4b1d815e9be8eca375381b52f4c7385b8a8 Mon Sep 17 00:00:00 2001 From: jay Date: Thu, 16 Jan 2025 19:57:53 +0100 Subject: [PATCH 2/7] fix eslint --- .../Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx index c2249842ded9..b65a82ad7f8c 100644 --- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx +++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx @@ -6,9 +6,9 @@ import ScreenWrapper from '@components/ScreenWrapper'; import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; +import {updateAdvancedFilters} from '@libs/actions/Search'; import Navigation from '@libs/Navigation/Navigation'; import {getCleanedTagName, getTagNamesFromTagsLists} from '@libs/PolicyUtils'; -import * as SearchActions from '@userActions/Search'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; @@ -45,7 +45,7 @@ function SearchFiltersTagPage() { return items; }, [allPolicyTagLists, singlePolicyTagLists, translate]); - const updateTagFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({tag: values}), []); + const updateTagFilter = useCallback((values: string[]) => updateAdvancedFilters({tag: values}), []); return ( Date: Thu, 16 Jan 2025 23:05:19 +0100 Subject: [PATCH 3/7] fix tag name not showing in advanced filters after changing search input --- src/components/Search/SearchRouter/buildSubstitutionsMap.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Search/SearchRouter/buildSubstitutionsMap.ts b/src/components/Search/SearchRouter/buildSubstitutionsMap.ts index b81faca6f5fb..892aa050ef9d 100644 --- a/src/components/Search/SearchRouter/buildSubstitutionsMap.ts +++ b/src/components/Search/SearchRouter/buildSubstitutionsMap.ts @@ -60,7 +60,8 @@ function buildSubstitutionsMap( filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO || filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN || - filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID + filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID || + filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG ) { const displayValue = getFilterDisplayValue(filterKey, filterValue, personalDetails, reports, cardList); From dd0de1890cedfb8608d628560d73bac5a1997f56 Mon Sep 17 00:00:00 2001 From: jay Date: Fri, 17 Jan 2025 19:24:29 +0100 Subject: [PATCH 4/7] use clean tag name to compare with values from autocompleteParser as they are also clean --- src/components/Search/SearchRouter/SearchRouterList.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx index 0169c4d27b8e..97426e7f977a 100644 --- a/src/components/Search/SearchRouter/SearchRouterList.tsx +++ b/src/components/Search/SearchRouter/SearchRouterList.tsx @@ -22,7 +22,7 @@ import {getCardDescription, isCard, isCardIssued, mergeCardListWithWorkspaceFeed import {combineOrderingOfReportsAndPersonalDetails, getSearchOptions, getValidOptions} from '@libs/OptionsListUtils'; import type {Options, SearchOption} from '@libs/OptionsListUtils'; import Performance from '@libs/Performance'; -import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; +import {escapeTagName, getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; import type {OptionData} from '@libs/ReportUtils'; import { getAutocompleteCategories, @@ -229,14 +229,15 @@ function SearchRouterList( case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG: { const autocompleteList = autocompleteValue ? tagAutocompleteList : recentTagsAutocompleteList ?? []; const filteredTags = autocompleteList + .map(getCleanedTagName) .filter((tag) => tag.toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(tag.toLowerCase())) .sort() .slice(0, 10); return filteredTags.map((tagName) => ({ filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.TAG, - text: getCleanedTagName(tagName), - autocompleteID: tagName, + text: tagName, + autocompleteID: escapeTagName(tagName), mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, })); } From 7942043354f870fc827d23a9ae7e0911de4b7bf5 Mon Sep 17 00:00:00 2001 From: jay Date: Tue, 21 Jan 2025 17:03:20 +0100 Subject: [PATCH 5/7] refactor: update tag name cleaning --- .../Search/SearchRouter/SearchRouterList.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx index 97426e7f977a..237d78efec4f 100644 --- a/src/components/Search/SearchRouter/SearchRouterList.tsx +++ b/src/components/Search/SearchRouter/SearchRouterList.tsx @@ -22,7 +22,7 @@ import {getCardDescription, isCard, isCardIssued, mergeCardListWithWorkspaceFeed import {combineOrderingOfReportsAndPersonalDetails, getSearchOptions, getValidOptions} from '@libs/OptionsListUtils'; import type {Options, SearchOption} from '@libs/OptionsListUtils'; import Performance from '@libs/Performance'; -import {escapeTagName, getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; +import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; import type {OptionData} from '@libs/ReportUtils'; import { getAutocompleteCategories, @@ -229,15 +229,16 @@ function SearchRouterList( case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG: { const autocompleteList = autocompleteValue ? tagAutocompleteList : recentTagsAutocompleteList ?? []; const filteredTags = autocompleteList - .map(getCleanedTagName) - .filter((tag) => tag.toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(tag.toLowerCase())) + .filter( + (tag) => getCleanedTagName(tag).toLowerCase().includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(getCleanedTagName(tag).toLowerCase()), + ) .sort() .slice(0, 10); return filteredTags.map((tagName) => ({ filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.TAG, - text: tagName, - autocompleteID: escapeTagName(tagName), + text: getCleanedTagName(tagName), + autocompleteID: tagName, mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, })); } From 5e310f360e79a652862a2fda0fcdcdd264cd0544 Mon Sep 17 00:00:00 2001 From: jay Date: Wed, 22 Jan 2025 05:39:08 +0100 Subject: [PATCH 6/7] fix: sanitize for subsitutions --- .../Search/SearchRouter/getQueryWithSubstitutions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts b/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts index 117745fee480..8e3ad0c40401 100644 --- a/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts +++ b/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts @@ -1,5 +1,6 @@ import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types'; import * as parser from '@libs/SearchParser/autocompleteParser'; +import {sanitizeSearchValue} from '@libs/SearchQueryUtils'; type SubstitutionMap = Record; @@ -31,11 +32,12 @@ function getQueryWithSubstitutions(changedQuery: string, substitutions: Substitu for (const range of searchAutocompleteQueryRanges) { const itemKey = getSubstitutionMapKey(range.key, range.value); - const substitutionEntry = substitutions[itemKey]; + let substitutionEntry = substitutions[itemKey]; if (substitutionEntry) { const substitutionStart = range.start + lengthDiff; const substitutionEnd = range.start + range.length; + substitutionEntry = sanitizeSearchValue(substitutionEntry); // generate new query but substituting "user-typed" value with the entity id/email from substitutions resultQuery = resultQuery.slice(0, substitutionStart) + substitutionEntry + changedQuery.slice(substitutionEnd); From 0772774fee34da388d332a96aa503bdd69697fde Mon Sep 17 00:00:00 2001 From: jay Date: Wed, 22 Jan 2025 17:14:32 +0100 Subject: [PATCH 7/7] fix eslint issue --- .../Search/SearchRouter/getQueryWithSubstitutions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts b/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts index 8e3ad0c40401..84895efb33a5 100644 --- a/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts +++ b/src/components/Search/SearchRouter/getQueryWithSubstitutions.ts @@ -1,5 +1,5 @@ import type {SearchAutocompleteQueryRange, SearchFilterKey} from '@components/Search/types'; -import * as parser from '@libs/SearchParser/autocompleteParser'; +import {parse} from '@libs/SearchParser/autocompleteParser'; import {sanitizeSearchValue} from '@libs/SearchQueryUtils'; type SubstitutionMap = Record; @@ -19,7 +19,7 @@ const getSubstitutionMapKey = (filterKey: SearchFilterKey, value: string) => `${ * return: `A from:9876 A` */ function getQueryWithSubstitutions(changedQuery: string, substitutions: SubstitutionMap) { - const parsed = parser.parse(changedQuery) as {ranges: SearchAutocompleteQueryRange[]}; + const parsed = parse(changedQuery) as {ranges: SearchAutocompleteQueryRange[]}; const searchAutocompleteQueryRanges = parsed.ranges;