@acorex/platform 21.0.0-beta.2 → 21.0.0-beta.4

package/fesm2022/acorex-platform-layout-builder.mjs

@@ -2,7 +2,7 @@ import * as i5 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
 import { Injectable, inject, input, model, signal, computed, effect, output, viewChild, ChangeDetectionStrategy, Component, NgModule, EventEmitter, Output } from '@angular/core';
-import { provideCommandSetups } from '@acorex/platform/runtime';
+import { provideCommandSetups, AXPCommandService } from '@acorex/platform/runtime';
 import { AXPopupService } from '@acorex/components/popup';
 import * as i4 from '@acorex/platform/core';
 import { AXPHookService, AXPExpressionEvaluatorService, AXPComponentSlotModule, AXPContextStore } from '@acorex/platform/core';
@@ -40,6 +40,15 @@ const AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY = 'layout-builder.dialog.be
  */
 const AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY = 'layout-builder.dialog.config';
 //#endregion
+//#region ---- Context updates (after open) ----
+/**
+ * Runs whenever the dialog layout builder context changes (debounced upstream), **after** the popup is visible.
+ * Use for side effects that depend on live context (for example values updated by widgets after render).
+ * Payload mirrors `AXPDialogRendererComponent` semantics: {@link AXPLayoutBuilderDialogContextChangedPayload.getContext},
+ * {@link AXPLayoutBuilderDialogContextChangedPayload.patchContext}, and optional loading state.
+ */
+const AXP_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY = 'layout-builder.dialog.context-changed';
+//#endregion
 
 class AXPLayoutConversionService {
     constructor() {
@@ -1670,7 +1679,8 @@ class DialogContainerBuilder {
         // Create dialog configuration
         const dialogConfig = {
             title: this.dialogState.dialogOptions?.title || '',
-            message: this.dialogState.dialogOptions?.message,
+            //TODO: why we need message?
+            //message: this.dialogState.dialogOptions?.message,
             context: initialContext,
             definition: dialogNode,
             metadata: this.dialogState.dialogOptions.metadata,
@@ -1684,7 +1694,7 @@ class DialogContainerBuilder {
         // The Promise resolves when user clicks an action button
         return new Promise(async (resolve) => {
             let flag = false;
-            this.popupService.open(AXPDialogRendererComponent, {
+            await this.popupService.open(AXPDialogRendererComponent, {
                 title: dialogConfig.title,
                 size: this.dialogState.dialogOptions?.size || 'md',
                 closeButton: this.dialogState.dialogOptions?.closeButton || false,
@@ -2360,6 +2370,8 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         super(...arguments);
         this.result = new EventEmitter();
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.commandService = inject(AXPCommandService);
+        this.hookService = inject(AXPHookService, { optional: true });
         this.context = signal({}, ...(ngDevMode ? [{ debugName: "context" }] : /* istanbul ignore next */ []));
         // This will be set by the popup service automatically - same as dynamic-dialog
         this.callBack = () => { };
@@ -2367,6 +2379,12 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         // Aggregated actions for footer rendering
         this.footerPrefix = signal([], ...(ngDevMode ? [{ debugName: "footerPrefix" }] : /* istanbul ignore next */ []));
         this.footerSuffix = signal([], ...(ngDevMode ? [{ debugName: "footerSuffix" }] : /* istanbul ignore next */ []));
+        /**
+         * Correlate layout context snapshots for distributed hooks (`layout-builder.dialog.context-changed`).
+         */
+        this.contextChangedHooksSessionKey = typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
+            ? crypto.randomUUID()
+            : `layout-dialog-ctx-${Date.now()}-${Math.random().toString(36).slice(2)}`;
         //#endregion
         //#region ----   View Accessors   ----
         // Access the internal layout renderer to reach the widgets container injector
@@ -2397,16 +2415,42 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
     //#region ----   Lifecycle   ----
     ngOnInit() {
         this.context.set(this.config?.context || {});
+        void this.invokeLayoutContextChangedHooks();
     }
     #eff;
     //#endregion
     handleContextChanged(event) {
         this.context.set(event);
         this.aggregateAndEvaluateActions();
+        void this.invokeLayoutContextChangedHooks();
     }
     handleContextInitiated(event) {
         this.context.set(event);
         this.aggregateAndEvaluateActions();
+        void this.invokeLayoutContextChangedHooks();
+    }
+    async invokeLayoutContextChangedHooks() {
+        const meta = this.config?.metadata;
+        if (!this.hookService) {
+            return;
+        }
+        const payload = {
+            sessionKey: this.contextChangedHooksSessionKey,
+            getContext: () => (this.context() ?? {}),
+            metadata: meta,
+            patchContext: (partial) => {
+                const merged = merge({}, this.context(), partial);
+                this.context.set(merged);
+                this.layoutRenderer()?.updateContext(merged);
+            },
+            setLoading: (loading) => this.isDialogLoading.set(loading),
+        };
+        try {
+            await this.hookService.runAsync(AXP_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY, payload);
+        }
+        catch {
+            // Hook providers are best-effort; avoid breaking the dialog lifecycle.
+        }
     }
     footerPrefixActions() {
         return this.footerPrefix();
@@ -2428,6 +2472,7 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
                 return;
             }
         }
+        //TODO: matin, why we need this? maybe we can remove it?
         if (cmd?.startsWith('widget:')) {
             const parsed = this.parseWidgetCommand(cmd);
             if (parsed.widgetName && parsed.action) {
@@ -2436,6 +2481,25 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
                 return;
             }
         }
+        if (cmd && this.commandService.exists(cmd)) {
+            const dialogRef = this.createDialogRef(cmd);
+            const integration = (this.config.metadata ?? {});
+            try {
+                const cmdResult = await this.commandService.execute(cmd, { dialogRef, integration });
+                if (!cmdResult?.success) {
+                    return;
+                }
+                if (this.shouldKeepDialogOpenAfterCommandResult(cmdResult)) {
+                    return;
+                }
+                this.callBack(cmdResult);
+                await this.closeWithOptionalSkipValidate(cmdResult);
+            }
+            catch (error) {
+                console.error('Error executing action', cmd, error);
+            }
+            return;
+        }
         const context = this.context();
         const onAction = this.config?.onAction;
         if (onAction) {
@@ -2443,7 +2507,7 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             try {
                 this.isDialogLoading.set(true);
                 const result = await Promise.resolve(onAction(dialogRef));
-                if (result && typeof result === 'object' && result.keepDialogOpen) {
+                if (this.shouldKeepDialogOpenAfterCommandResult(result)) {
                     return;
                 }
                 this.callBack(result);
@@ -2481,8 +2545,25 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         if (cmd.startsWith('widget:')) {
             return false;
         }
+        if (this.commandService.exists(cmd)) {
+            return false;
+        }
         return true;
     }
+    /** True when a footer handler or command result asks to leave the dialog open (`keepDialogOpen` on the result or `result.data`). */
+    shouldKeepDialogOpenAfterCommandResult(result) {
+        if (!result || typeof result !== 'object') {
+            return false;
+        }
+        const top = result;
+        if (top.keepDialogOpen === true) {
+            return true;
+        }
+        if (top.data != null && typeof top.data === 'object' && 'keepDialogOpen' in top.data) {
+            return top.data.keepDialogOpen === true;
+        }
+        return false;
+    }
     createDialogRef(actionCmd) {
         return {
             close: (res) => {
@@ -2672,9 +2753,9 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPDialogRendererComponent, isStandalone: true, selector: "axp-dialog-renderer", outputs: { result: "result" }, providers: [AXPContextStore], viewQueries: [{ propertyName: "layoutRenderer", first: true, predicate: AXPLayoutRendererComponent, descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
     <axp-component-slot name="dialog-header" [context]="context()"></axp-component-slot>
     <div class="p-4">
-      @if (config.message) {
+      <!-- @if (config.message) {
         <p class="mb-4 leading-relaxed">{{ config.message | translate | async }}</p>
-      }
+      } -->
       <axp-layout-renderer
         [layout]="config.definition"
         [context]="context()"
@@ -2698,8 +2779,13 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
               [color]="action.color"
               (onClick)="executeAction(action)"
             >
+              @if (isFormLoading()) {
+                <ax-loading></ax-loading>
+              }
               <ax-prefix>
-                <i class="{{ action.icon }}"></i>
+                @if (action.icon) {
+                  <ax-icon [icon]="action.icon"></ax-icon>
+                }
               </ax-prefix>
             </ax-button>
           }
@@ -2718,7 +2804,7 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
               }
               @if (action.icon) {
                 <ax-prefix>
-                  <ax-icon icon="{{ action.icon }}"></ax-icon>
+                  <ax-icon [icon]="action.icon"></ax-icon>
                 </ax-prefix>
               }
             </ax-button>
@@ -2748,9 +2834,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     template: `
     <axp-component-slot name="dialog-header" [context]="context()"></axp-component-slot>
     <div class="p-4">
-      @if (config.message) {
+      <!-- @if (config.message) {
         <p class="mb-4 leading-relaxed">{{ config.message | translate | async }}</p>
-      }
+      } -->
       <axp-layout-renderer
         [layout]="config.definition"
         [context]="context()"
@@ -2774,8 +2860,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               [color]="action.color"
               (onClick)="executeAction(action)"
             >
+              @if (isFormLoading()) {
+                <ax-loading></ax-loading>
+              }
               <ax-prefix>
-                <i class="{{ action.icon }}"></i>
+                @if (action.icon) {
+                  <ax-icon [icon]="action.icon"></ax-icon>
+                }
               </ax-prefix>
             </ax-button>
           }
@@ -2794,7 +2885,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
               }
               @if (action.icon) {
                 <ax-prefix>
-                  <ax-icon icon="{{ action.icon }}"></ax-icon>
+                  <ax-icon [icon]="action.icon"></ax-icon>
                 </ax-prefix>
               }
             </ax-button>
@@ -2999,5 +3090,5 @@ var previewWidgetField_command = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { AXPDialogRendererComponent, AXPLayoutBuilderService, AXPLayoutConversionService, AXPLayoutRendererComponent, AXPPreviewWidgetFieldCommand, AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, LayoutBuilderModule };
+export { AXPDialogRendererComponent, AXPLayoutBuilderService, AXPLayoutConversionService, AXPLayoutRendererComponent, AXPPreviewWidgetFieldCommand, AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY, AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, LayoutBuilderModule };
 //# sourceMappingURL=acorex-platform-layout-builder.mjs.map