Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c1e8308
add export_status
JS00001 Jun 9, 2025
e7f36c6
parsers
JS00001 Jun 9, 2025
0613c67
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 9, 2025
cc4a1eb
remove pesky eslint error
JS00001 Jun 9, 2025
14c87d3
fix comment
JS00001 Jun 11, 2025
d8341f3
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 11, 2025
bf84264
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 16, 2025
3b9e6a3
make items blue & address comments
JS00001 Jun 17, 2025
d3ad9c1
ake export status use actual keys/values allowed
JS00001 Jun 17, 2025
27247b0
also, add keys to autocomplete list
JS00001 Jun 17, 2025
b8c43a9
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 17, 2025
0c48d51
remove old const file
JS00001 Jun 17, 2025
5f1d3c1
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 23, 2025
28bc3f4
convert exportStatus to 'action'
JS00001 Jun 23, 2025
60f3ad3
add action as the new filter
JS00001 Jun 23, 2025
b7fc773
Make pay always visible
JS00001 Jun 23, 2025
5aaf2ae
add reimbursable back to the pay query, and add back checks for showi…
JS00001 Jun 24, 2025
901ae31
use ACTION_TYPES rather than creating ACTION
JS00001 Jun 24, 2025
fb2dac8
update to add action filters, separate from just action_Types
JS00001 Jun 24, 2025
f237ae3
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jun 25, 2025
ea32d13
fix types, remove excess actions
JS00001 Jun 25, 2025
0f09701
update peggy rules
JS00001 Jun 25, 2025
c84893f
fix approvals showing up when they shouldnt
JS00001 Jun 25, 2025
a04508a
Merge branch 'main' of github.com:Expensify/App into jsenyitko-export…
JS00001 Jul 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6165,6 +6165,10 @@ const CONST = {
TRIP: 'trip',
CHAT: 'chat',
},
ACTION_FILTERS: {
PAY: 'pay',
EXPORT: 'export',
},
ACTION_TYPES: {
VIEW: 'view',
REVIEW: 'review',
Expand Down Expand Up @@ -6305,6 +6309,7 @@ const CONST = {
REIMBURSABLE: 'reimbursable',
BILLABLE: 'billable',
POLICY_ID: 'policyID',
ACTION: 'action',
},
TAG_EMPTY_VALUE: 'none',
CATEGORY_EMPTY_VALUE: 'none,Uncategorized',
Expand Down Expand Up @@ -6347,6 +6352,7 @@ const CONST = {
ASSIGNEE: 'assignee',
REIMBURSABLE: 'reimbursable',
BILLABLE: 'billable',
ACTION: 'action',
},
DATE_MODIFIERS: {
BEFORE: 'Before',
Expand Down
6 changes: 6 additions & 0 deletions src/components/Search/SearchAutocompleteList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,12 @@ function SearchAutocompleteList(
mapKey: CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID,
}));
}
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION: {
return Object.values(CONST.SEARCH.ACTION_FILTERS).map((status) => ({
filterKey: CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.ACTION,
text: status,
}));
}
default: {
return [];
}
Expand Down
3 changes: 3 additions & 0 deletions src/libs/SearchAutocompleteUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ function filterOutRangesWithCorrectValue(
}) as string[];
const groupByList = Object.values(CONST.SEARCH.GROUP_BY) as string[];
const booleanList = Object.values(CONST.SEARCH.BOOLEAN) as string[];
const actionList = Object.values(CONST.SEARCH.ACTION_FILTERS) as string[];

switch (range.key) {
case CONST.SEARCH.SYNTAX_FILTER_KEYS.IN:
Expand All @@ -157,6 +158,8 @@ function filterOutRangesWithCorrectValue(
return expenseTypeList.includes(range.value);
case CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS:
return statusList.includes(range.value);
case CONST.SEARCH.SYNTAX_FILTER_KEYS.ACTION:
return actionList.includes(range.value);
case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY:
return categoryList.get().includes(range.value);
case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:
Expand Down
Loading
Loading