@smartbit4all/ng-client 3.3.180 → 3.3.182

package/fesm2020/smartbit4all-ng-client.mjs

@@ -10229,7 +10229,9 @@ class SmartGridComponent {
     async refresh() {
         this.setupToolbar();
         // will cause this.service.gridModelChanged to fire
-        await this.service.load(this.uuid, this.smartGrid.gridIdentifier);
+        if (this.uuid) {
+            await this.service.load(this.uuid, this.smartGrid.gridIdentifier);
+        }
     }
     setupToolbar() {
         // check if toolbar is available _and_ need set up
@@ -15167,14 +15169,18 @@ class SmartFilterEditorService {
         this.reSubscribeToChange = new Subject();
     }
     async load() {
-        this.model = await this.service.load(this.config.uuid, this.config.identifier).toPromise();
-        this.modelChanged.next();
+        if (this.config.uuid) {
+            this.model = await this.service.load(this.config.uuid, this.config.identifier).toPromise();
+            this.modelChanged.next();
+        }
     }
     async peformWidgetAction(request) {
-        this.model = await this.service
-            .performWidgetAction(this.config.uuid, this.config.identifier, request)
-            .toPromise();
-        this.modelChanged.next();
+        if (this.config.uuid) {
+            this.model = await this.service
+                .performWidgetAction(this.config.uuid, this.config.identifier, request)
+                .toPromise();
+            this.modelChanged.next();
+        }
     }
     getModel() {
         return this.model;
@@ -15208,7 +15214,7 @@ class SmartComponentApiClient {
         this.renderer = renderer;
         this._destroy$ = new Subject();
         this.detectChange = new SmartSubject(this._destroy$);
-        this._ngAfterViewInitPerformed = false;
+        this.componentModelLoaded = false;
         this.uiActionModels = [];
         this.dataChanged = new SmartSubject(this._destroy$);
         // Contained Widgets
@@ -15252,29 +15258,29 @@ class SmartComponentApiClient {
             firstUuid = false;
         }
         this._uuid = uuid;
-        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.`);
+        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 (!this.uuidOfPageHasBeenChangedSubscription) {
-                this.uuidOfPageHasBeenChangedSubscription = this.viewContext.uuidOfPageHasBeenChanged
-                    .pipe(takeUntil(this._destroy$))
-                    .subscribe((pageName) => {
-                    if (pageName === this.pageName) {
-                        this.run();
-                    }
-                });
-            }
         }
-        this.viewContext.follow(this._uuid, this.detectChange);
+        if (uuid) {
+            this.viewContext.follow(this._uuid, this.detectChange);
+        }
     }
     get model() {
         return this._model;
@@ -15505,9 +15511,16 @@ class SmartComponentApiClient {
         }
     }
     async load() {
-        this.uuid = this.viewContext.getUuidOfPage(this.pageName);
+        this.componentModelLoaded = false;
+        const uuid = this.viewContext.getUuidOfPage(this.pageName);
         // this.model = await this.viewContext.load(this.uuid);
-        await this.viewContext.load2(this.uuid);
+        const change = await this.viewContext.load2(uuid);
+        this.componentModelLoaded = true;
+        this.uuid = uuid;
+        this.model = change.result;
+        if (this.model.widgets) {
+            this.handleChangeWidgets(this.model.widgets);
+        }
     }
     async executeUiAction(uiAction, options) {
         this.uiActionService.uiActionModel = {
@@ -15750,6 +15763,10 @@ class SmartComponentApiClient {
     }
     handleChanges(change) {
         try {
+            if (!this.componentModelLoaded) {
+                // initial load
+                return;
+            }
             if (change.changedWidgets) {
                 this.handleChangeWidgets(change.changedWidgets);
             }