@acorex/platform 20.8.13 → 20.8.14

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

@@ -1,14 +1,11 @@
 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, AXPCommandService } from '@acorex/platform/runtime';
+import { Injectable, inject, input, model, signal, effect, output, viewChild, ChangeDetectionStrategy, Component, NgModule, EventEmitter, Output } from '@angular/core';
 import { AXPopupService } from '@acorex/components/popup';
-import * as i4 from '@acorex/platform/core';
-import { AXPHookService, AXPExpressionEvaluatorService, AXPComponentSlotModule, AXPContextStore } from '@acorex/platform/core';
 import * as i1 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetSerializationHelper, AXPWidgetContainerComponent, AXPPageStatus, AXPWidgetCoreModule, AXPWidgetRegistryService } from '@acorex/platform/layout/widget-core';
-import { cloneDeep, isNil, set, isEqual, merge } from 'lodash-es';
+import { AXPWidgetSerializationHelper, AXPWidgetContainerComponent, AXPPageStatus, AXPWidgetCoreModule } from '@acorex/platform/layout/widget-core';
+import { cloneDeep, isNil, set, isEqual } from 'lodash-es';
 import * as i2 from '@acorex/components/form';
 import { AXFormComponent, AXFormModule } from '@acorex/components/form';
 import { Subject, debounceTime, distinctUntilChanged, startWith } from 'rxjs';
@@ -20,35 +17,9 @@ import * as i3 from '@acorex/components/loading';
 import { AXLoadingModule } from '@acorex/components/loading';
 import { AXBasePageComponent } from '@acorex/components/page';
 import * as i6 from '@acorex/core/translation';
