@smartbit4all/ng-client 3.3.186 → 3.3.190

package/fesm2020/smartbit4all-ng-client.mjs

@@ -2841,7 +2841,7 @@ class SmartViewContextService {
     openView(view) {
         let alreadyOpened = this.openedViewUuids.some((uuid) => uuid === view.uuid);
         if (alreadyOpened)
-            return undefined;
+            return;
         let viewHandler = this.viewHandlers.find((handler) => handler.name === view.viewName);
         if (!viewHandler) {
             throw new Error(`SmartViewHandlerModel was not found by view name: ${view.viewName}`);
@@ -2911,10 +2911,15 @@ class SmartViewContextService {
         this.openedViewData.push(view);
         this.setUuidOfPage(view.viewName, view.uuid, viewHandler.componentName);
         this.uuidOfPageHasBeenChanged.next(view.viewName);
-        return {
-            state: ViewState.OPENED,
-            uuid: view.uuid,
-        };
+        this.updateViewContext({
+            updates: [
+                {
+                    state: ViewState.OPENED,
+                    uuid: view.uuid,
+                },
+            ],
+            uuid: this.viewContext?.uuid,
+        });
     }
     closeView(view) {
         let viewHandler = this.viewHandlers.find((handler) => handler.name === view.viewName);
@@ -2946,57 +2951,43 @@ class SmartViewContextService {
             this.openedViewData.splice(index, 1);
             this.clearUuidOfPage(view.viewName, viewHandler.componentName);
         }
-        return {
-            state: ViewState.CLOSED,
-            uuid: view.uuid,
-        };
-    }
-    updateContext(updates) {
         this.updateViewContext({
-            updates,
+            updates: [
+                {
+                    state: ViewState.CLOSED,
+                    uuid: view.uuid,
+                },
+            ],
             uuid: this.viewContext?.uuid,
         });
     }
     async restoreViews(uuid) {
-        const updates = [];
         if (!this.viewContext) {
             await this.getViewContext(uuid);
         }
-        this.viewContext.views.filter((view) => view.state === ViewState.OPENED || view.state === ViewState.TO_OPEN).map((view) => {
-            const update = this.openView(view);
-            if (update) {
-                updates.push(update);
-            }
+        this.viewContext.views.map((view) => {
+            this.openView(view);
         });
-        if (updates.length > 0) {
-            this.updateContext(updates);
-        }
     }
     syncView() {
-        const updates = [];
         this.viewContext?.views.map((view) => {
-            let update = undefined;
             switch (view.state) {
                 case ViewState.TO_OPEN:
-                    update = this.openView(view);
+                    this.openView(view);
                     break;
                 case ViewState.TO_CLOSE:
-                    update = this.closeView(view);
+                    this.closeView(view);
                     break;
             }
-            if (update) {
-                updates.push(update);
-            }
         });
         const viewDataToClose = this.openedViewData.filter((viewData) => !this.viewContext?.views
             .flatMap((viewData) => viewData.uuid)
             .includes(viewData.uuid));
         if (viewDataToClose?.length) {
             viewDataToClose.map((viewData) => {
-                updates.push(this.closeView(viewData));
+                this.closeView(viewData);
             });
         }
-        this.updateContext(updates);
         this.viewContext?.links?.map((data) => {
             const link = document.createElement('a');
             let target = '_blank'; // default
@@ -6700,7 +6691,7 @@ class Table {
     }
     customButtonClicked(event, button, element, btn, close) {
         event.stopPropagation();
-        if (btn.disabled) {
+        if (btn?.disabled) {
             return;
         }
         if (button.type === SmartTableButtonType.MENU && btn === undefined)
@@ -10238,9 +10229,7 @@ class SmartGridComponent {
     async refresh() {
         this.setupToolbar();
         // will cause this.service.gridModelChanged to fire
-        if (this.uuid) {
-            await this.service.load(this.uuid, this.smartGrid.gridIdentifier);
-        }
+        await this.service.load(this.uuid, this.smartGrid.gridIdentifier);
     }
     setupToolbar() {
         // check if toolbar is available _and_ need set up
@@ -15178,18 +15167,14 @@ class SmartFilterEditorService {
         this.reSubscribeToChange = new Subject();
     }
     async load() {
-        if (this.config.uuid) {
-            this.model = await this.service.load(this.config.uuid, this.config.identifier).toPromise();
-            this.modelChanged.next();
-        }
+        this.model = await this.service.load(this.config.uuid, this.config.identifier).toPromise();
+        this.modelChanged.next();
     }
     async peformWidgetAction(request) {
-        if (this.config.uuid) {
-            this.model = await this.service
-                .performWidgetAction(this.config.uuid, this.config.identifier, request)
-                .toPromise();
-            this.modelChanged.next();
-        }
+        this.model = await this.service
+            .performWidgetAction(this.config.uuid, this.config.identifier, request)
+            .toPromise();
+        this.modelChanged.next();
     }
     getModel() {
         return this.model;
@@ -15223,7 +15208,7 @@ class SmartComponentApiClient {
         this.renderer = renderer;
         this._destroy$ = new Subject();
         this.detectChange = new SmartSubject(this._destroy$);
-        this.componentModelLoaded = false;
+        this._ngAfterViewInitPerformed = false;
         this.uiActionModels = [];
         this.dataChanged = new SmartSubject(this._destroy$);
         // Contained Widgets
@@ -15267,29 +15252,29 @@ class SmartComponentApiClient {
             firstUuid = false;
         }
         this._uuid = uuid;
-        this.getWidgets().forEach((ref, key) => {
-            if (ref instanceof SmartGridComponent) {
-                ref.uuid = this.componentModelLoaded ? uuid : undefined;
-            }
-            else if (ref instanceof SmartFilterEditorService) {
-                ref.config.uuid = this.componentModelLoaded ? uuid : undefined;
-            }
-            else if (!ref && !firstUuid) {
-                console.error(`Provided reference for ${key} is undefined on uuid change.`);
-            }
-        });
-        if (!this.uuidOfPageHasBeenChangedSubscription) {
-            this.uuidOfPageHasBeenChangedSubscription = this.viewContext.uuidOfPageHasBeenChanged
-                .pipe(takeUntil(this._destroy$))
-                .subscribe((pageName) => {
-                if (pageName === this.pageName) {
-                    this.run();
+        if (uuid) {
+            this.getWidgets().forEach((ref, key) => {
+                if (ref instanceof SmartGridComponent) {
+                    ref.uuid = uuid;
+                }
+                else if (ref instanceof SmartFilterEditorService) {
+                    ref.config.uuid = uuid;
+                }
+                else if (!ref && !firstUuid) {
+                    console.error(`Provided reference for ${key} is undefined on uuid change.`);
                 }
             });
+            if (!this.uuidOfPageHasBeenChangedSubscription) {
+                this.uuidOfPageHasBeenChangedSubscription = this.viewContext.uuidOfPageHasBeenChanged
+                    .pipe(takeUntil(this._destroy$))
+                    .subscribe((pageName) => {
+                    if (pageName === this.pageName) {
+                        this.run();
+                    }
+                });
+            }
         }
-        if (uuid) {
-            this.viewContext.follow(this._uuid, this.detectChange);
-        }
+        this.viewContext.follow(this._uuid, this.detectChange);
     }
     get model() {
         return this._model;
@@ -15520,17 +15505,9 @@ class SmartComponentApiClient {
         }
     }
     async load() {
-        this.componentModelLoaded = false;
-        const uuid = this.viewContext.getUuidOfPage(this.pageName);
+        this.uuid = this.viewContext.getUuidOfPage(this.pageName);
         // this.model = await this.viewContext.load(this.uuid);
-        const change = await this.viewContext.load2(uuid);
-        this.componentModelLoaded = true;
-        this.uuid = uuid;
-        this.model = change.result;
-        if (this.model.widgets) {
-            // grids are already loaded in setUuid()
-            this.handleChangeWidgets(this.model.widgets, true);
-        }
+        await this.viewContext.load2(this.uuid);
     }
     async executeUiAction(uiAction, options) {
         this.uiActionService.uiActionModel = {
@@ -15773,10 +15750,6 @@ class SmartComponentApiClient {
     }
     handleChanges(change) {
         try {
-            if (!this.componentModelLoaded) {
-                // initial load
-                return;
-            }
             if (change.changedWidgets) {
                 this.handleChangeWidgets(change.changedWidgets);
             }
@@ -15820,27 +15793,21 @@ class SmartComponentApiClient {
             this.model = change.value;
         }
     }
-    handleChangeWidgets(changedWidgets, skipLoad = false) {
+    handleChangeWidgets(changedWidgets) {
         let widgets = this.getWidgets();
         changedWidgets.forEach((key) => {
             const reference = widgets.get(key);
             if (reference instanceof SmartGridComponent) {
                 this.setupGridServices(reference);
-                if (!skipLoad) {
-                    reference.refresh();
-                }
+                reference.refresh();
             }
             else if (reference instanceof SmarttreeGenericService) {
-                if (!skipLoad) {
-                    reference.initialize();
-                }
+                reference.initialize();
             }
             else if (reference instanceof SmartFilterEditorService) {
-                if (!skipLoad) {
-                    reference.load();
-                }
+                reference.load();
             }
-            else if (!skipLoad && reference === undefined) {
+            else if (reference === undefined) {
                 console.error(`Provided reference for ${key} is undefined.`);
             }
         });