From 082df47f9d598e86656ae968c7c1b511371658eb Mon Sep 17 00:00:00 2001 From: Mihail Cherkasov Date: Tue, 24 Sep 2024 12:04:00 +0300 Subject: [PATCH 1/3] chore(query-builder): Depricated find and findIndex, added FilteringUtil --- .../filtering-expressions-tree.ts | 49 ++++------------ .../src/lib/data-operations/filtering-util.ts | 58 +++++++++++++++++++ .../src/lib/grids/columns/column.component.ts | 3 +- .../grids/filtering/grid-filtering.service.ts | 15 ++--- .../grids/headers/grid-header.component.ts | 3 +- 5 files changed, 82 insertions(+), 46 deletions(-) create mode 100644 projects/igniteui-angular/src/lib/data-operations/filtering-util.ts diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts index 92b84be6a5e..956bdea5659 100644 --- a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts +++ b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts @@ -1,5 +1,6 @@ import { FilteringLogic, IFilteringExpression } from './filtering-expression.interface'; import { IBaseEventArgs } from '../core/utils'; +import { FilteringUtil } from './filtering-util'; /* mustCoerceToInt */ export enum FilteringExpressionsTreeType { @@ -19,7 +20,14 @@ export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpr /* alternateName: treeType */ type?: FilteringExpressionsTreeType; + /** + * @deprecated in version 19.1. Use `FilteringUtil.find` instead. + */ find(fieldName: string): IFilteringExpressionsTree | IFilteringExpression; + + /** + * @deprecated in version 19.1. Use `FilteringUtil.findIndex` instead. + */ findIndex(fieldName: string): number; } @@ -111,15 +119,10 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree { * ``` * * @memberof FilteringExpressionsTree + * @deprecated in version 19.1. Use `FilteringUtil.find` instead. */ public find(fieldName: string): IFilteringExpressionsTree | IFilteringExpression { - const index = this.findIndex(fieldName); - - if (index > -1) { - return this.filteringOperands[index]; - } - - return null; + return FilteringUtil.find(this, fieldName); } /** @@ -129,37 +132,9 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree { * ``` * * @memberof FilteringExpressionsTree + * @deprecated in version 19.1. Use `FilteringUtil.findIndex` instead. */ public findIndex(fieldName: string): number { - let expr; - for (let i = 0; i < this.filteringOperands.length; i++) { - expr = this.filteringOperands[i]; - if (expr instanceof FilteringExpressionsTree) { - if (this.isFilteringExpressionsTreeForColumn(expr, fieldName)) { - return i; - } - } else { - if ((expr as IFilteringExpression).fieldName === fieldName) { - return i; - } - } - } - - return -1; - } - - protected isFilteringExpressionsTreeForColumn(expressionsTree: IFilteringExpressionsTree, fieldName: string): boolean { - if (expressionsTree.fieldName === fieldName) { - return true; - } - - for (const expr of expressionsTree.filteringOperands) { - if ((expr instanceof FilteringExpressionsTree)) { - return this.isFilteringExpressionsTreeForColumn(expr, fieldName); - } else if ((expr as IFilteringExpression).fieldName === fieldName) { - return true; - } - } - return false; + return FilteringUtil.findIndex(this, fieldName); } } diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts new file mode 100644 index 00000000000..73e27a2278f --- /dev/null +++ b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts @@ -0,0 +1,58 @@ +import { FilteringExpressionsTree, IFilteringExpression, IFilteringExpressionsTree } from 'igniteui-angular'; + +export class FilteringUtil { + /** + * Returns the filtering expression for a column with the provided tree and fieldName. + * ```typescript + * let filteringExpression = FilteringUtil.find(gridExpressionTree, 'Column Field'); + * ``` + */ + public static find(tree: IFilteringExpressionsTree, fieldName: string): IFilteringExpressionsTree | IFilteringExpression { + const index = this.findIndex(tree, fieldName); + + if (index > -1) { + return tree.filteringOperands[index]; + } + + return null; + } + + /** + * Returns the index of the filtering expression for a column with the provided tree and fieldName. + * ```typescript + * let filteringExpressionIndex = FilteringUtil.findIndex(gridExpressionTree, 'Column Field'); + * ``` + */ + public static findIndex(tree: IFilteringExpressionsTree, fieldName: string): number { + let expr; + for (let i = 0; i < tree.filteringOperands.length; i++) { + expr = tree.filteringOperands[i]; + if (expr instanceof FilteringExpressionsTree) { + if (this.isFilteringExpressionsTreeForColumn(expr, fieldName)) { + return i; + } + } else { + if ((expr as IFilteringExpression).fieldName === fieldName) { + return i; + } + } + } + + return -1; + } + + protected static isFilteringExpressionsTreeForColumn(expressionsTree: IFilteringExpressionsTree, fieldName: string): boolean { + if (expressionsTree.fieldName === fieldName) { + return true; + } + + for (const expr of expressionsTree.filteringOperands) { + if ((expr instanceof FilteringExpressionsTree)) { + return this.isFilteringExpressionsTreeForColumn(expr, fieldName); + } else if ((expr as IFilteringExpression).fieldName === fieldName) { + return true; + } + } + return false; + } +} diff --git a/projects/igniteui-angular/src/lib/grids/columns/column.component.ts b/projects/igniteui-angular/src/lib/grids/columns/column.component.ts index 3ea90391b2f..22cace74742 100644 --- a/projects/igniteui-angular/src/lib/grids/columns/column.component.ts +++ b/projects/igniteui-angular/src/lib/grids/columns/column.component.ts @@ -56,6 +56,7 @@ import { isConstructor, PlatformUtil } from '../../core/utils'; import { IgxGridCell } from '../grid-public-cell'; import { NG_VALIDATORS, Validator } from '@angular/forms'; import { Size } from '../common/enums'; +import { FilteringUtil } from '../../data-operations/filtering-util'; const DEFAULT_DATE_FORMAT = 'mediumDate'; const DEFAULT_TIME_FORMAT = 'mediumTime'; @@ -1647,7 +1648,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy * @memberof IgxColumnComponent */ public get filteringExpressionsTree(): FilteringExpressionsTree { - return this.grid.filteringExpressionsTree.find(this.field) as FilteringExpressionsTree; + return FilteringUtil.find(this.grid.filteringExpressionsTree, this.field) as FilteringExpressionsTree; } /* alternateName: parentColumn */ diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts index 3ef0f950e86..29ed5ebc62f 100644 --- a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts +++ b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts @@ -20,6 +20,7 @@ import { ColumnType, GridType } from '../common/grid.interface'; import { formatDate } from '../../core/utils'; import { ExcelStylePositionStrategy } from './excel-style/excel-style-position-strategy'; import { fadeIn } from 'igniteui-angular/animations'; +import { FilteringUtil } from '../../data-operations/filtering-util'; /** * @hidden @@ -172,9 +173,9 @@ export class IgxFilteringService implements OnDestroy { const filteringIgnoreCase = ignoreCase || (col ? col.filteringIgnoreCase : false); const filteringTree = grid.filteringExpressionsTree; - const columnFilteringExpressionsTree = filteringTree.find(field) as IFilteringExpressionsTree; + const columnFilteringExpressionsTree = FilteringUtil.find(filteringTree, field) as IFilteringExpressionsTree; conditionOrExpressionTree = conditionOrExpressionTree ?? columnFilteringExpressionsTree; - const fieldFilterIndex = filteringTree.findIndex(field); + const fieldFilterIndex = FilteringUtil.findIndex(filteringTree, field); const newFilteringTree: FilteringExpressionsTree = this.prepare_filtering_expression(filteringTree, field, value, conditionOrExpressionTree, @@ -182,7 +183,7 @@ export class IgxFilteringService implements OnDestroy { const eventArgs: IFilteringEventArgs = { owner: grid, - filteringExpressions: newFilteringTree.find(field) as FilteringExpressionsTree, cancel: false + filteringExpressions: FilteringUtil.find(newFilteringTree, field) as FilteringExpressionsTree, cancel: false }; this.grid.filtering.emit(eventArgs); @@ -193,7 +194,7 @@ export class IgxFilteringService implements OnDestroy { if (conditionOrExpressionTree) { this.filter_internal(field, value, conditionOrExpressionTree, filteringIgnoreCase); } else { - const expressionsTreeForColumn = this.grid.filteringExpressionsTree.find(field); + const expressionsTreeForColumn = FilteringUtil.find(this.grid.filteringExpressionsTree, field); if (!expressionsTreeForColumn) { throw new Error('Invalid condition or Expression Tree!'); } else if (expressionsTreeForColumn instanceof FilteringExpressionsTree) { @@ -203,7 +204,7 @@ export class IgxFilteringService implements OnDestroy { this.filter_internal(field, value, expressionForColumn.condition, filteringIgnoreCase); } } - const doneEventArgs = this.grid.filteringExpressionsTree.find(field) as FilteringExpressionsTree; + const doneEventArgs = FilteringUtil.find(this.grid.filteringExpressionsTree, field) as FilteringExpressionsTree; // Wait for the change detection to update filtered data through the pipes and then emit the event. requestAnimationFrame(() => this.grid.filteringDone.emit(doneEventArgs)); } @@ -273,7 +274,7 @@ export class IgxFilteringService implements OnDestroy { const grid = this.grid; grid.crudService.endEdit(false); const filteringState = grid.filteringExpressionsTree; - const index = filteringState.findIndex(fieldName); + const index = FilteringUtil.findIndex(filteringState, fieldName); if (index > -1) { filteringState.filteringOperands.splice(index, 1); @@ -512,7 +513,7 @@ export class IgxFilteringService implements OnDestroy { this.grid.crudService.endEdit(false); this.grid.page = 0; - const fieldFilterIndex = filteringTree.findIndex(fieldName); + const fieldFilterIndex = FilteringUtil.findIndex(filteringTree, fieldName); this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex); this.grid.filteringExpressionsTree = filteringTree; } diff --git a/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts b/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts index 7e02771046b..b6f232e502c 100644 --- a/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts +++ b/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts @@ -21,6 +21,7 @@ import { SortingDirection } from '../../data-operations/sorting-strategy'; import { SortingIndexPipe } from './pipes'; import { NgTemplateOutlet, NgIf, NgClass } from '@angular/common'; import { IgxIconComponent } from '../../icon/icon.component'; +import { FilteringUtil } from '../../data-operations/filtering-util'; /** * @hidden @@ -280,7 +281,7 @@ export class IgxGridHeaderComponent implements DoCheck, OnDestroy { if(!this.grid.advancedFilteringExpressionsTree) { return false; } - return !!this.grid.advancedFilteringExpressionsTree.find(this.column.field); + return !!FilteringUtil.find(this.grid.advancedFilteringExpressionsTree, this.column.field); } private triggerSort() { From 7c11bf70a5d9776cf505118102c40d06a274c711 Mon Sep 17 00:00:00 2001 From: Mihail Cherkasov Date: Tue, 24 Sep 2024 12:04:00 +0300 Subject: [PATCH 2/3] chore(query-builder): Depricated find and findIndex, added FilteringUtil --- .../filtering-expressions-tree.ts | 49 ++++------------ .../src/lib/data-operations/filtering-util.ts | 58 +++++++++++++++++++ .../src/lib/grids/columns/column.component.ts | 3 +- .../grids/filtering/grid-filtering.service.ts | 15 ++--- .../grids/headers/grid-header.component.ts | 3 +- 5 files changed, 82 insertions(+), 46 deletions(-) create mode 100644 projects/igniteui-angular/src/lib/data-operations/filtering-util.ts diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts index 92b84be6a5e..956bdea5659 100644 --- a/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts +++ b/projects/igniteui-angular/src/lib/data-operations/filtering-expressions-tree.ts @@ -1,5 +1,6 @@ import { FilteringLogic, IFilteringExpression } from './filtering-expression.interface'; import { IBaseEventArgs } from '../core/utils'; +import { FilteringUtil } from './filtering-util'; /* mustCoerceToInt */ export enum FilteringExpressionsTreeType { @@ -19,7 +20,14 @@ export declare interface IFilteringExpressionsTree extends IBaseEventArgs, IExpr /* alternateName: treeType */ type?: FilteringExpressionsTreeType; + /** + * @deprecated in version 19.1. Use `FilteringUtil.find` instead. + */ find(fieldName: string): IFilteringExpressionsTree | IFilteringExpression; + + /** + * @deprecated in version 19.1. Use `FilteringUtil.findIndex` instead. + */ findIndex(fieldName: string): number; } @@ -111,15 +119,10 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree { * ``` * * @memberof FilteringExpressionsTree + * @deprecated in version 19.1. Use `FilteringUtil.find` instead. */ public find(fieldName: string): IFilteringExpressionsTree | IFilteringExpression { - const index = this.findIndex(fieldName); - - if (index > -1) { - return this.filteringOperands[index]; - } - - return null; + return FilteringUtil.find(this, fieldName); } /** @@ -129,37 +132,9 @@ export class FilteringExpressionsTree implements IFilteringExpressionsTree { * ``` * * @memberof FilteringExpressionsTree + * @deprecated in version 19.1. Use `FilteringUtil.findIndex` instead. */ public findIndex(fieldName: string): number { - let expr; - for (let i = 0; i < this.filteringOperands.length; i++) { - expr = this.filteringOperands[i]; - if (expr instanceof FilteringExpressionsTree) { - if (this.isFilteringExpressionsTreeForColumn(expr, fieldName)) { - return i; - } - } else { - if ((expr as IFilteringExpression).fieldName === fieldName) { - return i; - } - } - } - - return -1; - } - - protected isFilteringExpressionsTreeForColumn(expressionsTree: IFilteringExpressionsTree, fieldName: string): boolean { - if (expressionsTree.fieldName === fieldName) { - return true; - } - - for (const expr of expressionsTree.filteringOperands) { - if ((expr instanceof FilteringExpressionsTree)) { - return this.isFilteringExpressionsTreeForColumn(expr, fieldName); - } else if ((expr as IFilteringExpression).fieldName === fieldName) { - return true; - } - } - return false; + return FilteringUtil.findIndex(this, fieldName); } } diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts new file mode 100644 index 00000000000..73e27a2278f --- /dev/null +++ b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts @@ -0,0 +1,58 @@ +import { FilteringExpressionsTree, IFilteringExpression, IFilteringExpressionsTree } from 'igniteui-angular'; + +export class FilteringUtil { + /** + * Returns the filtering expression for a column with the provided tree and fieldName. + * ```typescript + * let filteringExpression = FilteringUtil.find(gridExpressionTree, 'Column Field'); + * ``` + */ + public static find(tree: IFilteringExpressionsTree, fieldName: string): IFilteringExpressionsTree | IFilteringExpression { + const index = this.findIndex(tree, fieldName); + + if (index > -1) { + return tree.filteringOperands[index]; + } + + return null; + } + + /** + * Returns the index of the filtering expression for a column with the provided tree and fieldName. + * ```typescript + * let filteringExpressionIndex = FilteringUtil.findIndex(gridExpressionTree, 'Column Field'); + * ``` + */ + public static findIndex(tree: IFilteringExpressionsTree, fieldName: string): number { + let expr; + for (let i = 0; i < tree.filteringOperands.length; i++) { + expr = tree.filteringOperands[i]; + if (expr instanceof FilteringExpressionsTree) { + if (this.isFilteringExpressionsTreeForColumn(expr, fieldName)) { + return i; + } + } else { + if ((expr as IFilteringExpression).fieldName === fieldName) { + return i; + } + } + } + + return -1; + } + + protected static isFilteringExpressionsTreeForColumn(expressionsTree: IFilteringExpressionsTree, fieldName: string): boolean { + if (expressionsTree.fieldName === fieldName) { + return true; + } + + for (const expr of expressionsTree.filteringOperands) { + if ((expr instanceof FilteringExpressionsTree)) { + return this.isFilteringExpressionsTreeForColumn(expr, fieldName); + } else if ((expr as IFilteringExpression).fieldName === fieldName) { + return true; + } + } + return false; + } +} diff --git a/projects/igniteui-angular/src/lib/grids/columns/column.component.ts b/projects/igniteui-angular/src/lib/grids/columns/column.component.ts index 3ea90391b2f..22cace74742 100644 --- a/projects/igniteui-angular/src/lib/grids/columns/column.component.ts +++ b/projects/igniteui-angular/src/lib/grids/columns/column.component.ts @@ -56,6 +56,7 @@ import { isConstructor, PlatformUtil } from '../../core/utils'; import { IgxGridCell } from '../grid-public-cell'; import { NG_VALIDATORS, Validator } from '@angular/forms'; import { Size } from '../common/enums'; +import { FilteringUtil } from '../../data-operations/filtering-util'; const DEFAULT_DATE_FORMAT = 'mediumDate'; const DEFAULT_TIME_FORMAT = 'mediumTime'; @@ -1647,7 +1648,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy * @memberof IgxColumnComponent */ public get filteringExpressionsTree(): FilteringExpressionsTree { - return this.grid.filteringExpressionsTree.find(this.field) as FilteringExpressionsTree; + return FilteringUtil.find(this.grid.filteringExpressionsTree, this.field) as FilteringExpressionsTree; } /* alternateName: parentColumn */ diff --git a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts index 3ef0f950e86..29ed5ebc62f 100644 --- a/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts +++ b/projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts @@ -20,6 +20,7 @@ import { ColumnType, GridType } from '../common/grid.interface'; import { formatDate } from '../../core/utils'; import { ExcelStylePositionStrategy } from './excel-style/excel-style-position-strategy'; import { fadeIn } from 'igniteui-angular/animations'; +import { FilteringUtil } from '../../data-operations/filtering-util'; /** * @hidden @@ -172,9 +173,9 @@ export class IgxFilteringService implements OnDestroy { const filteringIgnoreCase = ignoreCase || (col ? col.filteringIgnoreCase : false); const filteringTree = grid.filteringExpressionsTree; - const columnFilteringExpressionsTree = filteringTree.find(field) as IFilteringExpressionsTree; + const columnFilteringExpressionsTree = FilteringUtil.find(filteringTree, field) as IFilteringExpressionsTree; conditionOrExpressionTree = conditionOrExpressionTree ?? columnFilteringExpressionsTree; - const fieldFilterIndex = filteringTree.findIndex(field); + const fieldFilterIndex = FilteringUtil.findIndex(filteringTree, field); const newFilteringTree: FilteringExpressionsTree = this.prepare_filtering_expression(filteringTree, field, value, conditionOrExpressionTree, @@ -182,7 +183,7 @@ export class IgxFilteringService implements OnDestroy { const eventArgs: IFilteringEventArgs = { owner: grid, - filteringExpressions: newFilteringTree.find(field) as FilteringExpressionsTree, cancel: false + filteringExpressions: FilteringUtil.find(newFilteringTree, field) as FilteringExpressionsTree, cancel: false }; this.grid.filtering.emit(eventArgs); @@ -193,7 +194,7 @@ export class IgxFilteringService implements OnDestroy { if (conditionOrExpressionTree) { this.filter_internal(field, value, conditionOrExpressionTree, filteringIgnoreCase); } else { - const expressionsTreeForColumn = this.grid.filteringExpressionsTree.find(field); + const expressionsTreeForColumn = FilteringUtil.find(this.grid.filteringExpressionsTree, field); if (!expressionsTreeForColumn) { throw new Error('Invalid condition or Expression Tree!'); } else if (expressionsTreeForColumn instanceof FilteringExpressionsTree) { @@ -203,7 +204,7 @@ export class IgxFilteringService implements OnDestroy { this.filter_internal(field, value, expressionForColumn.condition, filteringIgnoreCase); } } - const doneEventArgs = this.grid.filteringExpressionsTree.find(field) as FilteringExpressionsTree; + const doneEventArgs = FilteringUtil.find(this.grid.filteringExpressionsTree, field) as FilteringExpressionsTree; // Wait for the change detection to update filtered data through the pipes and then emit the event. requestAnimationFrame(() => this.grid.filteringDone.emit(doneEventArgs)); } @@ -273,7 +274,7 @@ export class IgxFilteringService implements OnDestroy { const grid = this.grid; grid.crudService.endEdit(false); const filteringState = grid.filteringExpressionsTree; - const index = filteringState.findIndex(fieldName); + const index = FilteringUtil.findIndex(filteringState, fieldName); if (index > -1) { filteringState.filteringOperands.splice(index, 1); @@ -512,7 +513,7 @@ export class IgxFilteringService implements OnDestroy { this.grid.crudService.endEdit(false); this.grid.page = 0; - const fieldFilterIndex = filteringTree.findIndex(fieldName); + const fieldFilterIndex = FilteringUtil.findIndex(filteringTree, fieldName); this.prepare_filtering_expression(filteringTree, fieldName, term, conditionOrExpressionsTree, ignoreCase, fieldFilterIndex); this.grid.filteringExpressionsTree = filteringTree; } diff --git a/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts b/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts index 7e02771046b..b6f232e502c 100644 --- a/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts +++ b/projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts @@ -21,6 +21,7 @@ import { SortingDirection } from '../../data-operations/sorting-strategy'; import { SortingIndexPipe } from './pipes'; import { NgTemplateOutlet, NgIf, NgClass } from '@angular/common'; import { IgxIconComponent } from '../../icon/icon.component'; +import { FilteringUtil } from '../../data-operations/filtering-util'; /** * @hidden @@ -280,7 +281,7 @@ export class IgxGridHeaderComponent implements DoCheck, OnDestroy { if(!this.grid.advancedFilteringExpressionsTree) { return false; } - return !!this.grid.advancedFilteringExpressionsTree.find(this.column.field); + return !!FilteringUtil.find(this.grid.advancedFilteringExpressionsTree, this.column.field); } private triggerSort() { From f43d9b2226debc26fdf8e606849209ee2271610e Mon Sep 17 00:00:00 2001 From: Mihail Cherkasov Date: Tue, 24 Sep 2024 16:31:55 +0300 Subject: [PATCH 3/3] chore(query-builder): Resolved circular reference --- .../igniteui-angular/src/lib/data-operations/filtering-util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts index 73e27a2278f..8149a7d8ec1 100644 --- a/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts +++ b/projects/igniteui-angular/src/lib/data-operations/filtering-util.ts @@ -1,4 +1,5 @@ -import { FilteringExpressionsTree, IFilteringExpression, IFilteringExpressionsTree } from 'igniteui-angular'; +import { IFilteringExpression } from './filtering-expression.interface'; +import { FilteringExpressionsTree, IFilteringExpressionsTree } from './filtering-expressions-tree'; export class FilteringUtil { /**