Skip to content

Commit 1eb7781

Browse files
committed
remove clearAllFilters
1 parent a0d3dc9 commit 1eb7781

4 files changed

Lines changed: 1 addition & 7 deletions

File tree

src/hooks/useSearchTypeMenu.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
66
import {useSearchContext} from '@components/Search/SearchContext';
77
import type {SearchQueryJSON} from '@components/Search/types';
88
import ThreeDotsMenu from '@components/ThreeDotsMenu';
9-
import {clearAllFilters} from '@libs/actions/Search';
109
import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils';
1110
import Navigation from '@libs/Navigation/Navigation';
1211
import {getAllTaxRates} from '@libs/PolicyUtils';
@@ -109,7 +108,6 @@ export default function useSearchTypeMenu(queryJSON: SearchQueryJSON) {
109108
return {
110109
...baseMenuItem,
111110
onSelected: () => {
112-
clearAllFilters();
113111
Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: item?.query ?? '', name: item?.name}));
114112
},
115113
rightComponent: (
@@ -181,7 +179,6 @@ export default function useSearchTypeMenu(queryJSON: SearchQueryJSON) {
181179
containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
182180
shouldCallAfterModalHide: true,
183181
onSelected: singleExecution(() => {
184-
clearAllFilters();
185182
Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: item.searchQuery}));
186183
}),
187184
});

src/libs/SearchUIUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2619,7 +2619,7 @@ function getColumnsToShow(
26192619
// If the user has set custom columns for the search, we need to respect their preference, and only show
26202620
// them what they want to see
26212621
if (!arraysEqual(Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE), visibleColumns) && visibleColumns.length > 0) {
2622-
const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]);
2622+
const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT, CONST.SEARCH.TABLE_COLUMNS.TYPE]);
26232623

26242624
for (const column of Object.keys(columns) as SearchCustomColumnIds[]) {
26252625
columns[column] = visibleColumns.includes(column) || requiredColumns.has(column);

src/pages/Search/SearchColumnsPage.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import TextLink from '@components/TextLink';
1313
import useLocalize from '@hooks/useLocalize';
1414
import useOnyx from '@hooks/useOnyx';
1515
import useThemeStyles from '@hooks/useThemeStyles';
16-
import {clearAllFilters} from '@libs/actions/Search';
1716
import Navigation from '@libs/Navigation/Navigation';
1817
import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
1918
import {getCustomColumnDefault, getCustomColumns, getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
@@ -82,7 +81,6 @@ function SearchColumnsPage() {
8281
const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {...searchAdvancedFiltersForm, columns: selectedColumnIds};
8382
const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters);
8483

85-
clearAllFilters();
8684
Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
8785
};
8886

src/pages/Search/SearchTypeMenu.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
100100
return {
101101
...baseMenuItem,
102102
onPress: () => {
103-
clearAllFilters();
104103
Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: item?.query ?? '', name: item?.name}));
105104
},
106105
rightComponent: (

0 commit comments

Comments
 (0)