Skip to content
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

Fix filtering expression throwing error with no columns. Related fixes for elements Blazor grid. #15555

Merged
merged 4 commits into from
Mar 25, 2025
+5 −5
Merged

Fix filtering expression throwing error with no columns. Related fixes for elements Blazor grid. #15555

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fd1c75
fix(filtering): Enable fully use of only `conditionName` when definin…
skrustev Mar 14, 2025
6e7e7fc
fix(elements): Enable IFilteringExpression to be used in Blazor.
skrustev Mar 14, 2025
768c3f6
fix(elements): Fix type inheritance for FilteringExpressionTree and E…
skrustev Mar 14, 2025
99a9edf
fix(filtering): Reverse condition check for exception and add additio…
skrustev Mar 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: 0 additions & 1 deletion projects/igniteui-angular/src/lib/data-operations/filtering-expression.interface.ts
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ export enum FilteringLogic {
Or
}

/* tsPlainInterface */
/* marshalByValue */
/**
* Represents filtering expressions.
1 change: 1 addition & 0 deletions projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ export declare interface IExpressionTree {
returnFields?: string[] | null;
}

/* alternateBaseType: ExpressionTree */
/* marshalByValue */
export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpressionTree {
filteringOperands: (IFilteringExpressionsTree | IFilteringExpression)[];
8 changes: 4 additions & 4 deletions projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
View file
Original file line number Diff line number Diff line change
@@ -6608,10 +6608,10 @@ export abstract class IgxGridBaseDirective implements GridType,
.filter((c) => c.pinned);
this._unpinnedColumns = newColumns.filter((c) => !c.pinned);
this._columns = newColumns;
if (this._columns && this._filteringExpressionsTree) {
if (this._columns && this._columns.length && this._filteringExpressionsTree) {
this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
}
if (this._columns && this._advancedFilteringExpressionsTree) {
if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this.columns) as IFilteringExpressionsTree;
}
this.resetCaches();
@@ -6676,10 +6676,10 @@ export abstract class IgxGridBaseDirective implements GridType,
} else {
this._columns = this.getColumnList();
}
if (this._columns && this._filteringExpressionsTree) {
if (this._columns && this._columns.length && this._filteringExpressionsTree) {
this._filteringExpressionsTree = recreateTreeFromFields(this._filteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
}
if (this._columns && this._advancedFilteringExpressionsTree) {
if (this._columns && this._columns.length && this._advancedFilteringExpressionsTree) {
this._advancedFilteringExpressionsTree = recreateTreeFromFields(this._advancedFilteringExpressionsTree, this._columns) as IFilteringExpressionsTree;
}

Loading