@acorex/platform 21.0.0-next.37 → 21.0.0-next.40

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

@@ -1,7 +1,7 @@
 import * as i5 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { Injectable, inject, input, model, signal, effect, output, viewChild, ChangeDetectionStrategy, Component, NgModule, EventEmitter, Output } 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 { AXPopupService } from '@acorex/components/popup';
 import * as i1 from '@acorex/platform/layout/widget-core';
@@ -20,7 +20,7 @@ import { AXBasePageComponent } from '@acorex/components/page';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationModule, AXTranslationService } from '@acorex/core/translation';
 import * as i4 from '@acorex/platform/core';
-import { AXPExpressionEvaluatorService, AXPComponentSlotModule, AXPContextStore, AXPMultiLanguageStringResolverService } from '@acorex/platform/core';
+import { AXPExpressionEvaluatorService, AXPComponentSlotModule, AXPContextStore } from '@acorex/platform/core';
 import { AXP_ENTITY_DEFINITION_CRUD_SERVICE } from '@acorex/platform/domain';
 
 class AXPLayoutConversionService {
@@ -161,6 +161,10 @@ 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,
@@ -168,8 +172,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
         };
@@ -212,7 +216,7 @@ class AXPLayoutConversionService {
             path: formFieldNode.name || editorWidget.name || `field-${Date.now()}`,
             title: formFieldNode.options?.['label'],
             badge: formFieldNode.options?.['badge'],
-            description: formFieldNode.options?.['description'],
+            description: formFieldNode.options?.['hint'],
             widget: editorWidget,
             mode: formFieldNode.mode,
         };
@@ -1998,6 +2002,11 @@ class AXPLayoutRendererComponent {
         //#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 */ []));
         /**
          * Convert layout data to widget tree when inputs change
          */
@@ -2207,7 +2216,11 @@ class AXPLayoutRendererComponent {
     <ax-form>
       <axp-widgets-container [context]="internalContext()" (onContextChanged)="handleContextChanged($event)">
         @if (widgetTree()) {
-          <ng-container axp-widget-renderer [node]="widgetTree()!" [mode]="mode()"></ng-container>
+          <ng-container
+            axp-widget-renderer
+            [node]="widgetTree()!"
+            [mode]="effectiveRenderMode()"
+          ></ng-container>
         }
       </axp-widgets-container>
     </ax-form>
@@ -2219,7 +2232,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
     <ax-form>
       <axp-widgets-container [context]="internalContext()" (onContextChanged)="handleContextChanged($event)">
         @if (widgetTree()) {
-          <ng-container axp-widget-renderer [node]="widgetTree()!" [mode]="mode()"></ng-container>
+          <ng-container
+            axp-widget-renderer
+            [node]="widgetTree()!"
+            [mode]="effectiveRenderMode()"
+          ></ng-container>
         }
       </axp-widgets-container>
     </ax-form>
@@ -2717,7 +2734,6 @@ class AXPPreviewWidgetFieldCommand {
         this.formBuilderService = inject(AXPLayoutBuilderService);
         this.widgetRegistry = inject(AXPWidgetRegistryService);
         this.translationService = inject(AXTranslationService);
-        this.mlResolver = inject(AXPMultiLanguageStringResolverService);
         this.crudService = inject(AXP_ENTITY_DEFINITION_CRUD_SERVICE, { optional: true });
     }
     async execute(input) {
@@ -2727,15 +2743,15 @@ class AXPPreviewWidgetFieldCommand {
             if (!currentWidget?.type) {
                 return {
                     success: false,
-                    message: { text: (await this.translationService.translateAsync('@general:messages.invalid-data')) || 'Invalid data' },
+                    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 dialogTitle = (await this.resolveWidgetDisplayTitle(currentWidget.type)) || currentWidget.type || fieldTitleLabel;
             const previewWidgetOptions = {
                 ...optionsBagForPreview(currentWidget),
                 name: fieldName,
@@ -2806,7 +2822,7 @@ class AXPPreviewWidgetFieldCommand {
                 source = raw;
             }
         }
-        return this.mlResolver.resolve(source);
+        return this.translationService.resolve(source);
     }
     isCancelDialogOutcome(outcome) {
         if (outcome == null) {
@@ -2829,7 +2845,7 @@ class AXPPreviewWidgetFieldCommand {
         if (!config) {
             return undefined;
         }
-        const resolved = this.mlResolver.resolve(config.title);
+        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 }); }