Skip to content

Commit 68cb311

Browse files
authored
Fix filtering expression throwing error with no columns. Related fixes for elements Blazor grid. (#15555)
1 parent 8875231 commit 68cb311

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Diff for: projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export enum FilteringLogic {
77
Or
88
}
99

10-
/* tsPlainInterface */
1110
/* marshalByValue */
1211
/**
1312
* Represents filtering expressions.

Diff for: projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export declare interface IExpressionTree {
1616
returnFields?: string[] | null;
1717
}
1818

19+
/* alternateBaseType: ExpressionTree */
1920
/* marshalByValue */
2021
export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpressionTree {
2122
filteringOperands: (IFilteringExpressionsTree | IFilteringExpression)[];

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

+4-4
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)