Skip to content

Commit 1638051

Browse files
committed
fix function name
1 parent 65e444f commit 1638051

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

src/pages/Search/AdvancedSearchFilters.tsx

+30-25
Original file line numberDiff line numberDiff line change
@@ -27,88 +27,87 @@ import type {CardList, PersonalDetailsList} from '@src/types/onyx';
2727

2828
const baseFilterConfig = {
2929
date: {
30-
title: getFilterDisplayTitle,
30+
getTitle: getFilterDisplayTitle,
3131
description: 'common.date' as const,
3232
route: ROUTES.SEARCH_ADVANCED_FILTERS_DATE,
3333
},
3434
currency: {
35-
title: getFilterDisplayTitle,
35+
getTitle: getFilterDisplayTitle,
3636
description: 'common.currency' as const,
3737
route: ROUTES.SEARCH_ADVANCED_FILTERS_CURRENCY,
3838
},
3939
merchant: {
40-
title: getFilterDisplayTitle,
40+
getTitle: getFilterDisplayTitle,
4141
description: 'common.merchant' as const,
4242
route: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT,
4343
},
4444
description: {
45-
title: getFilterDisplayTitle,
45+
getTitle: getFilterDisplayTitle,
4646
description: 'common.description' as const,
4747
route: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION,
4848
},
4949
reportID: {
50-
title: getFilterDisplayTitle,
50+
getTitle: getFilterDisplayTitle,
5151
description: 'common.reportID' as const,
5252
route: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID,
5353
},
5454
amount: {
55-
title: getFilterDisplayTitle,
55+
getTitle: getFilterDisplayTitle,
5656
description: 'common.total' as const,
5757
route: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
5858
},
5959
category: {
60-
title: getFilterDisplayTitle,
60+
getTitle: getFilterDisplayTitle,
6161
description: 'common.category' as const,
6262
route: ROUTES.SEARCH_ADVANCED_FILTERS_CATEGORY,
6363
},
6464
keyword: {
65-
title: getFilterDisplayTitle,
65+
getTitle: getFilterDisplayTitle,
6666
description: 'search.filters.hasKeywords' as const,
6767
route: ROUTES.SEARCH_ADVANCED_FILTERS_KEYWORD,
6868
},
6969
cardID: {
70-
title: getFilterCardDisplayTitle,
70+
getTitle: getFilterCardDisplayTitle,
7171
description: 'common.card' as const,
7272
route: ROUTES.SEARCH_ADVANCED_FILTERS_CARD,
73-
shouldHide: (cards: CardList) => Object.keys(cards).length === 0,
7473
},
7574
taxRate: {
76-
title: getFilterTaxRateDisplayTitle,
75+
getTitle: getFilterTaxRateDisplayTitle,
7776
description: 'workspace.taxes.taxRate' as const,
7877
route: ROUTES.SEARCH_ADVANCED_FILTERS_TAX_RATE,
7978
},
8079
expenseType: {
81-
title: getExpenseTypeDisplayTitle,
80+
getTitle: getExpenseTypeDisplayTitle,
8281
description: 'search.expenseType' as const,
8382
route: ROUTES.SEARCH_ADVANCED_FILTERS_EXPENSE_TYPE,
8483
},
8584
tag: {
86-
title: getFilterDisplayTitle,
85+
getTitle: getFilterDisplayTitle,
8786
description: 'common.tag' as const,
8887
route: ROUTES.SEARCH_ADVANCED_FILTERS_TAG,
8988
},
9089
from: {
91-
title: getFilterParticipantDisplayTitle,
90+
getTitle: getFilterParticipantDisplayTitle,
9291
description: 'common.from' as const,
9392
route: ROUTES.SEARCH_ADVANCED_FILTERS_FROM,
9493
},
9594
to: {
96-
title: getFilterParticipantDisplayTitle,
95+
getTitle: getFilterParticipantDisplayTitle,
9796
description: 'common.to' as const,
9897
route: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
9998
},
10099
has: {
101-
title: getFilterHasDisplayTitle,
100+
getTitle: getFilterHasDisplayTitle,
102101
description: 'search.filters.has' as const,
103102
route: ROUTES.SEARCH_ADVANCED_FILTERS_HAS,
104103
},
105104
};
106105

107106
const typeFiltersKeys: Record<string, Array<ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>>> = {
108-
[CONST.SEARCH.DATA_TYPES.EXPENSE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'expenseType', 'tag', 'from', 'to'],
109-
[CONST.SEARCH.DATA_TYPES.INVOICE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to'],
110-
[CONST.SEARCH.DATA_TYPES.TRIP]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to'],
111-
[CONST.SEARCH.DATA_TYPES.CHAT]: ['date', 'keyword', 'from', 'to', 'has'],
107+
[CONST.SEARCH.DATA_TYPES.EXPENSE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'expenseType', 'tag', 'from', 'to', 'cardID'],
108+
[CONST.SEARCH.DATA_TYPES.INVOICE]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to', 'cardID'],
109+
[CONST.SEARCH.DATA_TYPES.TRIP]: ['date', 'currency', 'merchant', 'description', 'reportID', 'amount', 'category', 'keyword', 'taxRate', 'tag', 'from', 'to', 'cardID'],
110+
[CONST.SEARCH.DATA_TYPES.CHAT]: ['date', 'keyword', 'from', 'has'],
112111
};
113112

114113
function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList) {
@@ -260,15 +259,18 @@ function AdvancedSearchFilters() {
260259
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD ||
261260
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG
262261
) {
263-
filterTitle = baseFilterConfig[key].title(searchAdvancedFilters, key, translate);
262+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, key, translate);
264263
} else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID) {
265-
filterTitle = baseFilterConfig[key].title(searchAdvancedFilters, cardList);
264+
if (Object.keys(cardList).length === 0) {
265+
return undefined;
266+
}
267+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, cardList);
266268
} else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE) {
267-
filterTitle = baseFilterConfig[key].title(searchAdvancedFilters, taxRates);
269+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, taxRates);
268270
} else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.HAS) {
269-
filterTitle = baseFilterConfig[key].title(searchAdvancedFilters, translate);
271+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate);
270272
} else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM || key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO) {
271-
filterTitle = baseFilterConfig[key].title(searchAdvancedFilters[key] ?? [], personalDetails);
273+
filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters[key] ?? [], personalDetails);
272274
}
273275
return {
274276
key,
@@ -283,6 +285,9 @@ function AdvancedSearchFilters() {
283285
<ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
284286
<View>
285287
{filters.map((filter) => {
288+
if (filter === undefined) {
289+
return undefined;
290+
}
286291
return (
287292
<MenuItemWithTopDescription
288293
key={filter.description}

0 commit comments

Comments
 (0)