Merge branch 'master' into ganastasov/fix-16897-master

georgianastasov · web-flow · commit 5fecb831d6a3 · 2026-02-20T17:01:49.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "express": "^5.2.1",
     "fflate": "^0.8.1",
     "igniteui-i18n-core": "^1.0.2",
-    "igniteui-theming": "^25.0.0-beta.5",
+    "igniteui-theming": "^25.0.0",
     "igniteui-trial-watermark": "^3.1.0",
     "jspdf": "^4.0.0",
     "lodash-es": "^4.17.21",
diff --git a/projects/igniteui-angular/core/src/data-operations/expressions-tree-util.spec.ts b/projects/igniteui-angular/core/src/data-operations/expressions-tree-util.spec.ts
@@ -478,29 +478,4 @@ describe('Unit testing FilteringUtil', () => {
         expect(nestedCondition.condition.logic(200, nestedCondition.searchVal)).toBe(true);
     });
 
-    it('should recreate string expression with correct conditionName', () => {
-        const fields: FieldType[] = [
-            { field: 'Name', dataType: 'string' }
-        ];
-
-        // such expression will exist if user has changed the condition OR restore grid state through the IgxGridState directive
-        const expression: IFilteringExpression = {
-            fieldName: 'Name',
-            conditionName: 'contains',
-            searchVal: 'test',
-            condition: {
-                name: 'startsWith',
-                iconName: 'starts_with',
-                isUnary: false,
-            }
-        };
-
-        const result = recreateExpression(expression, fields);
-
-        expect(result.condition).toBe(IgxStringFilteringOperand.instance().condition('startsWith'));
-        expect(result.condition.logic).toBeDefined();
-        expect(result.conditionName).toBe('startsWith');
-        expect(result.searchVal).toBe('test');
-    });
-
 });
