@smartbit4all/ng-client 3.3.159 → 3.3.160

package/fesm2020/smartbit4all-ng-client.mjs

@@ -9046,6 +9046,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                 args: ['customCardComponent', { read: ViewContainerRef }]
             }] } });
 
+/**
+ * Filter API 2
+ * Filter API 2
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Contact: info@it4all.hu
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+var FilterExpressionOrderBy;
+(function (FilterExpressionOrderBy) {
+    FilterExpressionOrderBy.OrderEnum = {
+        Asc: 'ASC',
+        Desc: 'DESC',
+    };
+})(FilterExpressionOrderBy || (FilterExpressionOrderBy = {}));
+
 /**
  * Custom HttpParameterCodec
  * Workaround for https://github.com/angular/angular/issues/18261
@@ -9735,82 +9754,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                     type: Optional
                 }] }]; } });
 
-class SmartGridService {
-    constructor(api) {
-        this.api = api;
-        this.gridModelChanged = new Subject();
-    }
-    async load(uuid, gridIdentifier) {
-        let gridModelResult = await lastValueFrom(this.api.load(uuid, gridIdentifier));
-        this.updateGrid(gridModelResult, 'load');
-    }
-    async setPage(uuid, gridIdentifier, offset, limit) {
-        await lastValueFrom(this.api.setPage(uuid, gridIdentifier, offset, limit));
-        await this.update(uuid, gridIdentifier, {
-            orderByList: this.gridModel.view?.orderByList,
-            orderedColumnNames: this.gridModel.view?.orderedColumnNames,
-            pageSize: +limit,
-        });
-    }
-    async sort(smartGrid, gridUpdateData) {
-        if (!gridUpdateData.pageSize) {
-            gridUpdateData.pageSize = this.getCurrentPageSize();
-        }
-        let gridModelResult = await this.api
-            .update(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, gridUpdateData)
-            .toPromise();
-        this.updateGrid(gridModelResult, 'sort');
-    }
-    async expand(smartGrid, rowId) {
-        return await this.api
-            .expand(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, rowId)
-            .toPromise();
-    }
-    async select(smartGrid, gridRow) {
-        gridRow.selected = !gridRow.selected;
-        return await this.api
-            .select(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, gridRow.id, gridRow.selected)
-            .toPromise();
-    }
-    async selectRows(smartGrid, selected, unselected) {
-        return await this.api
-            .selectRows(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, { selected, unselected })
-            .toPromise();
-    }
-    async selectAll(smartGrid, selected) {
-        return await this.api
-            .selectAll(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, selected)
-            .toPromise();
-    }
-    async update(uuid, identifier, updateData) {
-        if (!updateData.pageSize) {
-            updateData.pageSize = this.getCurrentPageSize();
-        }
-        let gridModelResult = await this.api.update(uuid, identifier, updateData).toPromise();
-        this.updateGrid(gridModelResult, 'update');
-    }
-    updateGrid(gridModel, method) {
-        if (gridModel) {
-            this.gridModel = gridModel;
-            this.gridModelChanged.next();
-        }
-        else {
-            console.error(`GridModel is undefined in service after ${method}!`);
-        }
-    }
-    getCurrentPageSize() {
-        if (this.paginator) {
-            return this.gridModel.pageSize;
-        }
-        return undefined;
-    }
-}
-SmartGridService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService, deps: [{ token: GridService }], target: i0.ɵɵFactoryTarget.Injectable });
-SmartGridService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService, decorators: [{
-            type: Injectable
-        }], ctorParameters: function () { return [{ type: GridService }]; } });
-
 class TableLayoutDefinerComponent {
     constructor(data, dialogRef) {
         this.data = data;
@@ -9979,24 +9922,81 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                 args: ['forms']
             }] } });
 
-/**
- * Filter API 2
- * Filter API 2
- *
- * The version of the OpenAPI document: 1.0.0
- * Contact: info@it4all.hu
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-var FilterExpressionOrderBy;
-(function (FilterExpressionOrderBy) {
-    FilterExpressionOrderBy.OrderEnum = {
-        Asc: 'ASC',
-        Desc: 'DESC',
-    };
-})(FilterExpressionOrderBy || (FilterExpressionOrderBy = {}));
+class SmartGridService {
+    constructor(api) {
+        this.api = api;
+        this.gridModelChanged = new Subject();
+    }
+    async load(uuid, gridIdentifier) {
+        let gridModelResult = await lastValueFrom(this.api.load(uuid, gridIdentifier));
+        this.updateGrid(gridModelResult, 'load');
+    }
+    async setPage(uuid, gridIdentifier, offset, limit) {
+        await lastValueFrom(this.api.setPage(uuid, gridIdentifier, offset, limit));
+        await this.update(uuid, gridIdentifier, {
+            orderByList: this.gridModel.view?.orderByList,
+            orderedColumnNames: this.gridModel.view?.orderedColumnNames,
+            pageSize: +limit,
+        });
+    }
+    async sort(smartGrid, gridUpdateData) {
+        if (!gridUpdateData.pageSize) {
+            gridUpdateData.pageSize = this.getCurrentPageSize();
+        }
+        let gridModelResult = await this.api
+            .update(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, gridUpdateData)
+            .toPromise();
+        this.updateGrid(gridModelResult, 'sort');
+    }
+    async expand(smartGrid, rowId) {
+        return await this.api
+            .expand(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, rowId)
+            .toPromise();
+    }
+    async select(smartGrid, gridRow) {
+        gridRow.selected = !gridRow.selected;
+        return await this.api
+            .select(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, gridRow.id, gridRow.selected)
+            .toPromise();
+    }
+    async selectRows(smartGrid, selected, unselected) {
+        return await this.api
+            .selectRows(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, { selected, unselected })
+            .toPromise();
+    }
+    async selectAll(smartGrid, selected) {
+        return await this.api
+            .selectAll(smartGrid.gridModel.viewUuid, smartGrid.gridIdentifier, selected)
+            .toPromise();
+    }
+    async update(uuid, identifier, updateData) {
+        if (!updateData.pageSize) {
+            updateData.pageSize = this.getCurrentPageSize();
+        }
+        let gridModelResult = await this.api.update(uuid, identifier, updateData).toPromise();
+        this.updateGrid(gridModelResult, 'update');
+    }
+    updateGrid(gridModel, method) {
+        if (gridModel) {
+            this.gridModel = gridModel;
+            this.gridModelChanged.next();
+        }
+        else {
+            console.error(`GridModel is undefined in service after ${method}!`);
+        }
+    }
+    getCurrentPageSize() {
+        if (this.paginator) {
+            return this.gridModel.pageSize;
+        }
+        return undefined;
+    }
+}
+SmartGridService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService, deps: [{ token: GridService }], target: i0.ɵɵFactoryTarget.Injectable });
+SmartGridService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartGridService, decorators: [{
+            type: Injectable
+        }], ctorParameters: function () { return [{ type: GridService }]; } });
 
 var ExpandableSectionButtonType;
 (function (ExpandableSectionButtonType) {
@@ -10553,7 +10553,6 @@ class SmartGridComponent {
         return result;
     }
     async constructHeader() {
-        let header = [];
         if (this.smartGrid.gridModel.page.rows && this.smartGrid.gridModel.page.rows.length) {
             await Promise.all(this.smartGrid.gridModel.page.rows.map(async (gridRow) => {
                 let newUiActions = gridRow.actions?.filter((uiAction) => !this.uiActionDescriptors.get(uiAction.code));
@@ -10572,70 +10571,70 @@ class SmartGridComponent {
                 }
             }));
         }
-        await Promise.all(this.smartGrid.gridModel.view.orderedColumnNames.map(async (propertyName) => {
-            let descColumn = this.smartGrid.gridModel.view.descriptor.columns.find((colDescriptor) => colDescriptor.propertyName === propertyName);
-            let customTableHeader = this.smartGrid.tableConfig?.customSmartTableHeaders?.find((header) => header.propertyName === propertyName);
-            if (descColumn) {
-                let filterExpressionOrderByItem = this.smartGrid.gridModel.view?.orderByList?.find((filterExpression) => filterExpression.propertyName === descColumn.propertyName);
-                let order;
-                let orderNumber;
-                if (filterExpressionOrderByItem) {
-                    order =
-                        filterExpressionOrderByItem.order === FilterExpressionOrderBy.OrderEnum.Asc
-                            ? SmartTableOrder.ASC
-                            : SmartTableOrder.DESC;
-                    if (this.service.gridModel.view.orderByList.length > 1) {
-                        orderNumber = this.service.gridModel.view.orderByList.findIndex((filter) => filter.propertyName === descColumn.propertyName);
-                        orderNumber++;
-                    }
+        let orederedDescColumns = this.smartGrid.gridModel.view.orderedColumnNames.map((propertyName) => this.smartGrid.gridModel.view.descriptor.columns.find((colDescriptor) => colDescriptor.propertyName === propertyName)).flatMap((f) => f ?? []);
+        let header = await Promise.all(orederedDescColumns.map(async (descColumn) => {
+            let customTableHeader = this.smartGrid.tableConfig?.customSmartTableHeaders?.find((header) => header.propertyName === descColumn.propertyName);
+            let filterExpressionOrderByItem = this.smartGrid.gridModel.view?.orderByList?.find((filterExpression) => filterExpression.propertyName === descColumn.propertyName);
+            let order;
+            let orderNumber;
+            if (filterExpressionOrderByItem) {
+                order =
+                    filterExpressionOrderByItem.order === FilterExpressionOrderBy.OrderEnum.Asc
+                        ? SmartTableOrder.ASC
+                        : SmartTableOrder.DESC;
+                if (this.service.gridModel.view.orderByList.length > 1) {
+                    orderNumber = this.service.gridModel.view.orderByList.findIndex((filter) => filter.propertyName === descColumn.propertyName);
+                    orderNumber++;
                 }
-                const orignalLabel = customTableHeader?.label ?? descColumn.label;
-                let label;
+            }
+            const orignalLabel = customTableHeader?.label ?? descColumn.label;
+            let label = '';
+            if (!descColumn.hideLabel) {
                 if (this.smartGrid.translateService) {
                     label = await this.smartGrid.translateService?.get(orignalLabel).toPromise();
                 }
                 else {
                     label = orignalLabel;
                 }
-                let properties = customTableHeader?.properties;
-                if (!properties) {
-                    if (descColumn.typeClass === 'java.time.OffsetDateTime' ||
-                        descColumn.typeClass === 'java.time.LocalDateTime') {
-                        let dateFormat = descColumn.typeFormat ?? 'yyyy.MM.dd H:mm';
-                        properties = {
-                            type: SmartTableHeaderPropertyType.DATETIME,
-                            dateFormat,
-                        };
-                    }
-                    else if (descColumn.typeClass === 'java.time.LocalDate') {
-                        let dateFormat = descColumn.typeFormat ?? 'yyyy.MM.dd';
-                        properties = {
-                            type: SmartTableHeaderPropertyType.DATE,
-                            dateFormat,
-                        };
-                    }
-                    else if (descColumn.typeClass === 'java.time.LocalTime') {
-                        let dateFormat = descColumn.typeFormat ?? 'H:mm';
-                        properties = {
-                            type: SmartTableHeaderPropertyType.TIME,
-                            dateFormat,
-                        };
-                    }
-                    else if (descColumn.typeClass === 'java.lang.Boolean') {
-                        properties = {
-                            type: SmartTableHeaderPropertyType.CHECKBOX,
-                        };
-                    }
+            }
+            let properties = customTableHeader?.properties;
+            if (!properties) {
+                if (descColumn.typeClass === 'java.time.OffsetDateTime' ||
+                    descColumn.typeClass === 'java.time.LocalDateTime') {
+                    let dateFormat = descColumn.typeFormat ?? 'yyyy.MM.dd H:mm';
+                    properties = {
+                        type: SmartTableHeaderPropertyType.DATETIME,
+                        dateFormat,
+                    };
+                }
+                else if (descColumn.typeClass === 'java.time.LocalDate') {
+                    let dateFormat = descColumn.typeFormat ?? 'yyyy.MM.dd';
+                    properties = {
+                        type: SmartTableHeaderPropertyType.DATE,
+                        dateFormat,
+                    };
+                }
+                else if (descColumn.typeClass === 'java.time.LocalTime') {
+                    let dateFormat = descColumn.typeFormat ?? 'H:mm';
+                    properties = {
+                        type: SmartTableHeaderPropertyType.TIME,
+                        dateFormat,
+                    };
+                }
+                else if (descColumn.typeClass === 'java.lang.Boolean') {
+                    properties = {
+                        type: SmartTableHeaderPropertyType.CHECKBOX,
+                    };
                 }
-                header.push({
-                    ...customTableHeader,
-                    label: label,
-                    propertyName: 'data.' + descColumn.propertyName,
-                    order,
-                    orderNumber,
-                    properties,
-                });
             }
+            return {
+                ...customTableHeader,
+                label: label,
+                propertyName: 'data.' + descColumn.propertyName,
+                order,
+                orderNumber,
+                properties,
+            };
         }));
         let complement = this.smartGrid.tableConfig?.customSmartTableHeaders?.filter((tableHeader) => !header.some((tH) => tH.propertyName.includes(tableHeader.propertyName)));
         if (complement) {
@@ -10685,6 +10684,7 @@ class SmartGridComponent {
                 });
             }
         }
+        console.log(header);
         return header;
     }
     async onChangePage(event) {