@smartbit4all/ng-client 3.3.145 → 3.3.146

package/fesm2020/smartbit4all-ng-client.mjs

@@ -3931,17 +3931,20 @@ class SmartFormService {
         });
         return properties;
     }
-    setValuesFromModel() {
+    setValuesFromModel(widgets) {
         const smartForm = this.smartForm;
-        const data = this.smartForm?.componentModel?.data;
+        const data = smartForm.componentModel?.data;
         if (!data) {
             return;
         }
-        const keys = this.collectKeysFromSmartForm(smartForm.widgets, []);
+        if (!widgets) {
+            widgets = smartForm.widgets;
+        }
+        const keys = this.collectKeysFromSmartForm(widgets, []);
         let widget;
         for (const key of this.getPropertyNamesDeeply(data)) {
             if (keys.includes(key)) {
-                widget = this.findSmartFormWidgetByKey(smartForm.widgets, key);
+                widget = this.findSmartFormWidgetByKey(widgets, key);
                 if (widget) {
                     let value = this.getValueDeeply(data, key);
                     if (typeof value === 'boolean' && widget.type !== SmartFormWidgetType.TOGGLE) {
@@ -3975,7 +3978,7 @@ class SmartFormService {
                     // In case of CheckBox2
                     let splittedKeys = key.split('.');
                     splittedKeys.splice(splittedKeys.length - 1, 1);
-                    widget = this.findSmartFormWidgetByKey(smartForm.widgets, splittedKeys.join('.'));
+                    widget = this.findSmartFormWidgetByKey(widgets, splittedKeys.join('.'));
                     if (widget && widget.type === SmartFormWidgetType.CHECK_BOX_2) {
                         this.copyFromValueSetToValuesList(widget, smartForm.componentModel.valueSets);
                         if (widget.valueList) {
@@ -4233,29 +4236,6 @@ class SmartFormService {
                     else {
                         widget.isVisible = constraint.visible;
                     }
-                    if (constraint.mandatory !== undefined && constraint.mandatory) {
-                        if (widget.type !== SmartFormWidgetType.INDICATOR &&
-                            widget.type !== SmartFormWidgetType.LABEL &&
-                            widget.type !== SmartFormWidgetType.CONTAINER &&
-                            widget.type !== SmartFormWidgetType.IMAGE &&
-                            widget.type !== SmartFormWidgetType.SVG &&
-                            widget.type !== SmartFormWidgetType.FILE_UPLOADER &&
-                            widget.type !== SmartFormWidgetType.DIVIDER &&
-                            widget.type !== SmartFormWidgetType.BUTTON &&
-                            widget.type !== SmartFormWidgetType.COMPONENT &&
-                            widget.type !== SmartFormWidgetType.YOUTUBE_PLAYER) {
-                            widget.validators = [
-                                ...(widget.validators ?? []),
-                                {
-                                    validator: Validators.required,
-                                    isCustom: false,
-                                    errorMessage: '',
-                                    name: 'required',
-                                },
-                            ];
-                            this.removeEmptyItemFromValueList(widget);
-                        }
-                    }
                     if (widget.type !== SmartFormWidgetType.INDICATOR &&
                         widget.type !== SmartFormWidgetType.LABEL &&
                         widget.type !== SmartFormWidgetType.CONTAINER &&
@@ -4266,6 +4246,41 @@ class SmartFormService {
                         widget.type !== SmartFormWidgetType.BUTTON &&
                         widget.type !== SmartFormWidgetType.COMPONENT &&
                         widget.type !== SmartFormWidgetType.YOUTUBE_PLAYER) {
+                        let validators = widget.validators ?? [];
+                        let requiredIndex = validators.findIndex((v) => v.validator === Validators.required);
+                        let wasMandatory = requiredIndex >= 0;
+                        let tobeMandatory = false;
+                        if (constraint.mandatory === undefined) {
+                            // not specified on server, use client state
+                            tobeMandatory = wasMandatory;
+                        }
+                        else {
+                            tobeMandatory = constraint.mandatory;
+                        }
+                        if (!wasMandatory && tobeMandatory) {
+                            // add required validator
+                            widget.validators = [
+                                ...validators,
+                                {
+                                    validator: Validators.required,
+                                    isCustom: false,
+                                    errorMessage: '',
+                                    name: 'required',
+                                },
+                            ];
+                            // remove empty item
+                            this.removeEmptyItemFromValueList(widget);
+                        }
+                        if (wasMandatory && !tobeMandatory) {
+                            // remove required validator
+                            widget.validators?.splice(requiredIndex, 1);
+                            // add empty item
+                            let emptyLabel = '';
+                            if ('selection' in widget) {
+                                emptyLabel = widget.selection?.emptyLabel ?? '';
+                            }
+                            this.addEmptyItemToValueList(widget, emptyLabel);
+                        }
                         if (constraint.enabled === undefined) {
                             if (widget.isDisabled === undefined) {
                                 widget.isDisabled = false;
@@ -4311,20 +4326,26 @@ class SmartFormService {
         // test the path against the generated regex
         return regex.test(path);
     }
-    applyConstraints() {
+    applyConstraints(widgets) {
         if (this.smartForm.componentModel?.constraints &&
             this.smartForm.componentModel?.constraints.length) {
+            if (!widgets) {
+                widgets = this.smartForm.widgets;
+            }
             this.applyComponentConstraints(this.smartForm.widgets, this.smartForm.componentModel?.constraints);
         }
     }
     addEmptyItemToValueList(widget, emptyLabel) {
         if (widget.type == SmartFormWidgetType.SELECT) {
-            widget.valueList?.unshift({
-                key: this.emptyKey,
-                label: emptyLabel ?? '',
-                type: SmartFormWidgetType.ITEM,
-                value: '', // this should be undefined, but FormControl cannot be null, from v14 it will
-            });
+            const containsEmptyKey = widget.valueList.some((v) => v.key === this.emptyKey);
+            if (!containsEmptyKey) {
+                widget.valueList?.unshift({
+                    key: this.emptyKey,
+                    label: emptyLabel ?? '',
+                    type: SmartFormWidgetType.ITEM,
+                    value: '', // this should be undefined, but FormControl cannot be null, from v14 it will
+                });
+            }
         }
     }
     removeEmptyItemFromValueList(widget) {
@@ -6112,11 +6133,11 @@ class SmartformComponent {
             this.onValueChangeSubject = new SmartSubject(this._destroy$);
         }
         this.service.smartForm = this.smartForm;
-        this.service.setValuesFromModel();
-        this.service.applyConstraints();
         if (!this.originalWidgets || this.originalWidgets.length === 0) {
             this.originalWidgets = this.smartForm.widgets;
         }
+        this.service.setValuesFromModel(this.originalWidgets);
+        this.service.applyConstraints(this.originalWidgets);
         this.smartForm.widgets = this.service.filterWidgetsByVisibility(this.originalWidgets);
         this.form = this.service.toFormGroup();
         if (this.smartForm.translateService) {