@smartbit4all/ng-client 6.0.39 → 6.0.41

package/fesm2022/smartbit4all-ng-client.mjs

@@ -16533,6 +16533,7 @@ class SmartGridComponent {
         this.defaultPageSizeOptions = [5, 10, 25, 50];
         this.componentLibrary = ComponentLibrary;
         this._destroy$ = new Subject();
+        this.destroyed = false;
         this.dev = false;
         this.defaultActionToolbarId = SmartGridToolbarActionsUtil.defaultActionToolbarId;
         this.expandedRows = {};
@@ -16590,6 +16591,7 @@ class SmartGridComponent {
         }
     }
     ngOnDestroy() {
+        this.destroyed = true;
         this._destroy$.next();
         this._destroy$.complete();
     }
@@ -16597,6 +16599,11 @@ class SmartGridComponent {
         if (this.uuid && this.smartGrid) {
             this.refresh();
         }
+        else {
+            // Layout-embedded grids have no uuid of their own, but their toolbars
+            // still need their real ids as soon as the view exists.
+            this.setupToolbar();
+        }
         this.afterViewInitExecuted = true;
     }
     /**
@@ -16634,19 +16641,38 @@ class SmartGridComponent {
         return [];
     }
     setupToolbar() {
+        let idChanged = false;
         // check if toolbar is available _and_ need set up
         if (this.toolbar && this.smartGrid) {
             let toolbarId = this.smartGrid?.gridIdentifier + '_toolbar';
             if (toolbarId !== this.toolbar.id) {
                 this.toolbar.id = toolbarId;
+                idChanged = true;
             }
         }
-        if (this._headerToolbar && this.smartGrid) {
+        // the getter resolves the header toolbar for both component libraries
+        // (own ViewChild for PrimeNG, the dynamically created table's for Material)
+        const headerToolbar = this.headerToolbar;
+        if (headerToolbar && this.smartGrid) {
             let headerToolbarId = this.smartGrid?.gridIdentifier + '_headerToolbar';
-            if (headerToolbarId !== this._headerToolbar.id) {
-                this._headerToolbar.id = headerToolbarId;
+            if (headerToolbarId !== headerToolbar.id) {
+                headerToolbar.id = headerToolbarId;
+                idChanged = true;
             }
         }
+        if (idChanged) {
+            // The owning SmartComponent may have distributed the ui-actions while
+            // these toolbars still had their placeholder id — redistribute.
+            this.notifyActionsOwner();
+        }
+    }
+    /**
+     * Asks the SmartComponent owning this grid to redistribute its ui-actions.
+     * Needed whenever a toolbar id becomes real only after the actions were
+     * bucketed (layout-embedded grids, dynamically rendered Material tables).
+     */
+    notifyActionsOwner() {
+        this.smartGrid?.serviceToUse?.initActions?.();
     }
     get headerToolbar() {
         if (this.compLib === ComponentLibrary.PRIMENG) {
@@ -16718,6 +16744,16 @@ class SmartGridComponent {
             this.renderTree();
         }
         this.isBlocked = false;
+        // The Material table (and its header toolbar) is created dynamically just
+        // above — fix the toolbar ids and redistribute the ui-actions once its
+        // bindings have been checked.
+        setTimeout(() => {
+            if (this.destroyed) {
+                return;
+            }
+            this.setupToolbar();
+            this.notifyActionsOwner();
+        });
     }
     clearTable() {
         this.vcRefTable?.clear();
@@ -22454,7 +22490,7 @@ class SmartComponentLayoutComponent {
         const widgets = this.layoutService.render({
             layoutDefinitions: this.smartComponentLayout?.form,
         });
-        if (this.gridRow && !this.gridRow.valueSet) {
+        if (this.gridRow && !this.gridRow.valueSets && this.parentSmartComponent?.model) {
             this.gridRow.valueSets = this.parentSmartComponent.model.valueSets;
         }
         this.smartForm = {