-import { AXTranslationModule, AXTranslationService } from '@acorex/core/translation';
-import { AXP_ENTITY_DEFINITION_CRUD_SERVICE } from '@acorex/platform/domain';
-
-//#region ---- Imports ----
-//#endregion
-//#region ---- Before open ----
-/**
- * Runs after dialog options and context are prepared and **before** footer customization and popup open.
- * Listeners may mutate {@link AXPLayoutBuilderDialogBeforeOpenPayload.context} by reference.
- */
-const AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY = 'layout-builder.dialog.before-open';
-//#endregion
-//#region ---- Footer actions ----
-/**
- * Runs after builder-defined footer actions exist and **before** the dialog opens.
- * Listeners receive the live `actions.footer.prefix` / `suffix` arrays (same references as the dialog)
- * so they may push, splice, filter, or replace items. They may also mutate {@link AXPLayoutBuilderDialogFooterPayload.context} by reference.
- */
-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
+import { AXTranslationModule } from '@acorex/core/translation';
+import * as i4 from '@acorex/platform/core';
+import { AXPExpressionEvaluatorService, AXPComponentSlotModule } from '@acorex/platform/core';
 
 class AXPLayoutConversionService {
     constructor() {
@@ -188,10 +159,6 @@ class AXPLayoutConversionService {
         if (!editorWidget.mode) {
             editorWidget.mode = fieldMode;
         }
-        const hintOpts = field.description != null &&
-            (typeof field.description !== 'string' || field.description.trim().length > 0)
-            ? { hint: field.description, hintDisplayMode: 'note' }
-            : {};
         return {
             type: 'form-field',
             name: field.path,
@@ -199,8 +166,8 @@ class AXPLayoutConversionService {
             options: {
                 label: field.title,
                 badge: field.badge,
+                description: field.description,
                 showLabel: true,
-                ...hintOpts,
             },
             children: [editorWidget], // The editor widget becomes a child of form-field
         };
@@ -243,7 +210,7 @@ class AXPLayoutConversionService {
             path: formFieldNode.name || editorWidget.name || `field-${Date.now()}`,
             title: formFieldNode.options?.['label'],
             badge: formFieldNode.options?.['badge'],
-            description: formFieldNode.options?.['hint'],
+            description: formFieldNode.options?.['description'],
             widget: editorWidget,
             mode: formFieldNode.mode,
         };
@@ -256,16 +223,9 @@ class AXPLayoutConversionService {
         const keyParts = [];
         keyParts.push(`groups:${formDefinition.groups.length}`);
         formDefinition.groups.forEach((group, groupIndex) => {
-            // Include group.mode so view vs edit (or mixed) layouts do not share a cached widget tree.
-            const groupModePart = group.mode ?? '_';
-            keyParts.push(`g${groupIndex}:${group.name}:${group.parameters.length}:${groupModePart}`);
-            keyParts.push(`gL${groupIndex}:${JSON.stringify(group.title ?? null)}:${JSON.stringify(group.description ?? null)}`);
+            keyParts.push(`g${groupIndex}:${group.name}:${group.parameters.length}`);
             group.parameters.forEach((param, paramIndex) => {
-                // Field mode must be part of the key; otherwise metadata forms that only differ by
-                // view/edit (same paths and widget types) incorrectly reuse the first cached tree.
-                const fieldModePart = param.mode ?? '_';
-                keyParts.push(`p${groupIndex}.${paramIndex}:${param.path}:${param.widget.type}:${fieldModePart}`);
-                keyParts.push(`pL${groupIndex}.${paramIndex}:${JSON.stringify(param.title ?? null)}:${JSON.stringify(param.description ?? null)}:${JSON.stringify(param.badge ?? null)}`);
+                keyParts.push(`p${groupIndex}.${paramIndex}:${param.path}:${param.widget.type}`);
             });
         });
         if (formDefinition.mode) {
@@ -326,10 +286,10 @@ class AXPLayoutConversionService {
         }
         return Math.abs(hash).toString(36); // Convert to base36 for shorter string
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutConversionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutConversionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutConversionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutConversionService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutConversionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutConversionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -439,18 +399,17 @@ function getNestedValue(obj, path) {
 class AXPLayoutBuilderService {
     constructor() {
         this.popupService = inject(AXPopupService);
-        this.hookService = inject(AXPHookService, { optional: true }) ?? undefined;
     }
     /**
      * Create a new layout builder
      */
     create() {
-        return new LayoutBuilder(this.popupService, this.hookService);
+        return new LayoutBuilder(this.popupService);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBuilderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBuilderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutBuilderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutBuilderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBuilderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutBuilderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -463,9 +422,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  * Open/Closed: Extensible through container delegates
  */
 class LayoutBuilder {
-    constructor(popupService, hookService) {
+    constructor(popupService) {
         this.popupService = popupService;
-        this.hookService = hookService;
         this.root = {
             children: [],
             mode: 'edit',
@@ -535,7 +493,7 @@ class LayoutBuilder {
         if (!this.popupService) {
             throw new Error('LayoutBuilder requires AXPopupService to create dialogs. Please inject it in the service constructor.');
         }
-        const container = new DialogContainerBuilder(this.popupService, this.hookService);
+        const container = new DialogContainerBuilder(this.popupService);
         if (delegate) {
             delegate(container);
         }
@@ -560,21 +518,11 @@ class LayoutBuilder {
         return this;
     }
     build() {
-        const r = this.root;
-        const node = {
-            type: r.type,
-            ...(r.mode !== undefined ? { mode: r.mode } : {}),
-            ...(r.children !== undefined ? { children: r.children } : {}),
-            ...(r.options !== undefined ? { options: r.options } : {}),
-            ...(r.name !== undefined ? { name: r.name } : {}),
-            ...(r.path !== undefined ? { path: r.path } : {}),
-            ...(r.visible !== undefined ? { visible: r.visible } : {}),
-            ...(r.defaultValue !== undefined ? { defaultValue: r.defaultValue } : {}),
-            ...(r.triggers !== undefined ? { triggers: r.triggers } : {}),
-            ...(r.meta !== undefined ? { meta: r.meta } : {}),
-            ...(r.valueTransforms !== undefined ? { valueTransforms: r.valueTransforms } : {}),
+        return {
+            type: this.root.type,
+            children: this.root.children,
+            mode: this.root.mode,
         };
-        return node;
     }
     /**
      * Converts the built widget node to JSON string
@@ -643,7 +591,6 @@ class BaseContainerBuilder {
             'number-editor',
             'select-editor',
             'lookup-editor',
-            'entity-definition-provider-editor',
             'selection-list-editor',
             'date-time-editor',
             'toggle-editor',
@@ -746,30 +693,32 @@ class BaseContainerMixin extends BaseContainerBuilder {
 class LayoutContainerMixin extends BaseContainerMixin {
     layout(value) {
         // Map layout intent to grid item sizing so containers like `form-field`
-        // can span multiple columns/rows inside grid/fieldset layouts.
+        // can span multiple columns inside grid/fieldset layouts.
         if (!this.containerState.options)
             this.containerState.options = {};
         if (typeof value === 'number') {
+            // Direct numeric shorthand → colSpan
             this.containerState.options.colSpan = value;
         }
         else if (value) {
+            // Try to extract grid positioning from breakpoint positions
             const positions = value.positions;
             if (positions) {
-                const placement = positions?.lg ?? positions?.xl ?? positions?.xxl ?? positions?.md ?? positions?.sm;
-                if (placement) {
-                    const opts = this.containerState.options;
-                    if (placement.colSpan != null)
-                        opts.colSpan = placement.colSpan;
-                    if (placement.colStart != null)
-                        opts.colStart = placement.colStart;
-                    if (placement.colEnd != null)
-                        opts.colEnd = placement.colEnd;
-                    if (placement.rowSpan != null)
-                        opts.rowSpan = placement.rowSpan;
-                    if (placement.rowStart != null)
-                        opts.rowStart = placement.rowStart;
-                    if (placement.rowEnd != null)
-                        opts.rowEnd = placement.rowEnd;
+                // Resolve the best breakpoint (prefer lg, then fallback to others)
+                const bp = positions?.lg ?? positions?.xl ?? positions?.xxl ?? positions?.md ?? positions?.sm;
+                if (bp) {
+                    if (bp.colSpan != null)
+                        this.containerState.options.colSpan = bp.colSpan;
+                    if (bp.colStart != null)
+                        this.containerState.options.colStart = bp.colStart;
+                    if (bp.colEnd != null)
+                        this.containerState.options.colEnd = bp.colEnd;
+                    if (bp.rowSpan != null)
+                        this.containerState.options.rowSpan = bp.rowSpan;
+                    if (bp.rowStart != null)
+                        this.containerState.options.rowStart = bp.rowStart;
+                    if (bp.rowEnd != null)
+                        this.containerState.options.rowEnd = bp.rowEnd;
                 }
             }
         }
@@ -988,7 +937,6 @@ class WidgetContainerMixin extends ChildContainerMixin {
             'number-editor',
             'select-editor',
             'lookup-editor',
-            'entity-definition-provider-editor',
             'selection-list-editor',
             'date-time-editor',
             'toggle-editor',
@@ -1044,73 +992,12 @@ class FlexContainerBuilder extends WidgetContainerMixin {
  * Grid Container Builder - Liskov Substitution Principle
  * Extends WidgetContainerMixin to inherit all common functionality
  */
-/**
- * Extracts flat grid-item options from AXPGridLayoutOptions for grid-item-layout widget.
- * Uses first available breakpoint (lg, xl, md, sm).
- */
-/**
- * Deep-merges grid breakpoint buckets so sequential fluent calls (e.g. setColumns then setGap)
- * do not wipe sibling keys under options.grid.default.
- */
-function mergeAXPGridContainerOptions(prev, patch) {
-    const next = { ...(prev ?? {}), ...patch };
-    if (prev?.grid?.default || patch.grid?.default) {
-        next.grid = {
-            ...(prev?.grid ?? {}),
-            ...(patch.grid ?? {}),
-            default: {
-                ...(prev?.grid?.default ?? {}),
-                ...(patch.grid?.default ?? {}),
-            },
-        };
-    }
-    return next;
-}
-function toGridItemOptions(layoutOptions) {
-    if (!layoutOptions?.positions)
-        return { colSpan: 12 };
-    const positions = layoutOptions.positions;
-    const placement = positions['lg'] ?? positions['xl'] ?? positions['xxl'] ?? positions['md'] ?? positions['sm'];
-    if (!placement)
-        return { colSpan: 12 };
-    const opts = {};
-    if (placement['colSpan'] != null)
-        opts['colSpan'] = placement['colSpan'];
-    if (placement['colStart'] != null)
-        opts['colStart'] = placement['colStart'];
-    if (placement['colEnd'] != null)
-        opts['colEnd'] = placement['colEnd'];
-    if (placement['rowSpan'] != null)
-        opts['rowSpan'] = placement['rowSpan'];
-    if (placement['rowStart'] != null)
-        opts['rowStart'] = placement['rowStart'];
-    if (placement['rowEnd'] != null)
-        opts['rowEnd'] = placement['rowEnd'];
-    if (Object.keys(opts).length === 0)
-        opts['colSpan'] = 12;
-    return opts;
-}
 class GridContainerBuilder extends WidgetContainerMixin {
     constructor() {
         super('grid-layout');
     }
     setOptions(options) {
-        this.containerState.options = mergeAXPGridContainerOptions(this.containerState.options, options);
-        return this;
-    }
-    item(layoutOptions, delegate) {
-        const fieldset = new FieldsetContainerBuilder();
-        fieldset.withInheritanceContext(this.inheritanceContext);
-        delegate(fieldset);
-        const fieldsetNode = fieldset.build();
-        const gridItemOptions = toGridItemOptions(layoutOptions);
-        const gridItemNode = {
-            type: 'grid-item-layout',
-            options: gridItemOptions,
-            children: [fieldsetNode],
-        };
-        this.ensureChildren();
-        this.containerState.children.push(gridItemNode);
+        this.containerState.options = { ...this.containerState.options, ...options };
         return this;
     }
     // Individual fluent methods for Grid
@@ -1541,7 +1428,7 @@ class ListWidgetBuilder extends WidgetContainerMixin {
  * Uses composition instead of inheritance for cleaner separation
  */
 class DialogContainerBuilder {
-    constructor(popupService, hookService) {
+    constructor(popupService) {
         this.dialogState = {
             type: 'flex-layout', // This will be overridden when content layout exists
             children: [],
@@ -1564,7 +1451,6 @@ class DialogContainerBuilder {
         else {
             this.popupService = inject(AXPopupService);
         }
-        this.hookService = hookService ?? inject(AXPHookService, { optional: true }) ?? undefined;
     }
     setOptions(options) {
         this.dialogState.dialogOptions = { ...this.dialogState.dialogOptions, ...options };
@@ -1605,12 +1491,7 @@ class DialogContainerBuilder {
         return this;
     }
     onAction(handler) {
-        this.dialogState.dialogOptions ??= {
-            title: '',
-            size: 'md',
-            closeButton: false,
-        };
-        this.dialogState.dialogOptions.onAction = handler;
+        (this.dialogState.dialogOptions ??= {}).onAction = handler;
         return this;
     }
     addCustomAction(action) {
@@ -1659,42 +1540,22 @@ class DialogContainerBuilder {
         const dialogNode = this.build();
         // Import the dialog renderer component dynamically
         const { AXPDialogRendererComponent } = await Promise.resolve().then(function () { return dialogRenderer_component; });
-        this.dialogState.dialogOptions ??= {};
-        if (this.dialogState.dialogOptions.context == null || typeof this.dialogState.dialogOptions.context !== 'object') {
-            this.dialogState.dialogOptions.context = {};
-        }
-        const initialContext = this.dialogState.dialogOptions.context;
-        this.dialogState.actions ??= { footer: { prefix: [], suffix: [] } };
-        this.dialogState.actions.footer ??= { prefix: [], suffix: [] };
-        this.dialogState.actions.footer.prefix ??= [];
-        this.dialogState.actions.footer.suffix ??= [];
-        const hookService = this.hookService;
-        if (hookService) {
-            const beforePayload = {
-                context: initialContext,
-                dialogOptions: this.dialogState.dialogOptions,
-            };
-            await hookService.runAsync(AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, beforePayload);
-        }
+        // Collect default values from widget tree and merge into initial context
+        const initialContext = this.dialogState.dialogOptions?.context || {};
+        //TODO remove using collectDefaultValues and use initialContext directly for now:
+        const contextWithDefaults = collectDefaultValues(dialogNode, initialContext);
         // Create dialog configuration
         const dialogConfig = {
             title: this.dialogState.dialogOptions?.title || '',
-            //TODO: why we need message?
-            //message: this.dialogState.dialogOptions?.message,
+            message: this.dialogState.dialogOptions?.message,
             context: initialContext,
             definition: dialogNode,
-            metadata: this.dialogState.dialogOptions.metadata,
             actions: this.dialogState.actions,
             onAction: this.dialogState.dialogOptions?.onAction,
         };
-        // 
-        if (hookService) {
-            await hookService.runAsync(AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, dialogConfig);
-        }
         // The Promise resolves when user clicks an action button
         return new Promise(async (resolve) => {
-            let flag = false;
-            await this.popupService.open(AXPDialogRendererComponent, {
+            this.popupService.open(AXPDialogRendererComponent, {
                 title: dialogConfig.title,
                 size: this.dialogState.dialogOptions?.size || 'md',
                 closeButton: this.dialogState.dialogOptions?.closeButton || false,
@@ -1703,14 +1564,10 @@ class DialogContainerBuilder {
                 data: {
                     config: dialogConfig,
                     callBack: (result) => {
-                        flag = true;
                         resolve(result);
                     },
                 },
             });
-            if (!flag) {
-                resolve({ success: false });
-            }
         });
     }
 }
@@ -1912,19 +1769,10 @@ class ActionBuilder {
         return this;
     }
     custom(action) {
-        const position = action.position ?? 'suffix';
-        if (position === 'prefix') {
-            if (!this.dialogBuilder['dialogState'].actions.footer.prefix) {
-                this.dialogBuilder['dialogState'].actions.footer.prefix = [];
-            }
-            this.dialogBuilder['dialogState'].actions.footer.prefix.push(action);
-        }
-        else {
-            if (!this.dialogBuilder['dialogState'].actions.footer.suffix) {
-                this.dialogBuilder['dialogState'].actions.footer.suffix = [];
-            }
-            this.dialogBuilder['dialogState'].actions.footer.suffix.push(action);
+        if (!this.dialogBuilder['dialogState'].actions.footer.suffix) {
+            this.dialogBuilder['dialogState'].actions.footer.suffix = [];
         }
+        this.dialogBuilder['dialogState'].actions.footer.suffix.push(action);
         return this;
     }
 }
@@ -2073,27 +1921,22 @@ class AXPLayoutRendererComponent {
         /**
          * Form definition containing groups and fields OR widget tree
          */
-        this.layout = input.required(...(ngDevMode ? [{ debugName: "layout" }] : /* istanbul ignore next */ []));
+        this.layout = input.required(...(ngDevMode ? [{ debugName: "layout" }] : []));
         /**
          * Form context/model data
          */
-        this.context = model({}, ...(ngDevMode ? [{ debugName: "context" }] : /* istanbul ignore next */ []));
+        this.context = model({}, ...(ngDevMode ? [{ debugName: "context" }] : []));
         /**
          * Form appearance and density styling (normal, compact, spacious)
          */
-        this.look = input('fieldset', ...(ngDevMode ? [{ debugName: "look" }] : /* istanbul ignore next */ []));
+        this.look = input('fieldset', ...(ngDevMode ? [{ debugName: "look" }] : []));
         /**
          * Default form mode. Can be overridden by section/group and field.
          */
-        this.mode = input('edit', ...(ngDevMode ? [{ debugName: "mode" }] : /* istanbul ignore next */ []));
+        this.mode = input('edit', ...(ngDevMode ? [{ debugName: "mode" }] : []));
         //#endregion
         //#region ----   Widget Tree Conversion   ----
-        this.widgetTree = signal(null, ...(ngDevMode ? [{ debugName: "widgetTree" }] : /* istanbul ignore next */ []));
-        /**
-         * Prefer explicit {@link AXPWidgetNode.mode} on the root node (e.g. dialog flex `mode('view')`)
-         * so nested widgets resolve view vs edit correctly; fall back to the layout `mode` input.
-         */
-        this.effectiveRenderMode = computed(() => this.widgetTree()?.mode ?? this.mode(), ...(ngDevMode ? [{ debugName: "effectiveRenderMode" }] : /* istanbul ignore next */ []));
+        this.widgetTree = signal(null, ...(ngDevMode ? [{ debugName: "widgetTree" }] : []));
         /**
          * Convert layout data to widget tree when inputs change
          */
@@ -2118,7 +1961,7 @@ class AXPLayoutRendererComponent {
             if (!isEqual(prev, tree)) {
                 this.widgetTree.set(tree);
             }
-        }, ...(ngDevMode ? [{ debugName: "conversionEffect" }] : /* istanbul ignore next */ []));
+        }, ...(ngDevMode ? [{ debugName: "conversionEffect" }] : []));
         //#endregion
         //#region ----   Outputs   ----
         /**
@@ -2131,12 +1974,12 @@ class AXPLayoutRendererComponent {
         this.validityChange = output();
         //#endregion
         //#region ----   Properties   ----
-        this.form = viewChild(AXFormComponent, ...(ngDevMode ? [{ debugName: "form" }] : /* istanbul ignore next */ []));
-        this.container = viewChild(AXPWidgetContainerComponent, ...(ngDevMode ? [{ debugName: "container" }] : /* istanbul ignore next */ []));
+        this.form = viewChild(AXFormComponent, ...(ngDevMode ? [{ debugName: "form" }] : []));
+        this.container = viewChild(AXPWidgetContainerComponent, ...(ngDevMode ? [{ debugName: "container" }] : []));
         /**
          * Internal context signal for reactivity
          */
-        this.internalContext = signal({}, ...(ngDevMode ? [{ debugName: "internalContext" }] : /* istanbul ignore next */ []));
+        this.internalContext = signal({}, ...(ngDevMode ? [{ debugName: "internalContext" }] : []));
         /**
          * Initial context for reset functionality
          */
@@ -2149,7 +1992,7 @@ class AXPLayoutRendererComponent {
         this.#contextSyncEffect = effect(() => {
             const ctx = this.context() ?? {};
             this.contextUpdateSubject.next(ctx);
-        }, ...(ngDevMode ? [{ debugName: "#contextSyncEffect" }] : /* istanbul ignore next */ []));
+        }, ...(ngDevMode ? [{ debugName: "#contextSyncEffect" }] : []));
         /**
          * Effect to handle widget tree status changes
          */
@@ -2158,7 +2001,7 @@ class AXPLayoutRendererComponent {
             if (widgetTree) {
                 this.container()?.builderService.setStatus(AXPPageStatus.Rendered);
             }
-        }, ...(ngDevMode ? [{ debugName: "#widgetStatusEffect" }] : /* istanbul ignore next */ []));
+        }, ...(ngDevMode ? [{ debugName: "#widgetStatusEffect" }] : []));
     }
     //#endregion
     //#region ----   Lifecycle Methods   ----
@@ -2298,67 +2141,40 @@ class AXPLayoutRendererComponent {
     isWidgetNode(data) {
         return data && typeof data === 'object' && 'type' in data && typeof data.type === 'string';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLayoutRendererComponent, isStandalone: true, selector: "axp-layout-renderer", inputs: { layout: { classPropertyName: "layout", publicName: "layout", isSignal: true, isRequired: true, transformFunction: null }, context: { classPropertyName: "context", publicName: "context", isSignal: true, isRequired: false, transformFunction: null }, look: { classPropertyName: "look", publicName: "look", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { context: "contextChange", contextInitiated: "contextInitiated", validityChange: "validityChange" }, viewQueries: [{ propertyName: "form", first: true, predicate: AXFormComponent, descendants: true, isSignal: true }, { propertyName: "container", first: true, predicate: AXPWidgetContainerComponent, descendants: true, isSignal: true }], ngImport: i0, template: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.19", type: AXPLayoutRendererComponent, isStandalone: true, selector: "axp-layout-renderer", inputs: { layout: { classPropertyName: "layout", publicName: "layout", isSignal: true, isRequired: true, transformFunction: null }, context: { classPropertyName: "context", publicName: "context", isSignal: true, isRequired: false, transformFunction: null }, look: { classPropertyName: "look", publicName: "look", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { context: "contextChange", contextInitiated: "contextInitiated", validityChange: "validityChange" }, viewQueries: [{ propertyName: "form", first: true, predicate: AXFormComponent, descendants: true, isSignal: true }, { propertyName: "container", first: true, predicate: AXPWidgetContainerComponent, descendants: true, isSignal: true }], ngImport: i0, template: `
     <ax-form>
       <axp-widgets-container [context]="internalContext()" (onContextChanged)="handleContextChanged($event)">
         @if (widgetTree()) {
-          <ng-container
-            axp-widget-renderer
-            [node]="widgetTree()!"
-            [mode]="effectiveRenderMode()"
-          ></ng-container>
+          <ng-container axp-widget-renderer [node]="widgetTree()!" [mode]="mode()"></ng-container>
         }
       </axp-widgets-container>
     </ax-form>
-  `, isInline: true, styles: [":host{display:block;width:100%}\n"], dependencies: [{ kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i2.AXFormComponent, selector: "ax-form", inputs: ["disabled", "readonly", "labelMode", "look", "messageStyle", "updateOn", "inUserInteractionActive"], outputs: ["onValidate", "updateOnChange"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, styles: [":host{display:block;width:100%}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i2.AXFormComponent, selector: "ax-form", inputs: ["disabled", "readonly", "labelMode", "look", "messageStyle", "updateOn", "inUserInteractionActive"], outputs: ["onValidate", "updateOnChange"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutRendererComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPLayoutRendererComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'axp-layout-renderer', standalone: true, imports: [AXPWidgetCoreModule, AXFormModule], changeDetection: ChangeDetectionStrategy.OnPush, template: `
+            args: [{ selector: 'axp-layout-renderer', standalone: true, imports: [CommonModule, AXPWidgetCoreModule, AXFormModule], changeDetection: ChangeDetectionStrategy.OnPush, template: `
     <ax-form>
       <axp-widgets-container [context]="internalContext()" (onContextChanged)="handleContextChanged($event)">
         @if (widgetTree()) {
-          <ng-container
-            axp-widget-renderer
-            [node]="widgetTree()!"
-            [mode]="effectiveRenderMode()"
-          ></ng-container>
+          <ng-container axp-widget-renderer [node]="widgetTree()!" [mode]="mode()"></ng-container>
         }
       </axp-widgets-container>
     </ax-form>
   `, styles: [":host{display:block;width:100%}\n"] }]
         }], propDecorators: { layout: [{ type: i0.Input, args: [{ isSignal: true, alias: "layout", required: true }] }], context: [{ type: i0.Input, args: [{ isSignal: true, alias: "context", required: false }] }, { type: i0.Output, args: ["contextChange"] }], look: [{ type: i0.Input, args: [{ isSignal: true, alias: "look", required: false }] }], mode: [{ type: i0.Input, args: [{ isSignal: true, alias: "mode", required: false }] }], contextInitiated: [{ type: i0.Output, args: ["contextInitiated"] }], validityChange: [{ type: i0.Output, args: ["validityChange"] }], form: [{ type: i0.ViewChild, args: [i0.forwardRef(() => AXFormComponent), { isSignal: true }] }], container: [{ type: i0.ViewChild, args: [i0.forwardRef(() => AXPWidgetContainerComponent), { isSignal: true }] }] } });
 
-/** Registration key for {@link AXPPreviewWidgetFieldCommand}; lives alone so `LayoutBuilderModule` can reference it without static-importing the command implementation. */
-const AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY = 'Widget:Preview';
-
 class LayoutBuilderModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: LayoutBuilderModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.2.9", ngImport: i0, type: LayoutBuilderModule, imports: [CommonModule, AXPLayoutRendererComponent], exports: [AXPLayoutRendererComponent] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: LayoutBuilderModule, providers: [
-            AXPLayoutBuilderService,
-            provideCommandSetups([
-                {
-                    key: AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY,
-                    command: () => Promise.resolve().then(function () { return previewWidgetField_command; }).then((c) => c.AXPPreviewWidgetFieldCommand),
-                },
-            ]),
-        ], imports: [CommonModule, AXPLayoutRendererComponent] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: LayoutBuilderModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.19", ngImport: i0, type: LayoutBuilderModule, imports: [CommonModule, AXPLayoutRendererComponent], exports: [AXPLayoutRendererComponent] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: LayoutBuilderModule, providers: [AXPLayoutBuilderService], imports: [CommonModule, AXPLayoutRendererComponent] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: LayoutBuilderModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: LayoutBuilderModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule, AXPLayoutRendererComponent],
-                    providers: [
-                        AXPLayoutBuilderService,
-                        provideCommandSetups([
-                            {
-                                key: AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY,
-                                command: () => Promise.resolve().then(function () { return previewWidgetField_command; }).then((c) => c.AXPPreviewWidgetFieldCommand),
-                            },
-                        ]),
-                    ],
+                    providers: [AXPLayoutBuilderService],
                     exports: [AXPLayoutRendererComponent],
                 }]
         }] });
@@ -2370,25 +2186,17 @@ 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.context = signal({}, ...(ngDevMode ? [{ debugName: "context" }] : []));
         // This will be set by the popup service automatically - same as dynamic-dialog
         this.callBack = () => { };
-        this.isDialogLoading = signal(false, ...(ngDevMode ? [{ debugName: "isDialogLoading" }] : /* istanbul ignore next */ []));
+        this.isDialogLoading = signal(false, ...(ngDevMode ? [{ debugName: "isDialogLoading" }] : []));
         // 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)}`;
+        this.footerPrefix = signal([], ...(ngDevMode ? [{ debugName: "footerPrefix" }] : []));
+        this.footerSuffix = signal([], ...(ngDevMode ? [{ debugName: "footerSuffix" }] : []));
         //#endregion
         //#region ----   View Accessors   ----
         // Access the internal layout renderer to reach the widgets container injector
-        this.layoutRenderer = viewChild(AXPLayoutRendererComponent, ...(ngDevMode ? [{ debugName: "layoutRenderer" }] : /* istanbul ignore next */ []));
+        this.layoutRenderer = viewChild(AXPLayoutRendererComponent, ...(ngDevMode ? [{ debugName: "layoutRenderer" }] : []));
         this.#eff = effect(() => {
             let count = 0;
             this.aggregateAndEvaluateActions();
@@ -2409,48 +2217,22 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
                     this.aggregateAndEvaluateActions();
                 }, 200);
             }
-        }, ...(ngDevMode ? [{ debugName: "#eff" }] : /* istanbul ignore next */ []));
+        }, ...(ngDevMode ? [{ debugName: "#eff" }] : []));
     }
     //#endregion
     //#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();
