Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/libs/SearchQueryUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,18 +307,29 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
// actually filter out results
const similarSearchIgnoredFilters = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.GROUP_CURRENCY]);

// Certain filters' values are significant in deciding which search we are on, so we want to include
// their value when computing the similarSearchHash
const similarSearchValueBasedFilters = new Set<SearchFilterKey>([CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION]);

query.flatFilters
.map((filter) => {
if (!similarSearchIgnoredFilters.has(filter.key)) {
filterSet.add(filter.key);
}

const filterKey = filter.key;
const filters = cloneDeep(filter.filters);
filters.sort((a, b) => customCollator.compare(a.value.toString(), b.value.toString()));
return buildFilterValuesString(filter.key, filters);
return {filterString: buildFilterValuesString(filterKey, filters), filterKey};
})
.sort()
.forEach((filterString) => (orderedQuery += ` ${filterString}`));
.sort((a, b) => customCollator.compare(a.filterString, b.filterString))
.forEach(({filterString, filterKey}) => {
if (!similarSearchIgnoredFilters.has(filterKey)) {
filterSet.add(filterKey);
}

if (similarSearchValueBasedFilters.has(filterKey)) {
filterSet.add(filterString.trim());
}

orderedQuery += ` ${filterString}`;
});

const similarSearchHash = hashText(Array.from(filterSet).join(''), 2 ** 32);
const recentSearchHash = hashText(orderedQuery, 2 ** 32);
Expand Down
Loading