feat(h-grid): prop rename and return first field if returnFields is empty

igdmdimitrov · igdmdimitrov · commit 1266803cea0c · 2025-04-10T16:35:10.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts
@@ -200,7 +200,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
         if (this.queryBuilder?.entities) {
             return this.queryBuilder?.entities;
         } else if (this.grid.type === 'hierarchical') {
-            return (this.grid as IgxHierarchicalGridComponent).filteringEntities;
+            return (this.grid as IgxHierarchicalGridComponent).schema;
         } else {
             const entities: EntityType[] = [
                 {
diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts b/projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
@@ -3139,7 +3139,7 @@ export abstract class IgxGridBaseDirective implements GridType,
         matchCount: 0,
         content: ''
     };
-    protected _hGridFilteringEntities: EntityType[];
+    protected _hGridSchema: EntityType[];
     protected gridComputedStyles;
 
     /** @hidden @internal */
@@ -7926,8 +7926,8 @@ export abstract class IgxGridBaseDirective implements GridType,
     }
 
     private getRecreatedTree(value: IFilteringExpressionsTree): IFilteringExpressionsTree {
-        if (this._hGridFilteringEntities) {
-            return recreateTree(value, this._hGridFilteringEntities, true) as IFilteringExpressionsTree;
+        if (this._hGridSchema) {
+            return recreateTree(value, this._hGridSchema, true) as IFilteringExpressionsTree;
         } else {
             return recreateTreeFromFields(value, this._columns) as IFilteringExpressionsTree;
         }
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts
@@ -568,17 +568,17 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
      * This property is required in remote data scenarios.
      * @example
      * ```typescript
-     * const remoteEntities = this.grid.remoteEntities;
-     * this.grid.remoteEntities = [];
+     * const schema = this.grid.schema;
+     * this.grid.schema = [];
      * ```
      */
     @Input()
-    public set filteringEntities(entities: EntityType[]) {
-        this._hGridFilteringEntities = entities;
+    public set schema(entities: EntityType[]) {
+        this._hGridSchema = entities;
     }
 
-    public get filteringEntities() {
-        return this._hGridFilteringEntities;
+    public get schema() {
+        return this._hGridSchema;
     }
 
     /**
@@ -709,8 +709,8 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         this.showExpandAll = this.parentIsland ?
             this.parentIsland.showExpandAll : this.rootGrid.showExpandAll;
 
-        if (!this._hGridFilteringEntities) {
-            this._hGridFilteringEntities = this.generateFilteringEntities();
+        if (!this._hGridSchema) {
+            this._hGridSchema = this.generateSchema();
         }
 
     }
@@ -1217,7 +1217,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         });
     }
 
-    private generateFilteringEntities() {
+    private generateSchema() {
         const filterableFields = this.columns.filter((column) => !column.columnGroup && column.filterable);
         const entities: EntityType[] = [
             {
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
@@ -834,7 +834,10 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
             if (innerQuery && this.selectedField?.filters?.condition(this.selectedCondition)?.isNestedQuery) {
                 innerQuery.exitEditAddMode();
                 this._editedExpression.expression.searchTree = this.getExpressionTreeCopy(innerQuery.expressionTree);
-                this._editedExpression.expression.searchTree.returnFields = innerQuery.selectedReturnFields;
+                const returnFields = innerQuery.selectedReturnFields.length > 0 ?
+                                        innerQuery.selectedReturnFields :
+                                        [innerQuery.fields[0].field];
+                this._editedExpression.expression.searchTree.returnFields = returnFields;
             } else {
                 this._editedExpression.expression.searchTree = null;
             }
diff --git a/src/app/hierarchical-grid-advanced-filtering/hierarchical-grid-advanced-filtering.sample.html b/src/app/hierarchical-grid-advanced-filtering/hierarchical-grid-advanced-filtering.sample.html
@@ -3,10 +3,10 @@ <h4 class="sample-title">Sample One</h4>
     <igx-hierarchical-grid #hierarchicalGrid [data]="localData" [autoGenerate]="true" [allowAdvancedFiltering]="true">
         <igx-grid-toolbar></igx-grid-toolbar>
         <igx-row-island [key]="'Albums'" [autoGenerate]="true">
-            <igx-row-island [key]="'Songs'" [autoGenerate]="false">
-                <igx-column [field]="'Number'" [dataType]="'number'"></igx-column>
+            <igx-row-island [key]="'Songs'" [autoGenerate]="true">
+                <!-- <igx-column [field]="'Number'" [dataType]="'number'"></igx-column>
                 <igx-column [field]="'Title'" [dataType]="'string'"></igx-column>
-                <igx-column [field]="'Album'" [dataType]="'string'"></igx-column>
+                <igx-column [field]="'Album'" [dataType]="'string'"></igx-column> -->
             </igx-row-island>
         </igx-row-island>
         <igx-row-island [key]="'Tours'" [autoGenerate]="true">
diff --git a/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html b/src/app/hierarchical-grid-remote/hierarchical-grid-remote.sample.html
@@ -6,17 +6,15 @@
                        [height]="'800px'"
                        [width]="'100%'"
                        [allowAdvancedFiltering]="true"
-                       [filteringEntities]="remoteEntities"
+                       [schema]="remoteEntities"
                        (advancedFilteringExpressionsTreeChange)="advancedFilteringExprTreeChange()">
     <igx-grid-toolbar>
         <igx-grid-toolbar-title>Customers</igx-grid-toolbar-title>
     </igx-grid-toolbar>
-    <!-- <igx-column field="customerId"></igx-column>
-    <igx-column field="CompanyName"></igx-column>
-    <igx-column field="ContactName"></igx-column>
-    <igx-column field="ContactTitle"></igx-column>
-    <igx-column field="Country"></igx-column>
-    <igx-column field="Phone"></igx-column> -->
+        <!-- <igx-column field="customerId" [dataType]="'string'"></igx-column>
+        <igx-column field="companyName" [dataType]="'string'"></igx-column>
+        <igx-column field="contactName" [dataType]="'string'"></igx-column>
+        <igx-column field="contactTitle" [dataType]="'string'"></igx-column> -->
     <igx-row-island #rowIsland1 [key]="'Orders'" [primaryKey]="'orderId'" [autoGenerate]="false" (gridCreated)="gridCreated($event, rowIsland1)">
         <igx-grid-toolbar *igxGridToolbar>
             <igx-grid-toolbar-title>Orders</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
@@ -25,9 +25,9 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit {
     public selectionMode;
     public remoteData = [];
     public primaryKeys = [
-        { name: 'Customers', type: 'string', level: 0 },
-        { name: 'Orders', type: 'number', level: 1 },
-        { name: 'Details', type: 'number', level: 2 }
+        { name: 'Customers', key: 'customerId' },
+        { name: 'Orders', key: 'orderId' },
+        { name: 'Details', key: 'orderId' }
     ];
     public remoteEntities: EntityType[] = [
         {
@@ -42,16 +42,16 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit {
                 {
                     name: 'Orders',
                     fields: [
+                        { field: 'customerId', dataType: 'string' }, // first field will be treated as foreign key
                         { field: 'orderId', dataType: 'number' },
-                        { field: 'customerId', dataType: 'string' },
                         { field: 'employeeId', dataType: 'number' },
                         { field: 'shipVia', dataType: 'string' }
                     ],
                     childEntities: [
                         {
                             name: 'Details',
                             fields: [
-                                { field: 'orderId', dataType: 'number' },
+                                { field: 'orderId', dataType: 'number' }, // first field will be treated as foreign key
                                 { field: 'productId', dataType: 'number' },
                                 { field: 'unitPrice', dataType: 'number' },
                                 { field: 'quantity', dataType: 'number' },
@@ -132,7 +132,7 @@ export class HierarchicalGridRemoteSampleComponent implements OnInit {
     }
 
     private buildUrl(event: IGridCreatedEventArgs, rowIsland: IgxRowIslandComponent) {
-        const rowIslandKey = this.primaryKeys.find(key => key.level === rowIsland.level).name;
+        const rowIslandKey = this.primaryKeys.find(key => key.name === rowIsland.key).name;
         const parentKey = (event.grid.parent as any).key ?? event.grid.parent.advancedFilteringExpressionsTree.entity;
         const url = `${API_ENDPOINT}/${parentKey}/${event.parentID}/${rowIslandKey}`;
         return url;

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes`
`200`	`200`	`if (this.queryBuilder?.entities) {`
`201`	`201`	`return this.queryBuilder?.entities;`
`202`	`202`	`} else if (this.grid.type === 'hierarchical') {`
`203`		`- return (this.grid as IgxHierarchicalGridComponent).filteringEntities;`
	`203`	`+ return (this.grid as IgxHierarchicalGridComponent).schema;`
`204`	`204`	`} else {`
`205`	`205`	`const entities: EntityType[] = [`
`206`	`206`	`{`