Skip to content

fix(grid): fixed advancedFilteringExpressionsTree rehydration #15500 #15506

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
damyanpetev merged 13 commits into from
Mar 18, 2025
Merged

fix(grid): fixed advancedFilteringExpressionsTree rehydration #15500 #15506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0bb0c39
fix(grid): fixed advancedFilteringExpressionsTree rehydration #15500
Otixa Mar 12, 2025
0d2cda4
chore(filtering): Added an extra explanation to the filtering rehydra…
Otixa Mar 12, 2025
1a7065e
fix(filtering): Fixed expression tree rehydrating before columns are …
Otixa Mar 13, 2025
a367614
test(*): Adding a test for binding the tree to a deserialized object.
gedinakova Mar 13, 2025
d27f0cb
fix(filtering): Made optional fields accept null values
Otixa Mar 14, 2025
9694356
Merge branch 'master' into filtering-15500
Mar 14, 2025
81fdcf6
test(Filtering): Adding a test for a declared IExpressionTree object.
gedinakova Mar 14, 2025
25f2e32
test(Filtering): Adding one more IExpressionTree test.
gedinakova Mar 14, 2025
7a85534
chore(*): Applied review suggestions
Otixa Mar 17, 2025
821dfe6
Merge branch 'filtering-15500' of https://github.com/IgniteUI/igniteu…
Otixa Mar 17, 2025
58c382e
Merge branch 'master' into filtering-15500
Otixa Mar 17, 2025
4638d08
chore(filtering): Reverted null in returnFields array
Otixa Mar 18, 2025
1828892
Merge branch 'master' into filtering-15500
damyanpetev Mar 18, 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
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/data-operations/expressions-tree-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function recreateExpression(expression: IFilteringExpression, fields: FieldType[
}

if (!expression.condition && expression.conditionName) {
throw Error('Wrong `conditionName`, `condition` or `field` provided!');
throw Error('Wrong `conditionName`, `condition` or `field` provided! It is possible that there is a type mismatch between the condition type and field type.');
}

if (!expression.conditionName) {
Expand Down
3 changes: 3 additions & 0 deletions projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6671,6 +6671,9 @@ export abstract class IgxGridBaseDirective implements GridType,
if (this._columns && this._filteringExpressionsTree) {
this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
}
if (this._columns && this._advancedFilteringExpressionsTree) {
this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
}
}

this.initColumns(this._columns, (col: IgxColumnComponent) => this.columnInit.emit(col));
Expand Down