@smartbit4all/ng-client 3.3.145 → 3.3.146

package/esm2020/lib/view-context/api/param.mjs

@@ -1,2 +1,2 @@
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9zbWFydC1uZy1jbGllbnQvc3JjL2xpYi92aWV3LWNvbnRleHQvYXBpL3BhcmFtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcclxuICogU3RhbmRhcmQgcGFyYW1ldGVyIHN0eWxlcyBkZWZpbmVkIGJ5IE9wZW5BUEkgc3BlY1xyXG4gKi9cclxuZXhwb3J0IHR5cGUgU3RhbmRhcmRQYXJhbVN0eWxlID1cclxuICB8ICdtYXRyaXgnXHJcbiAgfCAnbGFiZWwnXHJcbiAgfCAnZm9ybSdcclxuICB8ICdzaW1wbGUnXHJcbiAgfCAnc3BhY2VEZWxpbWl0ZWQnXHJcbiAgfCAncGlwZURlbGltaXRlZCdcclxuICB8ICdkZWVwT2JqZWN0J1xyXG4gIDtcclxuXHJcbi8qKlxyXG4gKiBUaGUgT3BlbkFQSSBzdGFuZGFyZCB7QGxpbmsgU3RhbmRhcmRQYXJhbVN0eWxlfXMgbWF5IGJlIGV4dGVuZGVkIGJ5IGN1c3RvbSBzdHlsZXMgYnkgdGhlIHVzZXIuXHJcbiAqL1xyXG5leHBvcnQgdHlwZSBQYXJhbVN0eWxlID0gU3RhbmRhcmRQYXJhbVN0eWxlIHwgc3RyaW5nO1xyXG5cclxuLyoqXHJcbiAqIFN0YW5kYXJkIHBhcmFtZXRlciBsb2NhdGlvbnMgZGVmaW5lZCBieSBPcGVuQVBJIHNwZWNcclxuICovXHJcbmV4cG9ydCB0eXBlIFBhcmFtTG9jYXRpb24gPSAncXVlcnknIHwgJ2hlYWRlcicgfCAncGF0aCcgfCAnY29va2llJztcclxuXHJcbi8qKlxyXG4gKiBTdGFuZGFyZCB0eXBlcyBhcyBkZWZpbmVkIGluIDxhIGhyZWY9XCJodHRwczovL3N3YWdnZXIuaW8vc3BlY2lmaWNhdGlvbi8jZGF0YS10eXBlc1wiPk9wZW5BUEkgU3BlY2lmaWNhdGlvbjogRGF0YSBUeXBlczwvYT5cclxuICovXHJcbmV4cG9ydCB0eXBlIFN0YW5kYXJkRGF0YVR5cGUgPVxyXG4gIHwgXCJpbnRlZ2VyXCJcclxuICB8IFwibnVtYmVyXCJcclxuICB8IFwiYm9vbGVhblwiXHJcbiAgfCBcInN0cmluZ1wiXHJcbiAgfCBcIm9iamVjdFwiXHJcbiAgfCBcImFycmF5XCJcclxuICA7XHJcblxyXG4vKipcclxuICogU3RhbmRhcmQge0BsaW5rIERhdGFUeXBlfXMgcGx1cyB5b3VyIG93biB0eXBlcy9jbGFzc2VzLlxyXG4gKi9cclxuZXhwb3J0IHR5cGUgRGF0YVR5cGUgPSBTdGFuZGFyZERhdGFUeXBlIHwgc3RyaW5nO1xyXG5cclxuLyoqXHJcbiAqIFN0YW5kYXJkIGZvcm1hdHMgYXMgZGVmaW5lZCBpbiA8YSBocmVmPVwiaHR0cHM6Ly9zd2FnZ2VyLmlvL3NwZWNpZmljYXRpb24vI2RhdGEtdHlwZXNcIj5PcGVuQVBJIFNwZWNpZmljYXRpb246IERhdGEgVHlwZXM8L2E+XHJcbiAqL1xyXG5leHBvcnQgdHlwZSBTdGFuZGFyZERhdGFGb3JtYXQgPVxyXG4gIHwgXCJpbnQzMlwiXHJcbiAgfCBcImludDY0XCJcclxuICB8IFwiZmxvYXRcIlxyXG4gIHwgXCJkb3VibGVcIlxyXG4gIHwgXCJieXRlXCJcclxuICB8IFwiYmluYXJ5XCJcclxuICB8IFwiZGF0ZVwiXHJcbiAgfCBcImRhdGUtdGltZVwiXHJcbiAgfCBcInBhc3N3b3JkXCJcclxuICA7XHJcblxyXG5leHBvcnQgdHlwZSBEYXRhRm9ybWF0ID0gU3RhbmRhcmREYXRhRm9ybWF0IHwgc3RyaW5nO1xyXG5cclxuLyoqXHJcbiAqIFRoZSBwYXJhbWV0ZXIgdG8gZW5jb2RlLlxyXG4gKi9cclxuZXhwb3J0IGludGVyZmFjZSBQYXJhbSB7XHJcbiAgbmFtZTogc3RyaW5nO1xyXG4gIHZhbHVlOiB1bmtub3duO1xyXG4gIGluOiBQYXJhbUxvY2F0aW9uO1xyXG4gIHN0eWxlOiBQYXJhbVN0eWxlLFxyXG4gIGV4cGxvZGU6IGJvb2xlYW47XHJcbiAgZGF0YVR5cGU6IERhdGFUeXBlO1xyXG4gIGRhdGFGb3JtYXQ6IERhdGFGb3JtYXQgfCB1bmRlZmluZWQ7XHJcbn1cclxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9zbWFydC1uZy1jbGllbnQvc3JjL2xpYi92aWV3LWNvbnRleHQvYXBpL3BhcmFtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIFN0YW5kYXJkIHBhcmFtZXRlciBzdHlsZXMgZGVmaW5lZCBieSBPcGVuQVBJIHNwZWNcbiAqL1xuZXhwb3J0IHR5cGUgU3RhbmRhcmRQYXJhbVN0eWxlID1cbiAgfCAnbWF0cml4J1xuICB8ICdsYWJlbCdcbiAgfCAnZm9ybSdcbiAgfCAnc2ltcGxlJ1xuICB8ICdzcGFjZURlbGltaXRlZCdcbiAgfCAncGlwZURlbGltaXRlZCdcbiAgfCAnZGVlcE9iamVjdCdcbiAgO1xuXG4vKipcbiAqIFRoZSBPcGVuQVBJIHN0YW5kYXJkIHtAbGluayBTdGFuZGFyZFBhcmFtU3R5bGV9cyBtYXkgYmUgZXh0ZW5kZWQgYnkgY3VzdG9tIHN0eWxlcyBieSB0aGUgdXNlci5cbiAqL1xuZXhwb3J0IHR5cGUgUGFyYW1TdHlsZSA9IFN0YW5kYXJkUGFyYW1TdHlsZSB8IHN0cmluZztcblxuLyoqXG4gKiBTdGFuZGFyZCBwYXJhbWV0ZXIgbG9jYXRpb25zIGRlZmluZWQgYnkgT3BlbkFQSSBzcGVjXG4gKi9cbmV4cG9ydCB0eXBlIFBhcmFtTG9jYXRpb24gPSAncXVlcnknIHwgJ2hlYWRlcicgfCAncGF0aCcgfCAnY29va2llJztcblxuLyoqXG4gKiBTdGFuZGFyZCB0eXBlcyBhcyBkZWZpbmVkIGluIDxhIGhyZWY9XCJodHRwczovL3N3YWdnZXIuaW8vc3BlY2lmaWNhdGlvbi8jZGF0YS10eXBlc1wiPk9wZW5BUEkgU3BlY2lmaWNhdGlvbjogRGF0YSBUeXBlczwvYT5cbiAqL1xuZXhwb3J0IHR5cGUgU3RhbmRhcmREYXRhVHlwZSA9XG4gIHwgXCJpbnRlZ2VyXCJcbiAgfCBcIm51bWJlclwiXG4gIHwgXCJib29sZWFuXCJcbiAgfCBcInN0cmluZ1wiXG4gIHwgXCJvYmplY3RcIlxuICB8IFwiYXJyYXlcIlxuICA7XG5cbi8qKlxuICogU3RhbmRhcmQge0BsaW5rIERhdGFUeXBlfXMgcGx1cyB5b3VyIG93biB0eXBlcy9jbGFzc2VzLlxuICovXG5leHBvcnQgdHlwZSBEYXRhVHlwZSA9IFN0YW5kYXJkRGF0YVR5cGUgfCBzdHJpbmc7XG5cbi8qKlxuICogU3RhbmRhcmQgZm9ybWF0cyBhcyBkZWZpbmVkIGluIDxhIGhyZWY9XCJodHRwczovL3N3YWdnZXIuaW8vc3BlY2lmaWNhdGlvbi8jZGF0YS10eXBlc1wiPk9wZW5BUEkgU3BlY2lmaWNhdGlvbjogRGF0YSBUeXBlczwvYT5cbiAqL1xuZXhwb3J0IHR5cGUgU3RhbmRhcmREYXRhRm9ybWF0ID1cbiAgfCBcImludDMyXCJcbiAgfCBcImludDY0XCJcbiAgfCBcImZsb2F0XCJcbiAgfCBcImRvdWJsZVwiXG4gIHwgXCJieXRlXCJcbiAgfCBcImJpbmFyeVwiXG4gIHwgXCJkYXRlXCJcbiAgfCBcImRhdGUtdGltZVwiXG4gIHwgXCJwYXNzd29yZFwiXG4gIDtcblxuZXhwb3J0IHR5cGUgRGF0YUZvcm1hdCA9IFN0YW5kYXJkRGF0YUZvcm1hdCB8IHN0cmluZztcblxuLyoqXG4gKiBUaGUgcGFyYW1ldGVyIHRvIGVuY29kZS5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBQYXJhbSB7XG4gIG5hbWU6IHN0cmluZztcbiAgdmFsdWU6IHVua25vd247XG4gIGluOiBQYXJhbUxvY2F0aW9uO1xuICBzdHlsZTogUGFyYW1TdHlsZSxcbiAgZXhwbG9kZTogYm9vbGVhbjtcbiAgZGF0YVR5cGU6IERhdGFUeXBlO1xuICBkYXRhRm9ybWF0OiBEYXRhRm9ybWF0IHwgdW5kZWZpbmVkO1xufVxuIl19

