Skip to content

Commit 28bc3f4

Browse files
committed
convert exportStatus to 'action'
1 parent 5f1d3c1 commit 28bc3f4

6 files changed

Lines changed: 17 additions & 16 deletions

File tree

src/CONST/index.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6588,8 +6588,9 @@ const CONST = {
65886588
NORMAL: 'normal',
65896589
WIDE: 'wide',
65906590
},
6591-
EXPORT_STATUS: {
6592-
FAILED: 'failed',
6591+
ACTION: {
6592+
PAY: 'pay',
6593+
EXPORT: 'export',
65936594
},
65946595
STATUS: {
65956596
EXPENSE: {
@@ -6690,7 +6691,7 @@ const CONST = {
66906691
REIMBURSABLE: 'reimbursable',
66916692
BILLABLE: 'billable',
66926693
POLICY_ID: 'policyID',
6693-
EXPORT_STATUS: 'exportStatus',
6694+
ACTION: 'action',
66946695
},
66956696
TAG_EMPTY_VALUE: 'none',
66966697
CATEGORY_EMPTY_VALUE: 'none,Uncategorized',
@@ -6733,7 +6734,7 @@ const CONST = {
67336734
ASSIGNEE: 'assignee',
67346735
REIMBURSABLE: 'reimbursable',
67356736
BILLABLE: 'billable',
6736-
EXPORT_STATUS: 'export-status',
6737+
ACTION: 'action',
67376738
},
67386739
DATE_MODIFIERS: {
67396740
BEFORE: 'Before',

src/components/Search/SearchAutocompleteList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,9 @@ function SearchAutocompleteList(
459459
mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID,
460460
}));
461461
}
462-
case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORT_STATUS: {
463-
return Object.values(CONST.SEARCH.EXPORT_STATUS).map((status) => ({
464-
filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.EXPORT_STATUS,
462+
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION: {
463+
return Object.values(CONST.SEARCH.ACTION).map((status) => ({
464+
filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.ACTION,
465465
text: status,
466466
}));
467467
}

src/libs/SearchAutocompleteUtils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +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 exportStatusList = Object.values(CONST.SEARCH.EXPORT_STATUS) as string[];
136+
const actionList = Object.values(CONST.SEARCH.ACTION) as string[];
137137

138138
switch (range.key) {
139139
case CONST.SEARCH.SYNTAX_FILTER_KEYS.IN:
@@ -158,8 +158,8 @@ function filterOutRangesWithCorrectValue(
158158
return expenseTypeList.includes(range.value);
159159
case CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS:
160160
return statusList.includes(range.value);
161-
case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORT_STATUS:
162-
return exportStatusList.includes(range.value);
161+
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION:
162+
return actionList.includes(range.value);
163163
case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY:
164164
return categoryList.get().includes(range.value);
165165
case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:

src/libs/SearchQueryUtils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const UserFriendlyKeyMap: Record<SearchFilterKey | typeof CONST.SEARCH.SYNTAX_RO
7878
assignee: 'assignee',
7979
billable: 'billable',
8080
reimbursable: 'reimbursable',
81-
exportStatus: 'export-status',
81+
action: 'action',
8282
};
8383
/**
8484
* @private
@@ -408,7 +408,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
408408
filterKey === FILTER_KEYS.BILLABLE ||
409409
filterKey === FILTER_KEYS.TITLE ||
410410
filterKey === FILTER_KEYS.PAYER ||
411-
filterKey === FILTER_KEYS.EXPORT_STATUS) &&
411+
filterKey === FILTER_KEYS.ACTION) &&
412412
filterValue
413413
) {
414414
const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as FilterKeys[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
@@ -492,7 +492,7 @@ function buildFilterFormValuesFromQuery(
492492
filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT ||
493493
filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION ||
494494
filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE ||
495-
filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORT_STATUS
495+
filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION
496496
) {
497497
filtersForm[filterKey] = filterValues.at(0);
498498
}

src/pages/Search/AdvancedSearchFilters.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ function AdvancedSearchFilters() {
622622
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED ||
623623
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTER ||
624624
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.PAYER ||
625-
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORT_STATUS
625+
key === CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION
626626
) {
627627
return;
628628
}

src/types/form/SearchAdvancedFiltersForm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const FILTER_KEYS = {
5858
ASSIGNEE: 'assignee',
5959
REIMBURSABLE: 'reimbursable',
6060
BILLABLE: 'billable',
61-
EXPORT_STATUS: 'exportStatus',
61+
ACTION: 'action',
6262
} as const;
6363

6464
const ALLOWED_TYPE_FILTERS = {
@@ -251,7 +251,7 @@ type SearchAdvancedFiltersForm = Form<
251251
[FILTER_KEYS.ASSIGNEE]: string[];
252252
[FILTER_KEYS.REIMBURSABLE]: string;
253253
[FILTER_KEYS.BILLABLE]: string;
254-
[FILTER_KEYS.EXPORT_STATUS]: string;
254+
[FILTER_KEYS.ACTION]: string;
255255
}
256256
>;
257257

0 commit comments

Comments
 (0)