Skip to content

Commit 5505a57

Browse files
authored
Merge pull request Expensify#68480 from Expensify/cmartins-updateDrafts
Update drafts syntax
2 parents 47fdebd + 71cd642 commit 5505a57

8 files changed

Lines changed: 367 additions & 274 deletions

File tree

src/CONST/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6538,6 +6538,7 @@ const CONST = {
65386538
return {
65396539
[this.TRANSACTION_TYPE.PER_DIEM]: 'per-diem',
65406540
[this.GROUP_BY.REPORTS]: 'report',
6541+
[this.STATUS.EXPENSE.DRAFTS]: 'draft',
65416542
};
65426543
},
65436544
DATE_MODIFIERS: {

src/components/Search/SearchAutocompleteList.tsx

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,20 +196,33 @@ function SearchAutocompleteList(
196196
const typeFilter = parsedQuery?.ranges?.find((range) => range.key === CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE);
197197
const currentType = typeFilter?.value;
198198

199+
let suggestedStatuses;
199200
switch (currentType) {
200201
case CONST.SEARCH.DATA_TYPES.EXPENSE:
201-
return Object.values(CONST.SEARCH.STATUS.EXPENSE);
202+
suggestedStatuses = Object.values(CONST.SEARCH.STATUS.EXPENSE);
203+
break;
202204
case CONST.SEARCH.DATA_TYPES.INVOICE:
203-
return Object.values(CONST.SEARCH.STATUS.INVOICE);
205+
suggestedStatuses = Object.values(CONST.SEARCH.STATUS.INVOICE);
206+
break;
204207
case CONST.SEARCH.DATA_TYPES.CHAT:
205-
return Object.values(CONST.SEARCH.STATUS.CHAT);
208+
suggestedStatuses = Object.values(CONST.SEARCH.STATUS.CHAT);
209+
break;
206210
case CONST.SEARCH.DATA_TYPES.TRIP:
207-
return Object.values(CONST.SEARCH.STATUS.TRIP);
211+
suggestedStatuses = Object.values(CONST.SEARCH.STATUS.TRIP);
212+
break;
208213
case CONST.SEARCH.DATA_TYPES.TASK:
209-
return Object.values(CONST.SEARCH.STATUS.TASK);
214+
suggestedStatuses = Object.values(CONST.SEARCH.STATUS.TASK);
215+
break;
210216
default:
211-
return Object.values({...CONST.SEARCH.STATUS.EXPENSE, ...CONST.SEARCH.STATUS.INVOICE, ...CONST.SEARCH.STATUS.CHAT, ...CONST.SEARCH.STATUS.TRIP, ...CONST.SEARCH.STATUS.TASK});
217+
suggestedStatuses = Object.values({
218+
...CONST.SEARCH.STATUS.EXPENSE,
219+
...CONST.SEARCH.STATUS.INVOICE,
220+
...CONST.SEARCH.STATUS.CHAT,
221+
...CONST.SEARCH.STATUS.TRIP,
222+
...CONST.SEARCH.STATUS.TASK,
223+
});
212224
}
225+
return suggestedStatuses.map((value) => getUserFriendlyValue(value));
213226
}, [autocompleteQueryValue]);
214227

215228
const expenseTypes = Object.values(CONST.SEARCH.TRANSACTION_TYPE).map((value) => getUserFriendlyValue(value));

src/libs/SearchAutocompleteUtils.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ function getAutocompleteQueryWithComma(prevQuery: string, newQuery: string) {
112112

113113
const userFriendlyExpenseTypeList = Object.values(CONST.SEARCH.TRANSACTION_TYPE).map((value) => getUserFriendlyValue(value));
114114
const userFriendlyGroupByList = Object.values(CONST.SEARCH.GROUP_BY).map((value) => getUserFriendlyValue(value));
115+
const userFriendlyStatusList = Object.values({
116+
...CONST.SEARCH.STATUS.EXPENSE,
117+
...CONST.SEARCH.STATUS.INVOICE,
118+
...CONST.SEARCH.STATUS.CHAT,
119+
...CONST.SEARCH.STATUS.TRIP,
120+
...CONST.SEARCH.STATUS.TASK,
121+
}).map((value) => getUserFriendlyValue(value));
115122

116123
/**
117124
* @private
@@ -129,13 +136,7 @@ function filterOutRangesWithCorrectValue(
129136
const typeList = Object.values(CONST.SEARCH.DATA_TYPES) as string[];
130137
const expenseTypeList = userFriendlyExpenseTypeList;
131138
const withdrawalTypeList = Object.values(CONST.SEARCH.WITHDRAWAL_TYPE) as string[];
132-
const statusList = Object.values({
133-
...CONST.SEARCH.STATUS.EXPENSE,
134-
...CONST.SEARCH.STATUS.INVOICE,
135-
...CONST.SEARCH.STATUS.CHAT,
136-
...CONST.SEARCH.STATUS.TRIP,
137-
...CONST.SEARCH.STATUS.TASK,
138-
}) as string[];
139+
const statusList = userFriendlyStatusList;
139140
const groupByList = userFriendlyGroupByList;
140141
const booleanList = Object.values(CONST.SEARCH.BOOLEAN) as string[];
141142
const actionList = Object.values(CONST.SEARCH.ACTION_FILTERS) as string[];

0 commit comments

Comments
 (0)