package/esm2020/lib/view-context/api/variables.mjs

@@ -6,4 +6,4 @@ export const COLLECTION_FORMATS = {
     'ssv': ' ',
     'pipes': '|'
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFyaWFibGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvc21hcnQtbmctY2xpZW50L3NyYy9saWIvdmlldy1jb250ZXh0L2FwaS92YXJpYWJsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUvQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsSUFBSSxjQUFjLENBQVMsVUFBVSxDQUFDLENBQUM7QUFDaEUsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUc7SUFDOUIsS0FBSyxFQUFFLEdBQUc7SUFDVixLQUFLLEVBQUUsS0FBSztJQUNaLEtBQUssRUFBRSxHQUFHO0lBQ1YsT0FBTyxFQUFFLEdBQUc7Q0FDZixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0aW9uVG9rZW4gfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuXHJcbmV4cG9ydCBjb25zdCBCQVNFX1BBVEggPSBuZXcgSW5qZWN0aW9uVG9rZW48c3RyaW5nPignYmFzZVBhdGgnKTtcclxuZXhwb3J0IGNvbnN0IENPTExFQ1RJT05fRk9STUFUUyA9IHtcclxuICAgICdjc3YnOiAnLCcsXHJcbiAgICAndHN2JzogJyAgICcsXHJcbiAgICAnc3N2JzogJyAnLFxyXG4gICAgJ3BpcGVzJzogJ3wnXHJcbn1cclxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFyaWFibGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvc21hcnQtbmctY2xpZW50L3NyYy9saWIvdmlldy1jb250ZXh0L2FwaS92YXJpYWJsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUvQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsSUFBSSxjQUFjLENBQVMsVUFBVSxDQUFDLENBQUM7QUFDaEUsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUc7SUFDOUIsS0FBSyxFQUFFLEdBQUc7SUFDVixLQUFLLEVBQUUsS0FBSztJQUNaLEtBQUssRUFBRSxHQUFHO0lBQ1YsT0FBTyxFQUFFLEdBQUc7Q0FDZixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0aW9uVG9rZW4gfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuZXhwb3J0IGNvbnN0IEJBU0VfUEFUSCA9IG5ldyBJbmplY3Rpb25Ub2tlbjxzdHJpbmc+KCdiYXNlUGF0aCcpO1xuZXhwb3J0IGNvbnN0IENPTExFQ1RJT05fRk9STUFUUyA9IHtcbiAgICAnY3N2JzogJywnLFxuICAgICd0c3YnOiAnICAgJyxcbiAgICAnc3N2JzogJyAnLFxuICAgICdwaXBlcyc6ICd8J1xufVxuIl19

package/fesm2015/smartbit4all-ng-client.mjs

@@ -3855,18 +3855,21 @@ class SmartFormService {
         });
         return properties;
     }
