Skip to content

feat: add view parameter to search query grammar #80541

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
puneetlath merged 13 commits into from
Jan 27, 2026
Merged

feat: add view parameter to search query grammar #80541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
41c338c
Add view parameter to search query grammar
mateuuszzzzz Jan 26, 2026
1abaa8e
Remove future chart types from consts
mateuuszzzzz Jan 26, 2026
c157b9f
Update tests
mateuuszzzzz Jan 26, 2026
531068e
Fix test data in useSearchHighlightAndScrollTest to match type defini…
mateuuszzzzz Jan 26, 2026
09da1da
Fix Search tests to include view:table in expected query strings
mateuuszzzzz Jan 26, 2026
925a128
Resolve conflicts
mateuuszzzzz Jan 26, 2026
affb962
Run prettier
mateuuszzzzz Jan 27, 2026
7fe9d61
Fix queryJSON to match type definition
mateuuszzzzz Jan 27, 2026
e7a1520
Fix test to use defaultQuery const
mateuuszzzzz Jan 27, 2026
a4ab81c
Add view to nonNegatableKeys in autocompleteParser.peggy
mateuuszzzzz Jan 27, 2026
8ec017e
Merge branch 'main' into add-view-bar-to-fe-query-language
mateuuszzzzz Jan 27, 2026
39b9495
Fix tests
mateuuszzzzz Jan 27, 2026
db63fba
Do not add view to URL when it is not explicitly used in query
mateuuszzzzz Jan 27, 2026
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
5 changes: 5 additions & 0 deletions src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7079,10 +7079,15 @@ const CONST = {
STATUS: 'status',
SORT_BY: 'sortBy',
SORT_ORDER: 'sortOrder',
VIEW: 'view',
GROUP_BY: 'groupBy',
COLUMNS: 'columns',
LIMIT: 'limit',
},
VIEW: {
TABLE: 'table',
BAR: 'bar',
},
SYNTAX_FILTER_KEYS: {
TYPE: 'type',
STATUS: 'status',
Expand Down
3 changes: 3 additions & 0 deletions src/components/Search/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ type TaskSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.TASK>;
type SingularSearchStatus = ExpenseSearchStatus | ExpenseReportSearchStatus | InvoiceSearchStatus | TripSearchStatus | TaskSearchStatus;
type SearchStatus = SingularSearchStatus | SingularSearchStatus[];
type SearchGroupBy = ValueOf<typeof CONST.SEARCH.GROUP_BY>;
type SearchView = ValueOf<typeof CONST.SEARCH.VIEW>;
type TableColumnSize = ValueOf<typeof CONST.SEARCH.TABLE_COLUMN_SIZES>;
type SearchDatePreset = ValueOf<typeof CONST.SEARCH.DATE_PRESETS>;
type SearchWithdrawalType = ValueOf<typeof CONST.SEARCH.WITHDRAWAL_TYPE>;
Expand Down Expand Up @@ -247,6 +248,7 @@ type SearchQueryAST = {
sortBy: SearchColumnType;
sortOrder: SortOrder;
groupBy?: SearchGroupBy;
view: SearchView;
Comment thread
mateuuszzzzz marked this conversation as resolved.
filters: ASTNode;
policyID?: string[];
rawFilterList?: RawQueryFilter[];
Expand Down Expand Up @@ -327,6 +329,7 @@ export type {
SearchParams,
TableColumnSize,
SearchGroupBy,
SearchView,
SingularSearchStatus,
SearchDatePreset,
SearchWithdrawalType,
Expand Down
539 changes: 281 additions & 258 deletions src/libs/SearchParser/autocompleteParser.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/libs/SearchParser/autocompleteParser.peggy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

// List fields where you cannot prefix it with "-" to negate it
const nonNegatableKeys = new Set([
"type", "keyword", "groupCurrency", "groupBy", "columns", "limit"
"type", "keyword", "groupCurrency", "groupBy", "columns", "limit", "view"
]);
}

Comment thread
mateuuszzzzz marked this conversation as resolved.
Expand Down
3 changes: 2 additions & 1 deletion src/libs/SearchParser/baseRules.peggy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,11 @@ has = "has"i {return "has"; }
is = "is"i {return "is"; }
purchaseAmount = "purchaseAmount"i / "purchase-amount"i {return "purchaseAmount"}
purchaseCurrency = "purchaseCurrency"i / "purchase-currency"i {return "purchaseCurrency"}
columns = "columns"i {
columns = "columns"i {
isColumnsContext = true;
return "columns";
}
view = "view"i {return "view"}

// Value transformation rules
values
Expand Down
Loading
Loading