Skip to content

Update group by report syntax #68476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjasikowski merged 11 commits into from
Aug 21, 2025
Merged

Update group by report syntax #68476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2c0ae14
change groupby report syntax
luacmartins Aug 13, 2025
6901d3b
refactor reports syntax
luacmartins Aug 13, 2025
afda04f
update report syntax
luacmartins Aug 13, 2025
2d3f50b
update all isntances
luacmartins Aug 13, 2025
37a579d
resolve conflicts
luacmartins Aug 19, 2025
2e6e67c
fix tests
luacmartins Aug 19, 2025
d9a7c70
resolve conflicts
luacmartins Aug 19, 2025
a6a9a91
fix test
luacmartins Aug 19, 2025
029a027
rm submodule
luacmartins Aug 19, 2025
aba9ffe
update logic
luacmartins Aug 19, 2025
ddf57ab
update tests
luacmartins Aug 19, 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
1 change: 1 addition & 0 deletions src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6496,6 +6496,7 @@ const CONST = {
get SEARCH_USER_FRIENDLY_VALUES_MAP() {
return {
[this.TRANSACTION_TYPE.PER_DIEM]: 'per-diem',
[this.GROUP_BY.REPORTS]: 'report',
};
},
DATE_MODIFIERS: {
Expand Down
5 changes: 2 additions & 3 deletions src/components/Search/SearchAutocompleteList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function SearchAutocompleteList(
const [isInitialRender, setIsInitialRender] = useState(true);

const typeAutocompleteList = Object.values(CONST.SEARCH.DATA_TYPES);
const groupByAutocompleteList = Object.values(CONST.SEARCH.GROUP_BY);
const groupByAutocompleteList = Object.values(CONST.SEARCH.GROUP_BY).map((value) => getUserFriendlyValue(value));

const statusAutocompleteList = useMemo(() => {
const parsedQuery = parseForAutocomplete(autocompleteQueryValue);
Expand All @@ -212,7 +212,7 @@ function SearchAutocompleteList(
}
}, [autocompleteQueryValue]);

const expenseTypes = Object.values(CONST.SEARCH.TRANSACTION_TYPE);
const expenseTypes = Object.values(CONST.SEARCH.TRANSACTION_TYPE).map((value) => getUserFriendlyValue(value));
const withdrawalTypes = Object.values(CONST.SEARCH.WITHDRAWAL_TYPE);
const booleanTypes = Object.values(CONST.SEARCH.BOOLEAN);

Expand Down Expand Up @@ -390,7 +390,6 @@ function SearchAutocompleteList(
}
case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE: {
const filteredExpenseTypes = expenseTypes
.map((value) => getUserFriendlyValue(value))
.filter((expenseType) => expenseType.includes(autocompleteValue.toLowerCase()) && !alreadyAutocompletedKeys.includes(expenseType))
.sort();

Expand Down
3 changes: 2 additions & 1 deletion src/libs/SearchAutocompleteUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ function getAutocompleteQueryWithComma(prevQuery: string, newQuery: string) {
}

const userFriendlyExpenseTypeList = Object.values(CONST.SEARCH.TRANSACTION_TYPE).map((value) => getUserFriendlyValue(value));
const userFriendlyGroupByList = Object.values(CONST.SEARCH.GROUP_BY).map((value) => getUserFriendlyValue(value));

@luacmartins luacmartins Aug 19, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to do this because getUserFriendlyValue is not a worklet function, so it'd result in an error if we called it within filterOutRangesWithCorrectValue below


/**
* @private
Expand All @@ -135,7 +136,7 @@ function filterOutRangesWithCorrectValue(
...CONST.SEARCH.STATUS.TRIP,
...CONST.SEARCH.STATUS.TASK,
}) as string[];
const groupByList = Object.values(CONST.SEARCH.GROUP_BY) as string[];
const groupByList = userFriendlyGroupByList;
const booleanList = Object.values(CONST.SEARCH.BOOLEAN) as string[];
const actionList = Object.values(CONST.SEARCH.ACTION_FILTERS) as string[];
const datePresetList = Object.values(CONST.SEARCH.DATE_PRESETS) as string[];
Expand Down
Loading
Loading