Skip to content

Commit 16ad05d

Browse files
authored
Merge pull request Expensify#63753 from Expensify/jsenyitko-export-status-2
Add 'action:pay/export' filter
2 parents 805fd8c + a04508a commit 16ad05d

11 files changed

Lines changed: 362 additions & 281 deletions

src/CONST/index.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6165,6 +6165,10 @@ const CONST = {
61656165
TRIP: 'trip',
61666166
CHAT: 'chat',
61676167
},
6168+
ACTION_FILTERS: {
6169+
PAY: 'pay',
6170+
EXPORT: 'export',
6171+
},
61686172
ACTION_TYPES: {
61696173
VIEW: 'view',
61706174
REVIEW: 'review',
@@ -6305,6 +6309,7 @@ const CONST = {
63056309
REIMBURSABLE: 'reimbursable',
63066310
BILLABLE: 'billable',
63076311
POLICY_ID: 'policyID',
6312+
ACTION: 'action',
63086313
},
63096314
TAG_EMPTY_VALUE: 'none',
63106315
CATEGORY_EMPTY_VALUE: 'none,Uncategorized',
@@ -6347,6 +6352,7 @@ const CONST = {
63476352
ASSIGNEE: 'assignee',
63486353
REIMBURSABLE: 'reimbursable',
63496354
BILLABLE: 'billable',
6355+
ACTION: 'action',
63506356
},
63516357
DATE_MODIFIERS: {
63526358
BEFORE: 'Before',

src/components/Search/SearchAutocompleteList.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,12 @@ function SearchAutocompleteList(
449449
mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID,
450450
}));
451451
}
452+
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION: {
453+
return Object.values(CONST.SEARCH.ACTION_FILTERS).map((status) => ({
454+
filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.ACTION,
455+
text: status,
456+
}));
457+
}
452458
default: {
453459
return [];
454460
}

src/libs/SearchAutocompleteUtils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ function filterOutRangesWithCorrectValue(
133133
}) as string[];
134134
const groupByList = Object.values(CONST.SEARCH.GROUP_BY) as string[];
135135
const booleanList = Object.values(CONST.SEARCH.BOOLEAN) as string[];
136+
const actionList = Object.values(CONST.SEARCH.ACTION_FILTERS) as string[];
136137

137138
switch (range.key) {
138139
case CONST.SEARCH.SYNTAX_FILTER_KEYS.IN:
@@ -157,6 +158,8 @@ function filterOutRangesWithCorrectValue(
157158
return expenseTypeList.includes(range.value);
158159
case CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS:
159160
return statusList.includes(range.value);
161+
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION:
162+
return actionList.includes(range.value);
160163
case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY:
161164
return categoryList.get().includes(range.value);
162165
case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:

0 commit comments

Comments
 (0)