@smartbit4all/ng-client 3.2.19 → 3.2.21

package/fesm2020/smartbit4all-ng-client.mjs

@@ -3856,46 +3856,52 @@ class SmartFormService {
             widget.type === SmartFormWidgetType.CHECK_BOX_2 ||
             widget.type === SmartFormWidgetType.TEXT_FIELD) {
             if (widget.selection && valueSets) {
-                let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
-                let values = valueSetData.values;
-                let displayProperty = widget.selection?.displayProperty ?? 'displayValue';
-                // check is displayProperty exists, fallback for common display properties
-                if (!this.checkProperty(values, displayProperty)) {
-                    displayProperty = 'name'; // GenericValue.name
+                let valueSet = valueSets[widget.selection.valueSetName];
+                if (!valueSet) {
+                    console.warn('valueSet not found', widget.selection.valueSetName);
+                }
+                else {
+                    let valueSetData = valueSet.valueSetData;
+                    let values = valueSetData.values;
+                    let displayProperty = widget.selection?.displayProperty ?? 'displayValue';
+                    // check is displayProperty exists, fallback for common display properties
                     if (!this.checkProperty(values, displayProperty)) {
-                        displayProperty = 'displayValue'; // Value.displayValue
+                        displayProperty = 'name'; // GenericValue.name
+                        if (!this.checkProperty(values, displayProperty)) {
+                            displayProperty = 'displayValue'; // Value.displayValue
+                        }
                     }
-                }
-                if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
-                    !widget.selection.mapping.length) {
-                    let keyProperty = valueSetData.keyProperty ?? 'objectUri';
-                    if (!this.checkProperty(values, keyProperty)) {
-                        keyProperty = 'uri'; // GenericValue.uri
+                    if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
+                        !widget.selection.mapping.length) {
+                        let keyProperty = valueSetData.keyProperty ?? 'objectUri';
                         if (!this.checkProperty(values, keyProperty)) {
-                            keyProperty = 'objectUri'; // Value.objectUri
+                            keyProperty = 'uri'; // GenericValue.uri
+                            if (!this.checkProperty(values, keyProperty)) {
+                                keyProperty = 'objectUri'; // Value.objectUri
+                            }
                         }
+                        widget.valueList = values.map((value) => {
+                            return {
+                                key: value[keyProperty],
+                                label: value[displayProperty],
+                                type: SmartFormWidgetType.ITEM,
+                                value: value[keyProperty],
+                            };
+                        });
+                        this.addEmptyItemToValueList(widget, widget.selection.emptyLabel);
+                    }
+                    else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
+                        !widget.selection.mapping.length) {
+                        widget.valueList = values.map((value, index) => {
+                            return {
+                                key: `${index}`,
+                                label: value[displayProperty],
+                                type: SmartFormWidgetType.ITEM,
+                                value: value,
+                            };
+                        });
+                        this.addEmptyItemToValueList(widget);
                     }
-                    widget.valueList = values.map((value) => {
-                        return {
-                            key: value[keyProperty],
-                            label: value[displayProperty],
-                            type: SmartFormWidgetType.ITEM,
-                            value: value[keyProperty],
-                        };
-                    });
-                    this.addEmptyItemToValueList(widget, widget.selection.emptyLabel);
-                }
-                else if (widget.selection.type === SelectionDefinition.TypeEnum.Object &&
-                    !widget.selection.mapping.length) {
-                    widget.valueList = values.map((value, index) => {
-                        return {
-                            key: `${index}`,
-                            label: value[displayProperty],
-                            type: SmartFormWidgetType.ITEM,
-                            value: value,
-                        };
-                    });
-                    this.addEmptyItemToValueList(widget);
                 }
             }
         }
@@ -4150,7 +4156,6 @@ class SmartFormService {
             regexPattern = regexPattern.replace(this.regexDoubleAsterisk, '.*'); // **
             // replace ? with a single character matcher
             regexPattern = regexPattern.replace(this.regexQuestionMark, '.');
-            console.log(pattern, regexPattern);
             // create a RegExp object
             regex = new RegExp('^' + regexPattern + '$');
             this.regexByPattern.set(pattern, regex);
@@ -5187,10 +5192,6 @@ class SmartformwidgetComponent {
     dateFilter(d) {
         return true;
     }
-    asd(opt) {
-        console.log(opt);
-        return opt;
-    }
     getMatrixDisplayValue(question, key) {
         this.widgetInstance.value[key].find((value) => {
             if (value.code == question.code)
@@ -6478,6 +6479,7 @@ class SmartformLayoutDefinitionService {
         let widget = {
             type: SmartFormWidgetType.LABEL,
             label: layoutDefinition.label,
+            widgetDescription: layoutDefinition.widgetDescription,
         };
         return widget;
     }