@smartbit4all/ng-client 4.2.166 → 4.2.168

package/fesm2022/smartbit4all-ng-client.mjs

@@ -5067,7 +5067,8 @@ class SmartFormService {
                 else {
                     let valueSetData = valueSet.valueSetData;
                     let values = valueSetData.values;
-                    let displayProperty = widget.selection?.displayProperty ?? 'displayValue';
+                    let selectionDefinition = widget.selection;
+                    let displayProperty = selectionDefinition?.displayProperty ?? 'displayValue';
                     // check is displayProperty exists, fallback for common display properties
                     if (!this.checkProperty(values, displayProperty)) {
                         displayProperty = 'name'; // GenericValue.name
@@ -5077,7 +5078,7 @@ class SmartFormService {
                     }
                     if (widget.selection.type === SelectionDefinitionTypeEnum.PROPERTY &&
                         !widget.selection.mapping.length) {
-                        let keyProperty = valueSetData.keyProperty ?? 'objectUri';
+                        let keyProperty = selectionDefinition?.keyProperty ?? valueSetData?.keyProperty ?? 'objectUri';
                         if (!this.checkProperty(values, keyProperty)) {
                             keyProperty = 'uri'; // GenericValue.uri
                             if (!this.checkProperty(values, keyProperty)) {
@@ -6308,6 +6309,8 @@ class UiActionToolbarComponent {
             }
             this.scheduleActions(this.uiActionModels);
             this.uiActionModelsWithDescriptions = uiActionModelsWithDescriptions;
+            this.changeDetector.markForCheck();
+            this.changeDetector.detectChanges();
             setTimeout(() => this.checkScrollable());
         }
     }