@smartbit4all/ng-client 3.2.5 → 3.2.6

package/fesm2020/smartbit4all-ng-client.mjs

@@ -73,7 +73,6 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatBadgeModule } from '@angular/material/badge';
 import * as i3$4 from '@angular/material/tabs';
 import { MatTabsModule } from '@angular/material/tabs';
-import { __decorate, __param } from 'tslib';
 
 class SmartSubject extends Subject {
     constructor(unsubscribe$) {
@@ -2592,8 +2591,10 @@ class SmartViewContextService {
         this.dialog = dialog;
         this.apiQueueService = apiQueueService;
         this.inject = inject;
-        this.tabIdName = 'viewContextUuid';
-        this.tabIdhttpHeaderName = 'viewContextUuid';
+        this.viewContextUuidName = 'viewContextUuid';
+        this.viewContextUuidHeaderName = 'viewContextUuid';
+        this.pageNamePrefix = 'page.';
+        this.componentNamePrefix = 'component.';
         this.viewHandlers = new Array();
         this.openedViewUuids = new Array();
         this.openedViewData = new Array();
@@ -2658,7 +2659,7 @@ class SmartViewContextService {
     }
     async getAndSyncViewContext(uuid) {
         if (!uuid) {
-            uuid = this.getUuidOfPage(this.tabIdName);
+            uuid = this.getViewContextUuid();
         }
         await this.getViewContext(uuid).then(() => {
             this.syncView();
@@ -2673,11 +2674,7 @@ class SmartViewContextService {
     }
     async getViewContextDataByPageName(pageName) {
         if (!this.viewContext) {
-            let viewContextUuid = sessionStorage.getItem(this.tabIdName);
-            if (!viewContextUuid) {
-                throw new Error('View context is not initialized!');
-            }
-            await this.getViewContext(viewContextUuid);
+            await this.getViewContext(this.getViewContextUuid());
         }
         let pageUuid = this.getUuidOfPage(pageName);
         let viewContextByPageName = this.viewContext?.views.find((view) => view.uuid === pageUuid);
@@ -2695,13 +2692,6 @@ class SmartViewContextService {
         this.openedViewData = [];
         this.openedViewUuids = [];
     }
-    setTabId(tabId) {
-        sessionStorage.setItem(this.tabIdName, tabId);
-        this.session.addHeaderParam({
-            headerName: this.tabIdhttpHeaderName,
-            value: tabId,
-        });
-    }
     async startViewContext() {
         this.clearSessionStorage();
         let newViewContext = await this.view
@@ -2711,7 +2701,7 @@ class SmartViewContextService {
             throw new Error('No ViewContext was created');
         }
         this.viewContext = newViewContext;
-        this.setTabId(newViewContext.uuid);
+        this.setViewContextUuid(newViewContext.uuid);
         return this.viewContext;
     }
     async initialize(uuid) {
@@ -2728,7 +2718,7 @@ class SmartViewContextService {
                     throw new Error('The messageDialogName provided by the backend has not been set.');
                 }
                 if (uuid) {
-                    this.setTabId(uuid);
+                    this.setViewContextUuid(uuid);
                     try {
                         await this.getViewContext(uuid);
                     }
@@ -2766,7 +2756,7 @@ class SmartViewContextService {
                 try {
                     this.openedViewUuids.push(view.uuid);
                     this.openedViewData.push(view);
-                    sessionStorage.setItem(view.viewName, view.uuid);
+                    this.setUuidOfPage(view.viewName, view.uuid, viewHandler.componentName);
                     dialogRef = this.dialog.openComponentAsDialog(viewHandler.component, viewHandler.name);
                 }
                 finally {
@@ -2774,9 +2764,9 @@ class SmartViewContextService {
                     if (index >= 0) {
                         this.openedViewUuids.splice(index, 1);
                         this.openedViewData.splice(index, 1);
-                        sessionStorage.removeItem(view.viewName);
+                        this.clearUuidOfPage(view.viewName, viewHandler.componentName);
                     }
-                    sessionStorage.setItem(view.viewName, view.uuid);
+                    this.setUuidOfPage(view.viewName, view.uuid, viewHandler.componentName);
                 }
                 let dialogDisableClose = true;
                 let isMessageDialog = view.viewName === this.messageDialogname;
@@ -2819,7 +2809,7 @@ class SmartViewContextService {
         view.state = ViewState.Opened;
         this.openedViewUuids.push(view.uuid);
         this.openedViewData.push(view);
-        sessionStorage.setItem(view.viewName, view.uuid);
+        this.setUuidOfPage(view.viewName, view.uuid, viewHandler.componentName);
         this.uuidOfPageHasBeenChanged.next(view.viewName);
         this.updateViewContext({
             updates: [
@@ -2859,7 +2849,7 @@ class SmartViewContextService {
         if (index >= 0) {
             this.openedViewUuids.splice(index, 1);
             this.openedViewData.splice(index, 1);
-            sessionStorage.removeItem(view.viewName);
+            this.clearUuidOfPage(view.viewName, viewHandler.componentName);
         }
         this.updateViewContext({
             updates: [
@@ -2943,13 +2933,46 @@ class SmartViewContextService {
         });
         this.viewContextHasBeenSynced.next();
     }
+    setViewContextUuid(uuid) {
+        sessionStorage.setItem(this.viewContextUuidName, uuid);
+        this.session.addHeaderParam({
+            headerName: this.viewContextUuidHeaderName,
+            value: uuid,
+        });
+    }
+    getViewContextUuid() {
+        let viewContextUuid = sessionStorage.getItem(this.viewContextUuidName);
+        if (!viewContextUuid) {
+            throw new Error('View context is not initialized!');
+        }
+        return viewContextUuid;
+    }
+    setUuidOfPage(pageName, uuid, componentName) {
+        sessionStorage.setItem(this.pageNamePrefix + pageName, uuid);
+        if (componentName) {
+            sessionStorage.setItem(this.componentNamePrefix + componentName, pageName);
+        }
+    }
+    clearUuidOfPage(pageName, componentName) {
+        sessionStorage.removeItem(this.pageNamePrefix + pageName);
+        if (componentName) {
+            sessionStorage.removeItem(this.componentNamePrefix + componentName);
+        }
+    }
     getUuidOfPage(pageName) {
-        let uuid = sessionStorage.getItem(pageName);
+        let uuid = sessionStorage.getItem(this.pageNamePrefix + pageName);
         if (!uuid) {
             throw new Error(`The uuid of ${pageName} is not available.`);
         }
         return uuid;
     }
+    getPageNameOfComponent(componentName) {
+        let pageName = sessionStorage.getItem(this.componentNamePrefix + componentName);
+        if (!pageName) {
+            throw new Error(`The pageName of ${componentName} is not available.`);
+        }
+        return pageName;
+    }
     async message(messageData, messageResult) {
         return await this.handlePerformActionResponse(await this.view
             .message(messageData.viewUuid ?? '', messageData.uuid, messageResult)
@@ -3877,11 +3900,12 @@ class SmartFormService {
     }
     toFormGroup() {
         this.createFormControls(this.smartForm.widgets);
-        // if (this.formGroup) {
-        //   this.formGroup.controls = this.group;
-        // } else {
-        // }
-        this.formGroup = new FormGroup(this.group);
+        if (this.formGroup) {
+            this.formGroup.controls = this.group;
+        }
+        else {
+            this.formGroup = new FormGroup(this.group);
+        }
         if (this.smartForm.validators && this.smartForm.validators.length) {
             this.formGroup.setValidators(this.smartForm.validators.map((validator) => {
                 return validator.validator;
@@ -3903,14 +3927,7 @@ class SmartFormService {
                 widget.type !== SmartFormWidgetType.COMPONENT &&
                 widget.type !== SmartFormWidgetType.MATRIX &&
                 widget.type !== SmartFormWidgetType.YOUTUBE_PLAYER) {
-                // let formControl = this.group[`${widget.key}`];
-                let formControl = new FormControl(widget.value || '', widget.validators?.map((validator) => {
-                    return validator.validator;
-                }));
-                if (widget.isDisabled) {
-                    formControl.disable();
-                }
-                this.group[`${widget.key}`] = formControl;
+                this.createFormControl(`${widget.key}`, widget.value, widget.isDisabled, widget.validators);
             }
             if (widget.type === SmartFormWidgetType.MATRIX) {
                 if (widget.isMultiple) {
@@ -3918,31 +3935,19 @@ class SmartFormService {
                     let itemKeys = widget.value.columns.map((value) => value.code);
                     dataKeys.forEach((key) => {
                         itemKeys.forEach((item) => {
-                            let formControl = new FormControl(widget.value.data[key][item], widget.validators?.map((validator) => {
-                                return validator.validator;
-                            }));
-                            this.group[`${widget.key}.data.${key}.${item}`] = formControl;
+                            this.createFormControl(`${widget.key}.data.${key}.${item}`, widget.value.data[key][item], undefined, // TODO really we don't pass widget.isDisabled?
+                            widget.validators);
                         });
                     });
                 }
                 else {
                     Object.keys(widget.value.data).map((key) => {
-                        let formControl = new FormControl(widget.isMultiple ? widget.value.data[key] : widget.value.data[key][0] || '', widget.validators?.map((validator) => {
-                            return validator.validator;
-                        }));
-                        if (widget.isDisabled) {
-                            formControl.disable();
-                        }
-                        this.group[`${widget.key}.${key}`] = formControl;
+                        this.createFormControl(`${widget.key}.${key}`, widget.isMultiple ? widget.value.data[key] : widget.value.data[key][0], widget.isDisabled, widget.validators);
                     });
                 }
             }
             if (widget.type === SmartFormWidgetType.ITEM && parentKey) {
-                let formControl = new FormControl(widget.value);
-                if (widget.isDisabled) {
-                    formControl.disable();
-                }
-                this.group[`${parentKey}.${widget.key}`] = formControl;
+                this.createFormControl(`${parentKey}.${widget.key}`, widget.value, widget.isDisabled, undefined);
             }
             if (widget.type === SmartFormWidgetType.CONTAINER && widget.valueList?.length) {
                 this.createFormControls(widget.valueList);
@@ -3955,6 +3960,27 @@ class SmartFormService {
     isValidatorInList(validator, list) {
         return list !== undefined && list.length > 0 && list.some((v) => v === validator);
     }
+    createFormControl(key, value, isDisabled, validators) {
+        let formControl = this.group[key];
+        if (!formControl) {
+            formControl = new FormControl();
+            this.group[key] = formControl;
+        }
+        formControl.setValue(value || '');
+        formControl.clearValidators();
+        validators?.map((validator) => {
+            formControl.addValidators(validator.validator);
+        });
+        if (isDisabled !== undefined) {
+            if (isDisabled) {
+                formControl.disable();
+            }
+            else {
+                formControl.enable();
+            }
+        }
+        return formControl;
+    }
     copyValueFromFormToWidgetBeans(widgets, group) {
         widgets.forEach((widget) => {
             if (widget.type === SmartFormWidgetType.CONTAINER && widget.valueList?.length) {
@@ -13275,38 +13301,41 @@ class SmartFilterEditorContentComponent {
             model[index] = filterExpressionField;
             if (filterExpressionField.widgetType === 'SELECT_MULTIPLE') {
                 key = index + '.expressionData.operand2.selectedValues';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
                 return;
             }
             if (filterExpressionField.expressionData?.currentOperation === 'BETWEEN') {
                 key = index + '.expressionData.operand2.valueAsString';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
                 key = index + '.expressionData.operand3.valueAsString';
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? ''));
                 return;
             }
             if (filterExpressionField.expressionData?.operand2) {
                 if (key !== index + '.expressionData.operand2.selectedValues') {
                     key = index + '.expressionData.operand2.valueAsString';
                 }
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand2?.valueAsString ?? ''));
                 return;
             }
             if (filterExpressionField?.expressionData?.operand3) {
                 if (key !== index + '.selectedValues') {
                     key = index + '.expressionData.operand3.valueAsString';
                 }
-                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues, filterExpressionField.expressionData?.operand3?.valueAsString ?? ''));
                 return;
             }
         });
-        this.simpleFilterForm = {
+        let smartForm = {
             direction: SmartFormWidgetDirection.ROW,
             componentModel: { data: model },
             useOnValueChangeEvent: true,
             useOnBlurEvent: true,
             widgets,
         };
+        if (!deepEqual(smartForm, this.simpleFilterForm)) {
+            this.simpleFilterForm = smartForm;
+        }
     }
     extractFilterFieldFromFormModel() {
         let simpleFilter = this.simpleFilterFormChildren?.first?.submitForm(false).componentModel.data;
@@ -13393,7 +13422,7 @@ class SmartFilterEditorContentComponent {
             },
         });
     }
-    constructFormWidget(key, label, widgetType, possibleValues) {
+    constructFormWidget(key, label, widgetType, possibleValues, value) {
         let type = widgetType;
         if (type === FilterExpressionFieldWidgetType.Date) {
             type = SmartFormWidgetType.DATE_PICKER;
@@ -13402,10 +13431,11 @@ class SmartFilterEditorContentComponent {
             type = SmartFormWidgetType.DATE_TIME_PICKER;
         }
         let widget = {
+            error: undefined,
             key,
             label,
             type,
-            value: '',
+            value,
             showLabel: true,
             valueList: possibleValues.map((value) => {
                 return {
@@ -14014,11 +14044,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
             type: Injectable
         }], ctorParameters: function () { return [{ type: FilterService }]; } });
 
-let SmartComponentApiClient = class SmartComponentApiClient {
-    constructor(inject, auth, pageName) {
+class SmartComponentApiClient {
+    constructor(inject, auth, pageName, componentName) {
         this.inject = inject;
         this.auth = auth;
         this.pageName = pageName;
+        this.componentName = componentName;
         this._destroy$ = new Subject();
         this.detectChange = new SmartSubject(this._destroy$);
         this.uiActionModels = [];
@@ -14027,10 +14058,24 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         this.widgets = new WidgetMap();
         this.formWidgets = new WidgetMap();
         this.useQueryLists = false;
+        // check and calculate pageName
+        if (!this.pageName && !this.componentName) {
+            throw new Error('pageName or componentName must be specified!');
+        }
+        this.viewContext = inject.get(SmartViewContextService);
+        if (this.componentName) {
+            let pageNameForComponent = this.viewContext.getPageNameOfComponent(this.componentName);
+            if (!this.pageName) {
+                this.pageName = pageNameForComponent;
+            }
+            else if (this.pageName !== pageNameForComponent) {
+                throw new Error(`pageName (${pageName}) and componentName (${componentName}) doesn't match!`);
+            }
+        }
+        // from this point we have this.pageName
         this.detectChange.subscribe((change) => {
             this.handleChanges(change);
         });
-        this.viewContext = inject.get(SmartViewContextService);
         this.uiActionService = inject.get(UiActionService);
         this.uiActionDescriptorService = inject.get(UiActionDescriptorService);
     }
@@ -14104,23 +14149,42 @@ let SmartComponentApiClient = class SmartComponentApiClient {
         if (this.useQueryLists) {
             if (!this.getSmartComponentLayoutsQL()) {
                 console.warn('SmartComponentLayoutsQL not available!');
-                return;
             }
-            // TODO maybe we should set comp.parent, not comp.smartComponentLayout.parentComponent..
-            this.getSmartComponentLayoutsQL().forEach((comp) => {
-                if (comp.smartComponentLayout) {
-                    SmartComponentLayoutUtility.setParent(comp.smartComponentLayout, this);
-                }
-            });
-            this.getSmartComponentLayoutsQL()
-                .changes.pipe(takeUntil(this._destroy$))
-                .subscribe((list) => list.forEach((comp) => {
-                if (comp.smartComponentLayout) {
-                    SmartComponentLayoutUtility.setParent(comp.smartComponentLayout, this);
-                }
-            }));
+            else {
+                this.handleQueryList(this.getSmartComponentLayoutsQL(), (comp) => {
+                    if (comp.smartComponentLayout) {
+                        // TODO maybe we should set comp.parent, not comp.smartComponentLayout.parentComponent..
+                        SmartComponentLayoutUtility.setParent(comp.smartComponentLayout, this);
+                    }
+                    if (this.uuid && this.uuid !== comp.uuid)
+                        comp.uuid = this.uuid;
+                });
+            }
+            if (!this.getSmartGridsQL()) {
+                console.warn('SmartGridsQL not available!');
+            }
+            else {
+                this.handleQueryList(this.getSmartGridsQL(), (grid) => {
+                    if (grid) {
+                        if (grid.smartGrid) {
+                            grid.smartGrid.uiActionService = this.uiActionService;
+                            grid.smartGrid.uiActionDescriptorService = this.uiActionDescriptorService;
+                            grid.smartGrid.serviceToUse = this;
+                            grid.smartGrid.viewContextService = this.viewContext;
+                        }
+                        if (this.uuid && this.uuid !== grid.uuid)
+                            grid.uuid = this.uuid;
+                    }
+                });
+            }
         }
     }
+    handleQueryList(ql, handler) {
+        ql.forEach((el) => handler(el));
+        this.getSmartComponentLayoutsQL()
+            .changes.pipe(takeUntil(this._destroy$))
+            .subscribe((list) => list.forEach((el) => handler(el)));
+    }
     getWidgets() {
         if (this.useQueryLists) {
             let widgets = new WidgetMap();
@@ -14501,10 +14565,7 @@ let SmartComponentApiClient = class SmartComponentApiClient {
     handleConstraintChange(changes, changeKey) {
         this.model.constraints = changes[changeKey];
     }
-};
-SmartComponentApiClient = __decorate([
-    __param(2, Inject('pageName'))
-], SmartComponentApiClient);
+}
 class WidgetMap {
     constructor() {
         this._widgets = new Map();