@smartbit4all/ng-client 3.0.10 → 3.0.12

package/fesm2020/smartbit4all-ng-client.mjs

@@ -3048,35 +3048,7 @@ class SmartFormService {
                             widget.showLabel = true;
                         }
                     }
-                    if (widget.type === SmartFormWidgetType.SELECT ||
-                        widget.type === SmartFormWidgetType.TEXT_FIELD) {
-                        if (widget.selection && smartForm.componentModel.valueSets) {
-                            if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
-                                !widget.selection.mapping.length) {
-                                let valueSetData = smartForm.componentModel.valueSets[widget.selection.valueSetName].valueSetData;
-                                widget.valueList = valueSetData.values.map((value) => {
-                                    return {
-                                        key: value[valueSetData.keyProperty],
-                                        label: value[widget.selection?.displayProperty ?? 'displayValue'],
-                                        type: SmartFormWidgetType.ITEM,
-                                        value: value[valueSetData.keyProperty],
-                                    };
-                                });
-                            }
-                            else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
-                                !widget.selection.mapping.length) {
-                                let valueSetData = smartForm.componentModel.valueSets[widget.selection.valueSetName].valueSetData;
-                                widget.valueList = valueSetData.values.map((value, index) => {
-                                    return {
-                                        key: `${index}`,
-                                        label: value[widget.selection?.displayProperty ?? 'displayValue'],
-                                        type: SmartFormWidgetType.ITEM,
-                                        value: value,
-                                    };
-                                });
-                            }
-                        }
-                    }
+                    this.copyFromValueSetToValuesList(widget, smartForm.componentModel.valueSets);
                     if (widget &&
                         widget.type === SmartFormWidgetType.CHECK_BOX &&
                         widget.valueList.length === 1) {
@@ -3092,17 +3064,55 @@ class SmartFormService {
                     let splittedKeys = key.split('.');
                     splittedKeys.splice(splittedKeys.length - 1, 1);
                     widget = this.findSmartFormWidgetByKey(smartForm.widgets, splittedKeys.join('.'));
-                    if (widget && widget.type === SmartFormWidgetType.CHECK_BOX_2 && widget.valueList) {
-                        widget.valueList = widget.valueList.map((item) => {
-                            let value = this.getValueDeeply(data, `${widget?.key}.${item.key}`);
-                            item.value = value;
-                            return item;
-                        });
+                    if (widget && widget.type === SmartFormWidgetType.CHECK_BOX_2) {
+                        this.copyFromValueSetToValuesList(widget, smartForm.componentModel.valueSets);
+                        if (widget.valueList) {
+                            widget.valueList = widget.valueList.map((item) => {
+                                let value = this.getValueDeeply(data, `${widget?.key}.${item.key}`);
+                                item.value = value;
+                                return item;
+                            });
+                        }
                     }
                 }
             }
         }
     }
+    copyFromValueSetToValuesList(widget, valueSets) {
+        if (widget.type === SmartFormWidgetType.SELECT ||
+            widget.type === SmartFormWidgetType.SELECT_MULTIPLE ||
+            widget.type === SmartFormWidgetType.RADIO_BUTTON ||
+            widget.type === SmartFormWidgetType.CHECK_BOX ||
+            widget.type === SmartFormWidgetType.CHECK_BOX_2 ||
+            widget.type === SmartFormWidgetType.TEXT_FIELD) {
+            if (widget.selection && valueSets) {
+                if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
+                    !widget.selection.mapping.length) {
+                    let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
+                    widget.valueList = valueSetData.values.map((value) => {
+                        return {
+                            key: value[valueSetData.keyProperty],
+                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            type: SmartFormWidgetType.ITEM,
+                            value: value[valueSetData.keyProperty],
+                        };
+                    });
+                }
+                else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
+                    !widget.selection.mapping.length) {
+                    let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
+                    widget.valueList = valueSetData.values.map((value, index) => {
+                        return {
+                            key: `${index}`,
+                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            type: SmartFormWidgetType.ITEM,
+                            value: value,
+                        };
+                    });
+                }
+            }
+        }
+    }
     toFormGroup() {
         this.createFormControls(this.smartForm.widgets);
         let formGroup = new FormGroup(this.group);
@@ -10328,12 +10338,12 @@ class SmartGridService extends SmartdialogService {
         this.gridModelChanged.next();
     }
     updateGrid(gridModel, method) {
+        this.gridModel = gridModel;
         if (gridModel) {
-            this.gridModel = gridModel;
             this.gridModelChanged.next();
         }
         else {
-            console.error(`GridModel is undefined in service after ${method}!`);
+            console.warn(`GridModel is undefined in service after ${method}!`);
         }
     }
 }
@@ -10941,7 +10951,9 @@ class SmartGridComponent {
         this.isBlocked = true;
         this.service.gridModelChanged.subscribe(() => {
             // called after every service call (load, save, refresh, etc.)
-            this.smartGrid.gridModel = this.service.gridModel;
+            if (this.service.gridModel) {
+                this.smartGrid.gridModel = this.service.gridModel;
+            }
             this.render();
         });
     }