-    setValuesFromModel() {
-        var _a, _b;
+    setValuesFromModel(widgets) {
+        var _a;
         const smartForm = this.smartForm;
-        const data = (_b = (_a = this.smartForm) === null || _a === void 0 ? void 0 : _a.componentModel) === null || _b === void 0 ? void 0 : _b.data;
+        const data = (_a = smartForm.componentModel) === null || _a === void 0 ? void 0 : _a.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) {
@@ -3900,7 +3903,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) {
@@ -4155,7 +4158,7 @@ class SmartFormService {
             (constraint) => this.antPathMatcher(constraint.dataName, widget.key));
             if (widgetConstraints && widgetConstraints.length) {
                 widgetConstraints.forEach((constraint) => {
-                    var _a;
+                    var _a, _b, _c, _d;
                     if (constraint.visible === undefined) {
                         if (widget.isVisible === undefined) {
                             widget.isVisible = true;
@@ -4164,29 +4167,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 = [
-                                ...((_a = widget.validators) !== null && _a !== void 0 ? _a : []),
-                                {
-                                    validator: Validators.required,
-                                    isCustom: false,
-                                    errorMessage: '',
-                                    name: 'required',
-                                },
-                            ];
-                            this.removeEmptyItemFromValueList(widget);
-                        }
-                    }
                     if (widget.type !== SmartFormWidgetType.INDICATOR &&
                         widget.type !== SmartFormWidgetType.LABEL &&
                         widget.type !== SmartFormWidgetType.CONTAINER &&
@@ -4197,6 +4177,41 @@ class SmartFormService {
                         widget.type !== SmartFormWidgetType.BUTTON &&
                         widget.type !== SmartFormWidgetType.COMPONENT &&
                         widget.type !== SmartFormWidgetType.YOUTUBE_PLAYER) {
+                        let validators = (_a = widget.validators) !== null && _a !== void 0 ? _a : [];
+                        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
+                            (_b = widget.validators) === null || _b === void 0 ? void 0 : _b.splice(requiredIndex, 1);
+                            // add empty item
+                            let emptyLabel = '';
+                            if ('selection' in widget) {
+                                emptyLabel = (_d = (_c = widget.selection) === null || _c === void 0 ? void 0 : _c.emptyLabel) !== null && _d !== void 0 ? _d : '';
+                            }
+                            this.addEmptyItemToValueList(widget, emptyLabel);
+                        }
                         if (constraint.enabled === undefined) {
                             if (widget.isDisabled === undefined) {
                                 widget.isDisabled = false;
@@ -4242,22 +4257,28 @@ class SmartFormService {
         // test the path against the generated regex
         return regex.test(path);
     }
-    applyConstraints() {
+    applyConstraints(widgets) {
         var _a, _b, _c;
         if (((_a = this.smartForm.componentModel) === null || _a === void 0 ? void 0 : _a.constraints) &&
             ((_b = this.smartForm.componentModel) === null || _b === void 0 ? void 0 : _b.constraints.length)) {
+            if (!widgets) {
+                widgets = this.smartForm.widgets;
+            }
             this.applyComponentConstraints(this.smartForm.widgets, (_c = this.smartForm.componentModel) === null || _c === void 0 ? void 0 : _c.constraints);
         }
     }
     addEmptyItemToValueList(widget, emptyLabel) {
         var _a;
         if (widget.type == SmartFormWidgetType.SELECT) {
-            (_a = widget.valueList) === null || _a === void 0 ? void 0 : _a.unshift({
-                key: this.emptyKey,
-                label: emptyLabel !== null && emptyLabel !== void 0 ? 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) {
+                (_a = widget.valueList) === null || _a === void 0 ? void 0 : _a.unshift({
+                    key: this.emptyKey,
+                    label: emptyLabel !== null && emptyLabel !== void 0 ? emptyLabel : '',
+                    type: SmartFormWidgetType.ITEM,
+                    value: '', // this should be undefined, but FormControl cannot be null, from v14 it will
+                });
+            }
         }
     }
     removeEmptyItemFromValueList(widget) {
@@ -6096,11 +6117,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) {