feat(h-grid): revert creating fields for each child entity

igdmdimitrov · igdmdimitrov · commit 04e5711654ea · 2025-04-11T14:54:09.000+03:00
diff --git a/projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts b/projects/igniteui-angular/src/lib/data-operations/filtering-condition.ts
@@ -51,13 +51,6 @@ export class IgxFilteringOperand {
         return this.operations.filter(f => !f.hidden && !f.isNestedQuery).map((element) => element.name);
     }
     
-    /**
-     * Returns "In" and "Not In" conditions
-     */
-    public nestedConditionList(): string[] {
-        return this.operations.filter(f => !f.hidden && f.isNestedQuery).map((element) => element.name);
-    }
-
     /**
      * Returns an array of names of the conditions which are visible in the UI, including "In" and "Not In", allowing the creation of sub-queries.
      * @hidden @internal
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html
@@ -7,7 +7,7 @@
 </ng-template>
 
 <ng-template #selectFromTemplate>
-    <div class="igx-filter-tree__inputs" [style.display]="(isInEditMode() && (!this.isAdvancedFiltering() && !this.isHierarchicalGridNestedQuery())) ? 'flex' : 'none'">
+    <div class="igx-filter-tree__inputs" [style.display]="(isInEditMode() && (!this.isAdvancedFiltering() || this.isHierarchicalGridNestedQuery())) ? 'flex' : 'none'">
         <div class="igx-filter-tree__inputs-field">
             <span class="igx-query-builder__label">From</span>
             <igx-select #entitySelect
@@ -466,7 +466,7 @@
                 <ng-container>
                     <igx-query-builder-tree
                         [style.display]="expressionItem.inEditMode || expressionItem.expanded ? 'block' : 'none'"
-                        [entities]="determineEntities()"
+                        [entities]="(this.selectedEntity ? this.selectedEntity.childEntities : entities[0].childEntities) ?? entities"
                         [queryBuilder]="this.queryBuilder"
                         [parentExpression]="expressionItem"
                         [expressionTree]="expressionItem.inEditMode ? (innerQueryNewExpressionTree ?? getExpressionTreeCopy(expressionItem.expression.searchTree, true)) : expressionItem.expression.searchTree"
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts
@@ -556,7 +556,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
         this.addExpressionDropDownOverlaySettings.outlet = this.overlayOutlet;
         this.groupContextMenuDropDownOverlaySettings.outlet = this.overlayOutlet;
         
-        console.log('ngAfterViewInit', this._expressionTree);
         if (this.isAdvancedFiltering() && this.entities?.length === 1) {
             this._selectedEntity = this.entities[0];
         }
@@ -577,7 +576,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
      * @hidden @internal
      */
     public set selectedEntity(value: string) {
-        console.log('selectedEntity', value);
         this._selectedEntity = this.entities?.find(el => el.name === value);
     }
 
@@ -1379,12 +1377,9 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
             this.selectedField.filters = this.getFilters(this.selectedField);
         }
 
-        if (this.isAdvancedFiltering()) {
-            if (!this.selectedField.dataType) { // field was generated for child entity
-                return this.selectedField.filters.nestedConditionList();
-            } else {
-                return this.selectedField.filters.conditionList();
-            }
+        if ((this.isAdvancedFiltering() && !this.entities[0].childEntities) ||
+            (this.isHierarchicalGridNestedQuery() && this.selectedEntity.name && !this.selectedEntity.childEntities)) {
+            return this.selectedField.filters.conditionList();
         }
 
         return this.selectedField.filters.extendedConditionList();
@@ -1450,16 +1445,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
         }
     }
 