@@ -10953,7 +10965,29 @@ class SmartGridComponent {
             this.uuid = changes['uuid'].currentValue;
         }
         if (this.afterViewInitExecuted && this.uuid && this.smartGrid) {
-            this.refresh();
+            if (changes['smartGrid']) {
+                let prev = changes['smartGrid'].previousValue;
+                let curr = changes['smartGrid'].currentValue;
+                if (!prev.pageLoaded && curr.pageLoaded) {
+                    if (!this.service.gridModel) {
+                        // page just loaded, gridModel was empty
+                        this.refresh();
+                    } // otherwise gridModel already loaded
+                }
+                else if (prev.pageLoaded && !curr.pageLoaded) {
+                    // page change in progress
+                    // TODO a bit awkard to clear service.model from here..
+                    this.service.gridModel = undefined;
+                    // TODO call render to show grid placeholder?
+                }
+                else {
+                    // something else changed in smartGrid -> refresh
+                    this.refresh();
+                }
+            }
+            else {
+                this.refresh();
+            }
         }
     }
     ngOnDestroy() {
@@ -10966,7 +11000,7 @@ class SmartGridComponent {
             this.service.gridModel = this.smartGrid.gridModel;
             this.render();
         }
-        if (this.uuid && this.smartGrid && !this.dev) {
+        else if (this.uuid && this.smartGrid && !this.service.gridModel) {
             this.refresh();
         }
         this.afterViewInitExecuted = true;
@@ -11072,15 +11106,13 @@ class SmartGridComponent {
             if (tableConfig.asyncOnExpand) {
                 tableConfig.rowExpander = this;
             }
-            const selectionMode = this.service.gridModel.view?.descriptor?.selectionMode;
+            const selectionMode = this.smartGrid.gridModel.view?.descriptor?.selectionMode;
             if (!tableConfig.selection &&
                 !tableConfig.selectionProperty &&
                 selectionMode !== GridSelectionMode.None) {
                 const isMultiple = selectionMode === GridSelectionMode.Multiple;
                 tableConfig.selectionProperty = 'id';
-                const selectedIds = this.service.gridModel.page
-                    .rows.filter((gridRow) => gridRow.selected)
-                    .map((gridRow) => gridRow.id);
+                const selectedIds = this.smartGrid.gridModel.page.rows.filter((gridRow) => gridRow.selected).map((gridRow) => gridRow.id);
                 tableConfig.selection = new SelectionModel(isMultiple, selectedIds);
             }
             this.smartTable = new SmartTable(tableConfig);
@@ -11187,8 +11219,8 @@ class SmartGridComponent {
                         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);
+                    if (this.smartGrid.gridModel.view.orderByList.length > 1) {
+                        orderNumber = this.smartGrid.gridModel.view.orderByList.findIndex((filter) => filter.propertyName === descColumn.propertyName);
                         orderNumber++;
                     }
                 }
@@ -11330,10 +11362,12 @@ class SmartGridComponent {
     }
     async onSelect(rowId) {
         this.isBlocked = true;
-        const row = this.service.gridModel.page.rows?.find((gridRow) => gridRow.id === rowId);
-        const viewContextChange = await this.service.select(this.smartGrid, row);
-        this.smartGrid.viewContextService.handleChanges(viewContextChange.changes);
-        this.refresh();
+        if (this.service.gridModel) {
+            const row = this.service.gridModel.page.rows?.find((gridRow) => gridRow.id === rowId);
+            const viewContextChange = await this.service.select(this.smartGrid, row);
+            this.smartGrid.viewContextService.handleChanges(viewContextChange.changes);
+            this.refresh();
+        }
     }
     async onSelectAll(selected) {
         this.isBlocked = true;
@@ -11352,7 +11386,7 @@ class SmartGridComponent {
                 config: {
                     uuid: this.uuid,
                     identifier: this.smartGrid.gridIdentifier,
-                    view: this.service.gridModel.view,
+                    view: this.smartGrid.gridModel.view,
                 },
             },
         };
@@ -12328,6 +12362,7 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this.dataChanged = new SmartSubject(this._destroy$);
         // Contained Widgets
         this.widgets = new WidgetMap();
+        this.smartGrids = new WidgetMap();
         this.formWidgets = new WidgetMap();
         this.detectChange.subscribe((change) => {
             this.handleChanges(change);
@@ -12348,6 +12383,10 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this._uuid = uuid;
         if (uuid) {
             this.widgets.widgets.forEach((ref, key) => {
+                let smartGrid = this.smartGrids.get(key);
+                if (smartGrid) {
+                    smartGrid.pageLoaded = false;
+                }
                 if (ref instanceof SmartGridComponent) {
                     ref.uuid = uuid;
                 }
@@ -12396,6 +12435,8 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     _ngOnDestroy() {
         this.viewContext.unfollow(this.uuid);
         this.widgets.clearWidgets();
+        this.smartGrids.clearWidgets();
+        this.formWidgets.clearWidgets();
         this._destroy$.next();
         this._destroy$.complete();
     }
@@ -12403,6 +12444,9 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this.initData();
         this.initActions();
         // TODO: layout, valueSet, widgets
+        this.smartGrids.widgets.forEach((smartGrid) => {
+            smartGrid.pageLoaded = true;
+        });
     }
     initData() {
         if (this.model?.data) {
@@ -12491,6 +12535,7 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         smartGrid.serviceToUse = this;
         smartGrid.viewContextService = this.viewContext;
         this.widgets.addWidget(smartGrid.gridIdentifier, componentReference);
+        this.smartGrids.addWidget(smartGrid.gridIdentifier, smartGrid);
         if (useAsDefaultGrid) {
             this.smartGrid = smartGrid;
             return this.smartGrid;