Merge branch 'vnext' into apetrov/update-button-sample-vnext

Author: simeonoff

src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts

@@ -37,7 +37,7 @@ export class QueryBuilderRequestSampleComponent implements OnInit, AfterViewInit
             { field: "shipperId", dataType: "number" },
             { field: "orderDate", dataType: "date" },
             { field: "requiredDate", dataType: "date" },
-            { field: "shipVia", dataType: "number" },
+            { field: "shipVia", dataType: "string" },
             { field: "freight", dataType: "number" },
             { field: "shipName", dataType: "string" },
             { field: "completed", dataType: "boolean" }
@@ -74,6 +74,12 @@ export class QueryBuilderRequestSampleComponent implements OnInit, AfterViewInit
     }
 
     private calculateColsInView() {
-        this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        if (this.expressionTree.returnFields.length === 0 || this.expressionTree.returnFields[0] === '*') {
+            const selectedEntity = this.entities.find(entity => entity.name === this.expressionTree.entity);
+            const selectedEntityFields = selectedEntity.fields.map(field => field.field);
+            this.grid.columns.forEach(column => column.hidden = !selectedEntityFields.includes(column.field));
+        } else {
+            this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        }
     }
-}
+}

src/app/interactions/query-builder/query-builder-sql-sample/query-builder-sql-sample.component.ts

@@ -199,6 +199,12 @@ export class QueryBuilderSqlSampleComponent implements OnInit, AfterViewInit {
     }
 
     private calculateColsInView() {
-        this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        if (this.expressionTree.returnFields.length === 0 || this.expressionTree.returnFields[0] === '*') {
+            const selectedEntity = this.entities.find(entity => entity.name === this.expressionTree.entity);
+            const selectedEntityFields = selectedEntity.fields.map(field => field.field);
+            this.grid.columns.forEach(column => column.hidden = !selectedEntityFields.includes(column.field));
+        } else {
+            this.grid.columns.forEach(column => column.hidden = !this.expressionTree.returnFields.includes(column.field));
+        }
     }
 }