Merge branch 'dmdimitrov/hgrid-advanced-filtering' of https://github.com/IgniteUI/igniteui-angular into dmdimitrov/hgrid-advanced-filtering

gedinakova · gedinakova · commit fad898b4d519 · 2025-04-15T18:40:36.000+03:00
diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-strategy.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-strategy.ts
@@ -101,7 +101,7 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy  {
                     dataType = column?.dataType;
                 } else if (grid.type === 'hierarchical') {
                     const schema = (grid as IgxHierarchicalGridComponent).schema;
-                    const entityMatch = this.findEntityByName(schema, 'entity');
+                    const entityMatch = this.findEntityByName(schema, entity);
                     dataType = entityMatch?.fields.find(f => f.field === expression.fieldName)?.dataType;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {`
`101`	`101`	`dataType = column?.dataType;`
`102`	`102`	`} else if (grid.type === 'hierarchical') {`
`103`	`103`	`const schema = (grid as IgxHierarchicalGridComponent).schema;`
`104`		`- const entityMatch = this.findEntityByName(schema, 'entity');`
	`104`	`+ const entityMatch = this.findEntityByName(schema, entity);`
`105`	`105`	`dataType = entityMatch?.fields.find(f => f.field === expression.fieldName)?.dataType;`
`106`	`106`	`}`
`107`	`107`