@@ -2465,53 +2247,35 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         return this.isDialogLoading();
     }
     async executeAction(action) {
-        const cmd = this.resolveActionCommandName(action.command);
-        if (this.shouldValidateBeforeAction(cmd)) {
+        const cmd = action.command;
+        if (cmd !== 'cancel') {
             const isValid = await this.layoutRenderer()?.validate();
             if (!isValid?.result) {
                 return;
             }
         }
-        //TODO: matin, why we need this? maybe we can remove it?
-        if (cmd?.startsWith('widget:')) {
+        if (typeof cmd === 'string' && cmd.startsWith('widget:')) {
             const parsed = this.parseWidgetCommand(cmd);
             if (parsed.widgetName && parsed.action) {
-                await this.invokeWidget(parsed.widgetName, parsed.action, {});
+                await this.executeWidgetApi(parsed.widgetName, parsed.action);
                 await this.aggregateAndEvaluateActions();
                 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) {
-            const dialogRef = this.createDialogRef(cmd);
+            const dialogRef = {
+                close: (res) => this.close(res),
+                context: () => this.context(),
+                action: () => cmd ?? undefined,
+                setLoading: (loading) => this.isDialogLoading.set(loading),
+            };
             try {
                 this.isDialogLoading.set(true);
                 const result = await Promise.resolve(onAction(dialogRef));
-                if (this.shouldKeepDialogOpenAfterCommandResult(result)) {
-                    return;
-                }
                 this.callBack(result);
-                await this.closeWithOptionalSkipValidate(result);
+                this.close(result);
             }
             catch {
                 // Handler threw: stay open for retry, actions remain clickable
@@ -2529,74 +2293,15 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             this.data.action = result.action;
         }
         this.callBack({
-            ...this.createDialogRef(cmd),
-            action: () => result.action,
-        });
-        // Without `onAction`, only the configured cancel action dismisses the dialog (not submit/custom).
-        if (cmd === 'cancel') {
-            await this.close(result);
-        }
-    }
-    /** Whether the layout form should be validated before running this footer command. */
-    shouldValidateBeforeAction(cmd) {
-        if (!cmd || cmd === 'cancel' || cmd === 'entity-form-done') {
-            return false;
-        }
-        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) => {
-                void this.closeWithOptionalSkipValidate(res);
+                this.close(res);
             },
             context: () => this.context(),
-            action: () => actionCmd,
-            setLoading: (loading) => this.isDialogLoading.set(loading),
-            patchContext: (partial) => {
-                const merged = merge({}, this.context(), partial);
-                this.context.set(merged);
-                this.layoutRenderer()?.updateContext(merged);
+            action: () => result.action,
+            setLoading: (loading) => {
+                this.isDialogLoading.set(loading);
             },
-            invokeWidget: (widgetName, method, opts) => this.invokeWidget(widgetName, method, opts ?? {}),
-        };
-    }
-    async closeWithOptionalSkipValidate(result) {
-        if (result && typeof result === 'object' && result.skipValidate) {
-            this.result.emit(result);
-            await super.close(result);
-            return;
-        }
-        await this.close(result);
-    }
-    /** Resolves footer/widget action command to a string (e.g. `cancel`, `submit`, `widget:...`). */
-    resolveActionCommandName(command) {
-        if (typeof command === 'string') {
-            return command;
-        }
-        if (command && typeof command === 'object' && 'name' in command) {
-            return command.name;
-        }
-        return undefined;
+        });
     }
     parseWidgetCommand(cmd) {
         // Expected 'widget:<widgetName>.<action>'
@@ -2608,7 +2313,7 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             return {};
         return { widgetName: rest.slice(0, dot), action: rest.slice(dot + 1) };
     }
-    async invokeWidget(widgetName, apiMethod, opts) {
+    async executeWidgetApi(widgetName, apiMethod) {
         if (!this.widgetCoreService)
             return;
         try {
@@ -2618,20 +2323,16 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             if (typeof fn === 'function') {
                 await Promise.resolve(fn({
                     close: (result) => {
-                        void this.closeWithOptionalSkipValidate(result);
+                        this.close(result);
                     },
                     context: () => this.context(),
                     setLoading: (loading) => {
-                        (opts.setLoading ?? ((v) => this.isDialogLoading.set(v)))(loading);
+                        this.isDialogLoading.set(loading);
                     },
                 }));
-                // Footer predicates (e.g. wizard step) must refresh when the widget advances outside executeAction (e.g. dialogRef.invokeWidget after entity-form continue).
-                await this.aggregateAndEvaluateActions();
             }
         }
-        catch {
-            //
-        }
+        catch { }
     }
     async close(result) {
         if (result) {
@@ -2681,7 +2382,6 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             zone: 'footer',
             placement,
             scope: a.scope,
-            predicateApiWidgetName: a.predicateApiWidgetName,
         });
         const prefix = (footer?.prefix || []).map((a) => mapOne(a, 'prefix'));
         const suffix = (footer?.suffix || []).map((a) => mapOne(a, 'suffix'));
@@ -2691,18 +2391,16 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         const out = [];
         for (const a of actions) {
             const parsed = typeof a.command === 'string' ? this.parseWidgetCommand(a.command) : {};
-            const widgetNameForApi = parsed.widgetName ?? a.predicateApiWidgetName;
-            const api = widgetNameForApi ? await this.resolveApi(widgetNameForApi) : undefined;
+            const api = parsed.widgetName ? await this.resolveApi(parsed.widgetName) : undefined;
             const scope = {
                 api,
-                widget: { name: widgetNameForApi },
+                widget: { name: parsed.widgetName },
                 dialog: { context: this.context() },
                 context: this.context(),
             };
             const disabled = await this.evalBool(a.disabled, scope);
             const hidden = await this.evalBool(a.hidden, scope);
-            const resolvedTitle = (await this.evalActionTitle(a.title, scope)) ?? a.title;
-            out.push({ ...a, disabled, hidden, title: resolvedTitle });
+            out.push({ ...a, disabled, hidden });
         }
         return out;
     }
@@ -2720,25 +2418,6 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         }
         return value;
     }
