@smartbit4all/ng-client 3.1.23 → 3.1.25

package/fesm2020/smartbit4all-ng-client.mjs

@@ -3799,26 +3799,41 @@ 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
+                    if (!this.checkProperty(values, displayProperty)) {
+                        displayProperty = 'displayValue'; // Value.displayValue
+                    }
+                }
                 if (widget.selection.type === SelectionDefinition.TypeEnum.Property &&
                     !widget.selection.mapping.length) {
-                    let valueSetData = valueSets[widget.selection.valueSetName].valueSetData;
-                    widget.valueList = valueSetData.values.map((value) => {
+                    let keyProperty = valueSetData.keyProperty ?? 'objectUri';
+                    if (!this.checkProperty(values, keyProperty)) {
+                        keyProperty = 'uri'; // GenericValue.uri
+                        if (!this.checkProperty(values, keyProperty)) {
+                            keyProperty = 'objectUri'; // Value.objectUri
+                        }
+                    }
+                    widget.valueList = values.map((value) => {
                         return {
-                            key: value[valueSetData.keyProperty],
-                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            key: value[keyProperty],
+                            label: value[displayProperty],
                             type: SmartFormWidgetType.ITEM,
-                            value: value[valueSetData.keyProperty],
+                            value: value[keyProperty],
                         };
                     });
                     this.addEmptyItemToValueList(widget, widget.selection.emptyLabel);
                 }
                 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) => {
+                    widget.valueList = values.map((value, index) => {
                         return {
                             key: `${index}`,
-                            label: value[widget.selection?.displayProperty ?? 'displayValue'],
+                            label: value[displayProperty],
                             type: SmartFormWidgetType.ITEM,
                             value: value,
                         };
@@ -3828,6 +3843,13 @@ class SmartFormService {
             }
         }
     }
+    checkProperty(values, property) {
+        if (!values?.length) {
+            // no sample data, assume existance
+            return true;
+        }
+        return property in values[0];
+    }
     toFormGroup() {
         this.createFormControls(this.smartForm.widgets);
         let formGroup = new FormGroup(this.group);
@@ -10693,6 +10715,9 @@ class TableLayoutDefinerComponent {
         await this.data.customComponentInputs.config.service.update(config.uuid, config.identifier, updateData);
         this.dialogRef.close();
     }
+    cancel() {
+        this.dialogRef.close();
+    }
     getUpdatedOrderedColumns() {
         let updatedKeyOrder = this.forms.map((form) => {
             return form.widgets[0].key;
@@ -10724,10 +10749,10 @@ class TableLayoutDefinerComponent {
     }
 }
 TableLayoutDefinerComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: TableLayoutDefinerComponent, deps: [{ token: MAT_DIALOG_DATA }, { token: i1$2.MatDialogRef }], target: i0.ɵɵFactoryTarget.Component });
-TableLayoutDefinerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: TableLayoutDefinerComponent, selector: "app-table-layout-definer", viewQueries: [{ propertyName: "formChildren", predicate: ["forms"], descendants: true }], ngImport: i0, template: "<div class=\"edit-columns-container\">\r\n  <div class=\"example-list\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\r\n    <div class=\"column-meta-row\" *ngFor=\"let col of forms\" cdkDrag cdkDragLockAxis=\"y\">\r\n      <smart-icon color=\"primary\" icon=\"drag_handle\"></smart-icon>\r\n      <smartform class=\"form\" #forms [smartForm]=\"col\"></smartform>\r\n      <button\r\n        *ngIf=\"isAlwaysShow(col) && (view?.orderedColumnNames)!.length > 1\"\r\n        (click)=\"removeColumn(col)\"\r\n        mat-icon-button\r\n        color=\"primary\"\r\n      >\r\n        <mat-icon>delete_outline</mat-icon>\r\n      </button>\r\n    </div>\r\n  </div>\r\n\r\n  <div appStickyMenu class=\"button-toolbar\">\r\n    <button mat-icon-button color=\"primary\" [disabled]=\"addDisabled\" (click)=\"addColumn()\">\r\n      <mat-icon>add</mat-icon>\r\n    </button>\r\n    <button mat-raised-button color=\"primary\" [disabled]=\"disableSave\" (click)=\"submit()\">\r\n      Ment\u00E9s\r\n    </button>\r\n  </div>\r\n</div>\r\n", styles: [".edit-columns-container{padding:1rem;display:flex;flex-direction:column;gap:1rem}.row{display:flex;flex-direction:row;gap:.5rem}.form{flex:1}.fields{padding:1rem 0;display:flex;flex-direction:column;gap:.5rem}.example-list{display:flex;flex-direction:column;gap:1rem;width:500px;max-width:100%;max-height:80vh;overflow:auto}.column-meta-row{display:flex;flex-direction:row;gap:1rem;justify-content:space-between;border:solid 1px #ccc;padding:1rem}.buttonsContainer{display:flex;flex-direction:row;justify-content:space-between}.cdk-drag-preview{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder{opacity:0}.cdk-drag-animating{transition:transform .25s cubic-bezier(0,0,.2,1)}.example-box:last-child{border:none}.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}h2{margin:0}.button-toolbar{display:flex;flex-direction:row;justify-content:space-between;padding:.5rem}\n"], components: [{ type: SmartIconComponent, selector: "smart-icon", inputs: ["icon", "color"] }, { type: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i1$1.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }], directives: [{ type: i2$2.CdkDropList, selector: "[cdkDropList], cdk-drop-list", inputs: ["cdkDropListConnectedTo", "cdkDropListData", "cdkDropListOrientation", "id", "cdkDropListLockAxis", "cdkDropListDisabled", "cdkDropListSortingDisabled", "cdkDropListEnterPredicate", "cdkDropListSortPredicate", "cdkDropListAutoScrollDisabled", "cdkDropListAutoScrollStep"], outputs: ["cdkDropListDropped", "cdkDropListEntered", "cdkDropListExited", "cdkDropListSorted"], exportAs: ["cdkDropList"] }, { type: i3$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i2$2.CdkDrag, selector: "[cdkDrag]", inputs: ["cdkDragData", "cdkDragLockAxis", "cdkDragRootElement", "cdkDragBoundary", "cdkDragStartDelay", "cdkDragFreeDragPosition", "cdkDragDisabled", "cdkDragConstrainPosition", "cdkDragPreviewClass", "cdkDragPreviewContainer"], outputs: ["cdkDragStarted", "cdkDragReleased", "cdkDragEnded", "cdkDragEntered", "cdkDragExited", "cdkDragDropped", "cdkDragMoved"], exportAs: ["cdkDrag"] }, { type: i3$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
+TableLayoutDefinerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: TableLayoutDefinerComponent, selector: "app-table-layout-definer", viewQueries: [{ propertyName: "formChildren", predicate: ["forms"], descendants: true }], ngImport: i0, template: "<div class=\"edit-columns-container\">\r\n  <div class=\"example-list\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\r\n    <div class=\"column-meta-row\" *ngFor=\"let col of forms\" cdkDrag cdkDragLockAxis=\"y\">\r\n      <smart-icon color=\"primary\" icon=\"drag_handle\"></smart-icon>\r\n      <smartform class=\"form\" #forms [smartForm]=\"col\"></smartform>\r\n      <button\r\n        *ngIf=\"isAlwaysShow(col) && (view?.orderedColumnNames)!.length > 1\"\r\n        (click)=\"removeColumn(col)\"\r\n        mat-icon-button\r\n        color=\"primary\"\r\n      >\r\n        <mat-icon>delete_outline</mat-icon>\r\n      </button>\r\n    </div>\r\n  </div>\r\n  <div class=\"add-btn\">\r\n    <button mat-icon-button color=\"primary\" [disabled]=\"addDisabled\" (click)=\"addColumn()\">\r\n      <mat-icon>add</mat-icon>\r\n    </button>\r\n  </div>\r\n  <div class=\"button-toolbar\">\r\n    <button mat-button color=\"primary\" (click)=\"cancel()\"> M\u00E9gsem </button>\r\n    <button mat-raised-button color=\"primary\" [disabled]=\"disableSave\" (click)=\"submit()\">\r\n      Ment\u00E9s\r\n    </button>\r\n  </div>\r\n</div>\r\n", styles: [".edit-columns-container{padding:1rem;display:flex;flex-direction:column;gap:1rem}.row{display:flex;flex-direction:row;gap:.5rem}.form{flex:1}.fields{padding:1rem 0;display:flex;flex-direction:column;gap:.5rem}.example-list{display:flex;flex-direction:column;gap:1rem;width:500px;max-width:100%;max-height:80vh;overflow:auto}.column-meta-row{display:flex;flex-direction:row;gap:1rem;justify-content:space-between;border:solid 1px #ccc;padding:1rem}.buttonsContainer{display:flex;flex-direction:row;justify-content:space-between}.cdk-drag-preview{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder{opacity:0}.cdk-drag-animating{transition:transform .25s cubic-bezier(0,0,.2,1)}.example-box:last-child{border:none}.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}h2{margin:0}.button-toolbar{display:flex;flex-direction:row;justify-content:space-between;padding:.5rem}.add-btn{display:flex;flex-direction:column;align-items:center}\n"], components: [{ type: SmartIconComponent, selector: "smart-icon", inputs: ["icon", "color"] }, { type: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i1$1.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }], directives: [{ type: i2$2.CdkDropList, selector: "[cdkDropList], cdk-drop-list", inputs: ["cdkDropListConnectedTo", "cdkDropListData", "cdkDropListOrientation", "id", "cdkDropListLockAxis", "cdkDropListDisabled", "cdkDropListSortingDisabled", "cdkDropListEnterPredicate", "cdkDropListSortPredicate", "cdkDropListAutoScrollDisabled", "cdkDropListAutoScrollStep"], outputs: ["cdkDropListDropped", "cdkDropListEntered", "cdkDropListExited", "cdkDropListSorted"], exportAs: ["cdkDropList"] }, { type: i3$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { type: i2$2.CdkDrag, selector: "[cdkDrag]", inputs: ["cdkDragData", "cdkDragLockAxis", "cdkDragRootElement", "cdkDragBoundary", "cdkDragStartDelay", "cdkDragFreeDragPosition", "cdkDragDisabled", "cdkDragConstrainPosition", "cdkDragPreviewClass", "cdkDragPreviewContainer"], outputs: ["cdkDragStarted", "cdkDragReleased", "cdkDragEnded", "cdkDragEntered", "cdkDragExited", "cdkDragDropped", "cdkDragMoved"], exportAs: ["cdkDrag"] }, { type: i3$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: TableLayoutDefinerComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'app-table-layout-definer', template: "<div class=\"edit-columns-container\">\r\n  <div class=\"example-list\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\r\n    <div class=\"column-meta-row\" *ngFor=\"let col of forms\" cdkDrag cdkDragLockAxis=\"y\">\r\n      <smart-icon color=\"primary\" icon=\"drag_handle\"></smart-icon>\r\n      <smartform class=\"form\" #forms [smartForm]=\"col\"></smartform>\r\n      <button\r\n        *ngIf=\"isAlwaysShow(col) && (view?.orderedColumnNames)!.length > 1\"\r\n        (click)=\"removeColumn(col)\"\r\n        mat-icon-button\r\n        color=\"primary\"\r\n      >\r\n        <mat-icon>delete_outline</mat-icon>\r\n      </button>\r\n    </div>\r\n  </div>\r\n\r\n  <div appStickyMenu class=\"button-toolbar\">\r\n    <button mat-icon-button color=\"primary\" [disabled]=\"addDisabled\" (click)=\"addColumn()\">\r\n      <mat-icon>add</mat-icon>\r\n    </button>\r\n    <button mat-raised-button color=\"primary\" [disabled]=\"disableSave\" (click)=\"submit()\">\r\n      Ment\u00E9s\r\n    </button>\r\n  </div>\r\n</div>\r\n", styles: [".edit-columns-container{padding:1rem;display:flex;flex-direction:column;gap:1rem}.row{display:flex;flex-direction:row;gap:.5rem}.form{flex:1}.fields{padding:1rem 0;display:flex;flex-direction:column;gap:.5rem}.example-list{display:flex;flex-direction:column;gap:1rem;width:500px;max-width:100%;max-height:80vh;overflow:auto}.column-meta-row{display:flex;flex-direction:row;gap:1rem;justify-content:space-between;border:solid 1px #ccc;padding:1rem}.buttonsContainer{display:flex;flex-direction:row;justify-content:space-between}.cdk-drag-preview{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder{opacity:0}.cdk-drag-animating{transition:transform .25s cubic-bezier(0,0,.2,1)}.example-box:last-child{border:none}.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}h2{margin:0}.button-toolbar{display:flex;flex-direction:row;justify-content:space-between;padding:.5rem}\n"] }]
+            args: [{ selector: 'app-table-layout-definer', template: "<div class=\"edit-columns-container\">\r\n  <div class=\"example-list\" cdkDropList (cdkDropListDropped)=\"drop($event)\">\r\n    <div class=\"column-meta-row\" *ngFor=\"let col of forms\" cdkDrag cdkDragLockAxis=\"y\">\r\n      <smart-icon color=\"primary\" icon=\"drag_handle\"></smart-icon>\r\n      <smartform class=\"form\" #forms [smartForm]=\"col\"></smartform>\r\n      <button\r\n        *ngIf=\"isAlwaysShow(col) && (view?.orderedColumnNames)!.length > 1\"\r\n        (click)=\"removeColumn(col)\"\r\n        mat-icon-button\r\n        color=\"primary\"\r\n      >\r\n        <mat-icon>delete_outline</mat-icon>\r\n      </button>\r\n    </div>\r\n  </div>\r\n  <div class=\"add-btn\">\r\n    <button mat-icon-button color=\"primary\" [disabled]=\"addDisabled\" (click)=\"addColumn()\">\r\n      <mat-icon>add</mat-icon>\r\n    </button>\r\n  </div>\r\n  <div class=\"button-toolbar\">\r\n    <button mat-button color=\"primary\" (click)=\"cancel()\"> M\u00E9gsem </button>\r\n    <button mat-raised-button color=\"primary\" [disabled]=\"disableSave\" (click)=\"submit()\">\r\n      Ment\u00E9s\r\n    </button>\r\n  </div>\r\n</div>\r\n", styles: [".edit-columns-container{padding:1rem;display:flex;flex-direction:column;gap:1rem}.row{display:flex;flex-direction:row;gap:.5rem}.form{flex:1}.fields{padding:1rem 0;display:flex;flex-direction:column;gap:.5rem}.example-list{display:flex;flex-direction:column;gap:1rem;width:500px;max-width:100%;max-height:80vh;overflow:auto}.column-meta-row{display:flex;flex-direction:row;gap:1rem;justify-content:space-between;border:solid 1px #ccc;padding:1rem}.buttonsContainer{display:flex;flex-direction:row;justify-content:space-between}.cdk-drag-preview{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder{opacity:0}.cdk-drag-animating{transition:transform .25s cubic-bezier(0,0,.2,1)}.example-box:last-child{border:none}.example-list.cdk-drop-list-dragging .example-box:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}h2{margin:0}.button-toolbar{display:flex;flex-direction:row;justify-content:space-between;padding:.5rem}.add-btn{display:flex;flex-direction:column;align-items:center}\n"] }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [MAT_DIALOG_DATA]