-    public determineEntities(): EntityType[] {
-        // TODO: FIX, not working correctly for every scenario
-
-        if (this.entities.length === 1 && this.entities[0].childEntities && this.selectedField) {
-            return this.entities[0].childEntities.filter(e => e.name === this.selectedField.field);
-        }
-
-        return (this.selectedEntity ? this.selectedEntity.childEntities : this.entities[0].childEntities) ?? this.entities;
-    }
-
     public getExpressionTreeCopy(expressionTree: IExpressionTree, shouldAssignInnerQueryExprTree?: boolean): IExpressionTree {
         if (!expressionTree) {
             return null;
@@ -1536,12 +1521,8 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
     }
 
     private selectDefaultCondition() {
-        if (this.selectedField) {
-            if (!this.selectedField.dataType) {
-                this.selectedCondition = 'inQuery';
-            } else {
-                this.selectedCondition = this.selectedField.filters.conditionList().indexOf('equals') >= 0 ? 'equals' : this.selectedField.filters.conditionList()[0];
-            }
+        if (this.selectedField && this.selectedField.filters) {
+            this.selectedCondition = this.selectedField.filters.conditionList().indexOf('equals') >= 0 ? 'equals' : this.selectedField.filters.conditionList()[0];
         }
     }
 
diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder.component.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder.component.ts
@@ -64,10 +64,6 @@ export class IgxQueryBuilderComponent implements OnDestroy {
      */
     @Input()
     public set entities(entities: EntityType[]) {
-        if (entities) {
-            this.updateEntities(entities) // add field for every child entity recursively
-        }
-
         if (entities !== this._entities) {
             if (entities && this.expressionTree) {
                 this._expressionTree = recreateTree(this._expressionTree, entities);
@@ -274,20 +270,6 @@ export class IgxQueryBuilderComponent implements OnDestroy {
         }
     }
 
-    private updateEntities(entities: EntityType[]) {
-        entities.forEach((entity) => {
-            if (entity.childEntities) {
-                entity.childEntities.forEach((childEntity) => {
-                    if (entity.fields.find((f) => f.field === childEntity.name)) {
-                        return;
-                    }
-                    entity.fields.push({ field: childEntity.name, dataType: null });
-                });
-                this.updateEntities(entity.childEntities);
-            }
-        });
-    }
-
     private registerSVGIcons(): void {
         const editorIcons = editor as any[];
 
diff --git a/src/app/hierarchical-grid-advanced-filtering/hierarchical-grid-advanced-filtering.sample.ts b/src/app/hierarchical-grid-advanced-filtering/hierarchical-grid-advanced-filtering.sample.ts
@@ -36,7 +36,7 @@ export class HierarchicalGridAdvancedFilteringSampleComponent implements AfterVi
         });
         const tree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Artists', ['*']);
         tree.filteringOperands.push({
-            fieldName: 'Albums',
+            fieldName: 'Artist',
             condition: IgxStringFilteringOperand.instance().condition('inQuery'),
             conditionName: IgxStringFilteringOperand.instance().condition('inQuery').name,
             searchTree: innerTree
diff --git a/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html b/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html
@@ -22,6 +22,7 @@
         <igx-column field="orderId"></igx-column>
         <igx-column field="customerId"></igx-column>
         <igx-column field="shipVia"></igx-column>
+        <igx-column field="freight"></igx-column>
         <igx-row-island #rowIsland2 [key]="'Details'" [primaryKey]="'orderId'" [autoGenerate]="false" (gridCreated)="gridCreated($event, rowIsland2)">
             <igx-grid-toolbar *igxGridToolbar>
                 <igx-grid-toolbar-title>Order Details</igx-grid-toolbar-title>
diff --git a/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.ts b/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.ts
@@ -6,7 +6,8 @@ import {
     IGX_HIERARCHICAL_GRID_DIRECTIVES,
     FilteringExpressionsTree,
     IgxStringFilteringOperand,
-    EntityType
+    EntityType,
+    IgxNumberFilteringOperand
 } from 'igniteui-angular';
 import { HttpClient } from '@angular/common/http';
 
@@ -45,7 +46,8 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit, AfterViewI
                         { field: 'customerId', dataType: 'string' }, // first field will be treated as foreign key
                         { field: 'orderId', dataType: 'number' },
                         { field: 'employeeId', dataType: 'number' },
-                        { field: 'shipVia', dataType: 'string' }
+                        { field: 'shipVia', dataType: 'string' },
+                        { field: 'freight', dataType: 'number' }
                     ],
                     childEntities: [
                         {
@@ -69,16 +71,18 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit, AfterViewI
     public ngOnInit() {
         const ordersTree = new FilteringExpressionsTree(0, undefined, 'Orders', ['customerId']);
         ordersTree.filteringOperands.push({
-            fieldName: 'shipVia',
+            fieldName: 'freight',
             ignoreCase: false,
-            conditionName: IgxStringFilteringOperand.instance().condition('equals').name,
-            searchVal: 'AirCargo'
+            condition: IgxNumberFilteringOperand.instance().condition('greaterThanOrEqualTo'),
+            conditionName: IgxNumberFilteringOperand.instance().condition('greaterThanOrEqualTo').name,
+            searchVal: '500'
         });
 
         const customersTree = new FilteringExpressionsTree(0, undefined, 'Customers', ['customerId', 'companyName', 'contactName', 'contactTitle']);
         customersTree.filteringOperands.push({
             fieldName: 'customerId',
-            conditionName: IgxStringFilteringOperand.instance().condition('notInQuery').name,
+            condition: IgxStringFilteringOperand.instance().condition('inQuery'),
+            conditionName: IgxStringFilteringOperand.instance().condition('inQuery').name,
             ignoreCase: false,
             searchTree: ordersTree
         });
@@ -101,6 +105,8 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit, AfterViewI
             tree = new FilteringExpressionsTree(0, undefined, this.remoteEntities[0].name, this.remoteEntities[0].fields.map(f => f.field));
         }
 
+        console.log(tree);
+
         this.hGrid.isLoading = true;
         this.http.post(`${API_ENDPOINT}/QueryBuilder/ExecuteQuery`, tree).subscribe(data =>{
             console.log('data', data);