-    /** Resolves footer action title when it contains {{ ... }} (e.g. wizard labels from dialog context). */
-    async evalActionTitle(value, scope) {
-        if (value == null || typeof value !== 'string' || !value.includes('{{')) {
-            return value;
-        }
-        try {
-            const result = await this.expressionEvaluator.evaluate(value, scope);
-            if (typeof result === 'string' && result.length > 0) {
-                return result;
-            }
-            if (result != null && result !== false) {
-                return String(result);
-            }
-        }
-        catch {
-            //
-        }
-        return value;
-    }
     async resolveApi(widgetName) {
         try {
             await this.widgetCoreService?.waitForWidget(widgetName, 2000);
@@ -2749,13 +2428,10 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             return undefined;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDialogRendererComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    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: `
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPDialogRendererComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.19", type: AXPDialogRendererComponent, isStandalone: true, selector: "axp-dialog-renderer", outputs: { result: "result" }, 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="ax-p-4">
-      <!-- @if (config.message) {
-        <p class="ax-mb-4 ax-leading-relaxed">{{ config.message | translate | async }}</p>
-      } -->
       <axp-layout-renderer
         [layout]="config.definition"
         [context]="context()"
@@ -2779,13 +2455,8 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
               [color]="action.color"
               (onClick)="executeAction(action)"
             >
-              @if (isFormLoading()) {
-                <ax-loading></ax-loading>
-              }
               <ax-prefix>
-                @if (action.icon) {
-                  <ax-icon [icon]="action.icon"></ax-icon>
-                }
+                <i class="{{ action.icon }}"></i>
               </ax-prefix>
             </ax-button>
           }
@@ -2804,7 +2475,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>
@@ -2813,9 +2484,9 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         </ax-suffix>
       </ax-footer>
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPLayoutRendererComponent, selector: "axp-layout-renderer", inputs: ["layout", "context", "look", "mode"], outputs: ["contextChange", "contextInitiated", "validityChange"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i2$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i2$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i3.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXPComponentSlotModule }, { kind: "directive", type: i4.AXPComponentSlotDirective, selector: "axp-component-slot", inputs: ["name", "host", "context"], exportAs: ["slot"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPLayoutRendererComponent, selector: "axp-layout-renderer", inputs: ["layout", "context", "look", "mode"], outputs: ["contextChange", "contextInitiated", "validityChange"] }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1$1.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i2$1.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i2$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i3.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXPComponentSlotModule }, { kind: "directive", type: i4.AXPComponentSlotDirective, selector: "axp-component-slot", inputs: ["name", "host", "context"], exportAs: ["slot"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDialogRendererComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPDialogRendererComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-dialog-renderer',
@@ -2829,14 +2500,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         AXTranslationModule,
                         AXPComponentSlotModule,
                     ],
-                    providers: [AXPContextStore],
-                    changeDetection: ChangeDetectionStrategy.OnPush,
                     template: `
     <axp-component-slot name="dialog-header" [context]="context()"></axp-component-slot>
     <div class="ax-p-4">
-      <!-- @if (config.message) {
-        <p class="ax-mb-4 ax-leading-relaxed">{{ config.message | translate | async }}</p>
-      } -->
       <axp-layout-renderer
         [layout]="config.definition"
         [context]="context()"
@@ -2860,13 +2526,8 @@ 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>
-                @if (action.icon) {
-                  <ax-icon [icon]="action.icon"></ax-icon>
-                }
+                <i class="{{ action.icon }}"></i>
               </ax-prefix>
             </ax-button>
           }
@@ -2885,7 +2546,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>
@@ -2905,190 +2566,9 @@ var dialogRenderer_component = /*#__PURE__*/Object.freeze({
     AXPDialogRendererComponent: AXPDialogRendererComponent
 });
 
-//#region ----   Imports   ----
-/**
- * `customWidget` only forwards keys from its options bag into the built node via `addSingleWidget`.
- * Designer / configurator persist `defaultValue` (and other extended fields) on the widget node root;
- * spreading `options` alone drops them, so preview never applied defaults.
- */
-/**
- * Widget options are sometimes persisted with an extra nesting (`options.options`) when context
- * was merged incorrectly. Flatten so list/data-source resolution sees `dataSource` at the top level.
- */
-function optionsBagForPreview(node) {
-    const raw = (node.options ?? {});
-    const inner = raw['options'];
-    if (inner !== undefined && typeof inner === 'object' && !Array.isArray(inner)) {
-        const { options: _nested, ...rest } = raw;
-        return { ...rest, ...inner };
-    }
-    return { ...raw };
-}
-function extendedNodePropsForPreview(node) {
-    const out = {};
-    if (node.defaultValue !== undefined) {
-        out['defaultValue'] = node.defaultValue;
-    }
-    if (node.triggers !== undefined) {
-        out['triggers'] = node.triggers;
-    }
-    if (node.meta !== undefined) {
-        out['meta'] = node.meta;
-    }
-    if (node.valueTransforms !== undefined) {
-        out['valueTransforms'] = node.valueTransforms;
-    }
-    if (node.visible !== undefined) {
-        out['visible'] = node.visible;
-    }
-    if (node.mode !== undefined) {
-        out['mode'] = node.mode;
-    }
-    if (node.children !== undefined) {
-        out['children'] = node.children;
-    }
-    return out;
-}
-//#endregion
-//#region ----   Command   ----
-/**
- * Opens a dialog that previews a widget configuration (same behavior as the preview button on
- * `axp-widget-field-configurator`). Invoked from that component and from entity list actions.
- */
-class AXPPreviewWidgetFieldCommand {
-    constructor() {
-        this.formBuilderService = inject(AXPLayoutBuilderService);
-        this.widgetRegistry = inject(AXPWidgetRegistryService);
-        this.translationService = inject(AXTranslationService);
-        this.crudService = inject(AXP_ENTITY_DEFINITION_CRUD_SERVICE, { optional: true });
-    }
-    async execute(input) {
-        try {
-            const merged = this.mergeInvocation(input);
-            const currentWidget = this.normalizeWidget(merged['widget'] ?? merged['interface']);
-            if (!currentWidget?.type) {
-                return {
-                    success: false,
-                    message: {
-                        text: (await this.translationService.translateAsync('@general:messages.invalid-data')) || 'Invalid data',
-                    },
-                };
-            }
-            const fieldName = String(merged['fieldName'] ?? merged['name'] ?? 'Field');
-            const rawTitle = (merged['fieldTitle'] ?? merged['title']);
-            const fieldTitleLabel = this.resolveFieldTitleLabel(rawTitle, fieldName);
-            const dialogTitle = (await this.resolveWidgetDisplayTitle(currentWidget.type)) || currentWidget.type || fieldTitleLabel;
-            const previewWidgetOptions = {
-                ...optionsBagForPreview(currentWidget),
-                name: fieldName,
-                ...extendedNodePropsForPreview(currentWidget),
-            };
-            const dialogOutcome = await this.formBuilderService
-                .create()
-                .dialog((dialog) => {
-                dialog
-                    .setTitle(dialogTitle)
-                    .setSize('md')
-                    .setCloseButton(true)
-                    .setContext({})
-                    .content((layoutBuilder) => {
-                    layoutBuilder.formField(fieldTitleLabel, (formField) => {
-                        formField.customWidget(currentWidget.type, previewWidgetOptions);
-                    });
-                })
-                    .setActions((actions) => actions.cancel('@general:actions.close.title'));
-            })
-                .show();
-            const cancelled = this.isCancelDialogOutcome(dialogOutcome);
-            return {
-                success: !cancelled,
-                message: { text: '' },
-            };
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : 'Unknown error';
-            return {
-                success: false,
-                message: { text: message },
-            };
-        }
-    }
-    mergeInvocation(input) {
-        const contextOptions = input.__context__?.options;
-        const ctxData = input.__context__?.data;
-        const { __context__: _ctx, ...rest } = input;
-        return {
-            ...(ctxData ?? {}),
-            ...(contextOptions ?? {}),
-            ...rest,
-        };
-    }
-    normalizeWidget(raw) {
-        if (raw == null)
-            return null;
-        if (typeof raw === 'string') {
-            const t = raw.trim();
-            return t ? { type: t, options: {} } : null;
-        }
-        if (typeof raw === 'object' && !Array.isArray(raw) && 'type' in raw) {
-            const w = raw;
-            return w.type ? cloneDeep(w) : null;
-        }
-        return null;
-    }
-    resolveFieldTitleLabel(raw, fallback) {
-        let source = fallback;
-        if (raw !== undefined && raw !== null) {
-            if (typeof raw === 'string') {
-                if (raw.trim() !== '') {
-                    source = raw;
-                }
-            }
-            else if (typeof raw === 'object' && !Array.isArray(raw) && Object.keys(raw).length > 0) {
-                source = raw;
-            }
-        }
-        return this.translationService.resolve(source);
-    }
-    isCancelDialogOutcome(outcome) {
-        if (outcome == null) {
-            return false;
-        }
-        const ref = outcome;
-        if (typeof ref.action !== 'function') {
-            return false;
-        }
-        return ref.action() === 'cancel';
-    }
-    async resolveWidgetDisplayTitle(widgetType) {
-        const crud = this.crudService;
-        if (crud) {
-            const interfaces = await crud.listInterfaces();
-            const iface = interfaces.find((d) => d.name === widgetType);
-            return iface?.title ?? iface?.name;
-        }
-        const config = this.widgetRegistry.getOptional(widgetType);
-        if (!config) {
-            return undefined;
-        }
-        const resolved = this.translationService.resolve(config.title);
-        return resolved || undefined;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPPreviewWidgetFieldCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPPreviewWidgetFieldCommand }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPPreviewWidgetFieldCommand, decorators: [{
-            type: Injectable
-        }] });
-
-var previewWidgetField_command = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPPreviewWidgetFieldCommand: AXPPreviewWidgetFieldCommand
-});
-
 /**
  * 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_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY, AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, LayoutBuilderModule };
+export { AXPDialogRendererComponent, AXPLayoutBuilderService, AXPLayoutConversionService, AXPLayoutRendererComponent, LayoutBuilderModule };
 //# sourceMappingURL=acorex-platform-layout-builder.mjs.map