diff --git a/projects/igniteui-angular/core/src/data-operations/expressions-tree-util.ts b/projects/igniteui-angular/core/src/data-operations/expressions-tree-util.ts
@@ -125,7 +125,7 @@ function getFilteringCondition(dataType: string, name: string): IFilteringOperat
  */
 function recreateOperatorFromDataType(expression: IFilteringExpression, dataType: string): IFilteringOperation {
     if (!expression.condition?.logic) {
-        return getFilteringCondition(dataType, expression.condition?.name || expression.conditionName);
+        return getFilteringCondition(dataType, expression.conditionName || expression.condition?.name);
     }
 
     return expression.condition;
@@ -145,15 +145,18 @@ export function recreateExpression(expression: IFilteringExpression, fields: Fie
         if (!field.filters) {
             expression.condition = recreateOperatorFromDataType(expression, field.dataType);
         } else {
-            expression.condition = field.filters.condition(expression.condition?.name || expression.conditionName);
+            expression.condition = field.filters.condition(expression.conditionName || expression.condition?.name);
         }
     }
 
     if (!expression.condition && expression.conditionName) {
         throw Error('Wrong `conditionName`, `condition` or `field` provided! It is possible that there is a type mismatch between the condition type and field type.');
     }
 
-    expression.conditionName = expression.condition?.name;
+    if (!expression.conditionName) {
+        expression.conditionName = expression.condition?.name;
+    }
+
     expression.searchVal = recreateSearchValue(expression.searchVal, field?.dataType);
 
     return expression;
diff --git a/projects/igniteui-angular/grids/core/src/filtering/base/grid-filtering-row.component.ts b/projects/igniteui-angular/grids/core/src/filtering/base/grid-filtering-row.component.ts
@@ -611,6 +611,7 @@ export class IgxGridFilteringRowComponent implements OnInit, AfterViewInit, OnDe
     public onConditionsChanged(eventArgs) {
         const value = (eventArgs.newSelection as IgxDropDownItemComponent).value;
         this.expression.condition = this.getCondition(value);
+        this.expression.conditionName = value;
         if (this.expression.condition.isUnary) {
             // update grid's filtering on the next cycle to ensure the drop-down is closed
             // if the drop-down is not closed this event handler will be invoked multiple times
diff --git a/projects/igniteui-angular/grids/core/src/filtering/excel-style/excel-style-default-expression.component.ts b/projects/igniteui-angular/grids/core/src/filtering/excel-style/excel-style-default-expression.component.ts
@@ -133,6 +133,7 @@ export class IgxExcelStyleDefaultExpressionComponent implements AfterViewInit {
     public onConditionsChanged(eventArgs: any) {
         const value = (eventArgs.newSelection as IgxSelectComponent).value;
         this.expressionUI.expression.condition = this.getCondition(value);
+        this.expressionUI.expression.conditionName = value;
 
         this.focus();
     }
diff --git a/projects/igniteui-angular/grids/core/src/filtering/excel-style/excel-style-search.component.ts b/projects/igniteui-angular/grids/core/src/filtering/excel-style/excel-style-search.component.ts
@@ -12,7 +12,7 @@ import { IgxDataLoadingTemplateDirective, IgxEmptyListTemplateDirective, IgxList
 import { IgxButtonDirective, IgxForOfDirective } from 'igniteui-angular/directives';
 import { IgxTreeComponent, IgxTreeNodeComponent, ITreeNodeSelectionEvent } from 'igniteui-angular/tree';
 import { IgxCircularProgressBarComponent } from 'igniteui-angular/progressbar';
-import { cloneHierarchicalArray, FilteringExpressionsTree, FilteringLogic, GridColumnDataType, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, PlatformUtil, ɵSize } from 'igniteui-angular/core';
+import { cloneHierarchicalArray, columnFieldPath, FilteringExpressionsTree, FilteringLogic, GridColumnDataType, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxDateTimeFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand, IgxTimeFilteringOperand, PlatformUtil, resolveNestedPath, ɵSize } from 'igniteui-angular/core';
 import { Navigate } from 'igniteui-angular/drop-down';
 
 @Directive({
@@ -601,13 +601,15 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
                         searchVal = new Set(selectedItems.map(e => e.value.toLocaleTimeString()));
                         break;
                     case GridColumnDataType.String:
-                        if (this.esf.column.filteringIgnoreCase) {
+                        if (this.esf.column.filteringIgnoreCase && !this.isHierarchical()) {
                             const selectedValues = new Set(selectedItems.map(item => item.value.toLowerCase()));
                             searchVal = new Set();
 
                             this.esf.grid.data.forEach(item => {
-                                if (typeof item[this.esf.column.field] === "string" && selectedValues.has(item[this.esf.column.field]?.toLowerCase())) {
-                                    searchVal.add(item[this.esf.column.field]);
+                                const fieldPaths = columnFieldPath(this.esf.column.field)
+                                const itemValue = resolveNestedPath(item, fieldPaths);
+                                if (typeof itemValue === "string" && selectedValues.has(itemValue.toLowerCase())) {
+                                    searchVal.add(itemValue);
                                 }
                             });
                             break;
diff --git a/projects/igniteui-angular/grids/grid/src/grid-filtering-ui.spec.ts b/projects/igniteui-angular/grids/grid/src/grid-filtering-ui.spec.ts
@@ -132,6 +132,11 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             tick();
             fix.detectChanges();
 
+
+            let operands =
+                (grid.filteringExpressionsTree.filteringOperands[0] as IFilteringExpressionsTree)
+                    .filteringOperands as IFilteringExpression[];
+            verifyFilteringExpression(operands[0], 'ProductName', 'startsWith', 'Net');
             verifyFilterUIPosition(filterUIRow, grid);
             verifyFilterRowUI(input, close, reset, false);
             expect(grid.rowList.length).toEqual(1);
@@ -143,6 +148,10 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
             tick();
             fix.detectChanges();
 
+            operands =
+                (grid.filteringExpressionsTree.filteringOperands[0] as IFilteringExpressionsTree)
+                    .filteringOperands as IFilteringExpression[];
+            verifyFilteringExpression(operands[0], 'ProductName', 'endsWith', 'script');
             expect(grid.rowList.length).toEqual(2);
             verifyFilterRowUI(input, close, reset, false);
 
@@ -3824,6 +3833,33 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             expect(filterIcon).toBeDefined();
         }));
 
+        it('Should keep conditionName in sync when changing condition in ESF custom dialog.', fakeAsync(() => {
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'ProductName');
+
+            GridFunctions.clickExcelFilterCascadeButton(fix);
+            tick();
+            fix.detectChanges();
+
+            // Open custom dialog with 'contains' condition (index 0 in cascade menu for string column)
+            GridFunctions.clickOperatorFromCascadeMenu(fix, 0);
+            tick(100);
+
+            // set first expression's value
+            GridFunctions.setInputValueESF(fix, 0, 'Net');
+            tick(100);
+
+            // change first expression's operator from 'contains' to 'startsWith' (index 2 for string column)
+            GridFunctions.setOperatorESF(fix, 0, 2);
+            tick(100);
+
+            GridFunctions.clickApplyExcelStyleCustomFiltering(fix);
+
+            const operands =
+                (grid.filteringExpressionsTree.filteringOperands[0] as IFilteringExpressionsTree)
+                    .filteringOperands as IFilteringExpression[];
+            verifyFilteringExpression(operands[0], 'ProductName', 'startsWith', 'Net');
+        }));
+
         it('Should filter grid via custom dialog.', fakeAsync(() => {
             GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Downloads');
 
@@ -7538,6 +7574,7 @@ const verifyGridSubmenuSize = (gridNativeElement: HTMLElement, expectedSize: ɵS
 const verifyFilteringExpression = (operand: IFilteringExpression, fieldName: string, conditionName: string, searchVal: any) => {
     expect(operand.fieldName).toBe(fieldName);
     expect(operand.condition.name).toBe(conditionName);
+    expect(operand.conditionName).toBe(conditionName);
     expect(operand.searchVal).toEqual(searchVal);
 };
 
diff --git a/projects/igniteui-angular/grids/grid/src/grid.nested.props.spec.ts b/projects/igniteui-angular/grids/grid/src/grid.nested.props.spec.ts
@@ -1,4 +1,4 @@
-import { TestBed, ComponentFixture, fakeAsync, waitForAsync } from '@angular/core/testing';
+import { TestBed, ComponentFixture, fakeAsync, waitForAsync, tick } from '@angular/core/testing';
 import { IgxGridComponent } from './grid.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Component, DebugElement, ViewChild } from '@angular/core';
@@ -318,6 +318,29 @@ describe('Grid - nested data source properties #grid', () => {
 
             expect(first(copiedData).user.name.first).toMatch('Updated!');
         });
+
+        it('should correctly filter with ESF', fakeAsync(() => {
+            setupData(DATA);
+            grid.getColumnByName('user').field = 'user.name.first';
+            fixture.detectChanges();
+            grid.allowFiltering = true;
+            grid.filterMode="excelStyleFilter";
+            fixture.detectChanges();
+
+            GridFunctions.clickExcelFilterIcon(fixture, 'user.name.first');
+            fixture.detectChanges();
+            tick();
+            const excelMenu = GridFunctions.getExcelStyleFilteringComponent(fixture, 'igx-grid');
+            const checkboxes: any[] = Array.from(GridFunctions.getExcelStyleFilteringCheckboxes(fixture, excelMenu, 'igx-grid'));
+            checkboxes[1].click();
+            fixture.detectChanges();
+            tick();
+
+            GridFunctions.clickApplyExcelStyleFiltering(fixture, null, 'igx-grid');
+            fixture.detectChanges();
+            tick();
+            expect(grid.filteredSortedData.length).toBeGreaterThan(0);
+        }));
     });
 });
 
diff --git a/projects/igniteui-angular/grids/tree-grid/src/tree-grid-filtering.spec.ts b/projects/igniteui-angular/grids/tree-grid/src/tree-grid-filtering.spec.ts
@@ -770,6 +770,25 @@ describe('IgxTreeGrid - Filtering actions #tGrid', () => {
 
             expect(console.error).not.toHaveBeenCalled();
         }));
+
+        it('Should filter hierarchical data when an item is unselected.', fakeAsync(() => {
+            tGrid.filterStrategy = new TreeGridFilteringStrategy(['ID', "Name"]);
+            GridFunctions.clickExcelFilterIcon(fix, 'Name');
+            fix.detectChanges();
+            tick();
+
+            const excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix, 'igx-tree-grid');
+            const checkboxes: any[] = Array.from(GridFunctions.getExcelStyleFilteringCheckboxes(fix, excelMenu, 'igx-tree-grid'));
+            checkboxes[1].click();
+            fix.detectChanges();
+            tick();
+
+            GridFunctions.clickApplyExcelStyleFiltering(fix, null, 'igx-tree-grid');
+            fix.detectChanges();
+            tick();
+
+            expect(tGrid.filteredSortedData.length).toBeGreaterThan(0);
+        }));
     });
 
     describe('Tree grid ESF templates', () => {
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
@@ -75,7 +75,7 @@
         "igniteui-trial-watermark": "^3.1.0",
         "jspdf": "^4.0.0",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^25.0.0-beta.5",
+        "igniteui-theming": "^25.0.0",
         "igniteui-i18n-core": "^1.0.2",
         "@igniteui/material-icons-extended": "^3.1.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ export class IgxExcelStyleDefaultExpressionComponent implements AfterViewInit {`
`133`	`133`	`public onConditionsChanged(eventArgs: any) {`
`134`	`134`	`const value = (eventArgs.newSelection as IgxSelectComponent).value;`
`135`	`135`	`this.expressionUI.expression.condition = this.getCondition(value);`
	`136`	`+ this.expressionUI.expression.conditionName = value;`
`136`	`137`
`137`	`138`	`this.focus();`
`138`	`139`	`}`