Skip to content

Commit 0e52e01

Browse files
committed
fix(filtering): Reverse condition check for exception and add additional safety checks for recreating expressions.
1 parent 6cbc9b3 commit 0e52e01

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

projects/igniteui-angular/src/lib/data-operations/expressions-tree-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ function recreateExpression(expression: IFilteringExpression, fields: FieldType[
149149
}
150150
}
151151

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

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6608,10 +6608,10 @@ export abstract class IgxGridBaseDirective implements GridType,
66086608
.filter((c) => c.pinned);
66096609
this._unpinnedColumns = newColumns.filter((c) => !c.pinned);
66106610
this._columns = newColumns;
6611-
if (this._columns && this._filteringExpressionsTree) {
6611+
if (this._columns && this._columns.length && this._filteringExpressionsTree) {
66126612
this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
66136613
}
6614-
if (this._columns && this._advancedFilteringExpressionsTree) {
6614+
if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
66156615
this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
66166616
}
66176617
this.resetCaches();
@@ -6676,10 +6676,10 @@ export abstract class IgxGridBaseDirective implements GridType,
66766676
} else {
66776677
this._columns = this.getColumnList();
66786678
}
6679-
if (this._columns && this._filteringExpressionsTree) {
6679+
if (this._columns && this._columns.length && this._filteringExpressionsTree) {
66806680
this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
66816681
}
6682-
if (this._columns && this._advancedFilteringExpressionsTree) {
6682+
if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
66836683
this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
66846684
}
66856685

0 commit comments

Comments
 (0)