@acorex/platform 20.9.1 → 20.9.2

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

@@ -10,11 +10,11 @@ import * as i1$3 from '@acorex/platform/workflow';
 import { AXPWorkflowEventService, AXPWorkflowService, ofType, createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, ChangeDetectorRef, input, signal, computed, effect, ChangeDetectionStrategy, Component, ElementRef, NgModule, viewChild, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, EnvironmentInjector, makeEnvironmentProviders } from '@angular/core';
-import { cloneDeep, merge, get, castArray, set, orderBy, isNil, isEmpty, isEqual, isObjectLike, isArray, has, isString } from 'lodash-es';
+import { cloneDeep, merge, get, castArray, set, orderBy, defaultTo, isNil, isEmpty, isEqual, isObjectLike, isArray, has, isString } from 'lodash-es';
 import { Subject, filter, takeUntil } from 'rxjs';
 import { AXPWidgetsCatalog, resolveActionLook, AXPPlatformScope, extractValue, setSmart, getChangedPaths, isSelectionValueEqual, AXPDataGenerator, AXPSystemActionType } from '@acorex/platform/contracts';
 import { AXPLayoutBuilderService, LayoutBuilderModule } from '@acorex/platform/layout/builder';
-import { AXPDeviceService, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPBroadcastEventService, applyFilterArray, applySortArray, AXPDistributedEventListenerService, AXHighlightService, AXPDebugService, AXPContextStore, FORM_DIRTY_TRACE_NS, objectKeyValueTransforms, setupPopupFooterKeyboardShortcuts, AXPHookService, AXPComponentSlotModule, AXPColumnWidthService, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
+import { AXPDeviceService, AXPExpressionEvaluatorService, AXPContextEvalFactory, AXPBroadcastEventService, applyFilterArray, applySortArray, AXPDistributedEventListenerService, AXHighlightService, AXPColumnWidthService, AXPDebugService, AXPContextStore, FORM_DIRTY_TRACE_NS, objectKeyValueTransforms, setupPopupFooterKeyboardShortcuts, AXPHookService, AXPComponentSlotModule, AXPModuleManifestRegistry, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPModuleManifestsDataSourceDefinition } from '@acorex/platform/core';
 import { AXPSessionService, AXPPermissionDefinitionsDataSourceDefinition } from '@acorex/platform/auth';
 import { Router, NavigationStart, ActivatedRoute, RouterModule, ROUTES } from '@angular/router';
 import { defineCommand, AXP_COMMAND_DEFINITION_CATEGORY_ENTITY } from '@acorex/platform/runtime-contracts';
@@ -1385,9 +1385,6 @@ class PropertyFilter {
             });
         }
         wizardExtraSteps.sort((a, b) => a.order - b.order);
-        const pageWizardWidgetNames = wizardExtraSteps
-            .filter((s) => s.kind === 'page')
-            .map((s) => buildPageComponentWidgetName(s.page));
         const prebuiltRelatedListConfigs = useFormWizard
             ? await Promise.all(wizardExtraSteps
                 .filter((s) => s.kind === 'related-list')
@@ -1485,7 +1482,7 @@ class PropertyFilter {
                     .submit(this.kind === 'create' ? '@general:actions.create.title' : '@general:actions.apply.title'));
             }
             if (useFormWizard && this.onActionHandler) {
-                d.onAction(this.createWizardOnActionWrapper(this.onActionHandler, pageWizardWidgetNames));
+                d.onAction(this.createWizardOnActionWrapper(this.onActionHandler));
             }
             else if (this.onActionHandler) {
                 d.onAction(this.onActionHandler);
@@ -1649,11 +1646,14 @@ class PropertyFilter {
             return (await this.expressionEvaluator.evaluate(action, scope));
         }));
     }
-    createWizardOnActionWrapper(userHandler, pageWizardWidgetNames = []) {
+    createWizardOnActionWrapper(userHandler) {
         return async (ref) => {
             const action = ref.action();
             if (action === ENTITY_FORM_ACTION_DONE) {
-                await syncAllPageComponentWidgets(ref, pageWizardWidgetNames);
+                const pageContinue = await continueActiveEntityFormPageStep(ref);
+                if (!pageContinue.success) {
+                    return { keepDialogOpen: true };
+                }
                 if (hasPersistedRootId$1(ref.context())) {
                     const out = (await userHandler(ref));
                     if (out?.success === false) {
@@ -1664,7 +1664,10 @@ class PropertyFilter {
                 return { success: true, data: ref.context(), skipValidate: true };
             }
             if (action === ENTITY_FORM_ACTION_NEXT_STEP) {
-                await syncAllPageComponentWidgets(ref, pageWizardWidgetNames);
+                const pageContinue = await continueActiveEntityFormPageStep(ref);
+                if (!pageContinue.success) {
+                    return { keepDialogOpen: true };
+                }
                 await ref.invokeWidget?.(ENTITY_FORM_STEP_WIZARD_NAME, 'next', { setLoading: ref.setLoading });
                 return { keepDialogOpen: true };
             }
@@ -1673,7 +1676,7 @@ class PropertyFilter {
                 if (out?.success === false) {
                     return out;
                 }
-                const item = out?.data?.item ?? out?.data ?? {};
+                const item = normalizeWizardPersistedRecordPatch(out?.data?.item ?? out?.data ?? {});
                 ref.patchContext?.(merge({}, ref.context(), item));
                 await ref.invokeWidget?.(ENTITY_FORM_STEP_WIZARD_NAME, 'next', { setLoading: ref.setLoading });
                 return merge({}, out, { keepDialogOpen: true });
@@ -2042,10 +2045,27 @@ function hasPersistedRootId$1(context) {
     const raw = context?.id ?? context?._id;
     return (typeof raw === 'string' && raw.length > 0) || (typeof raw === 'number' && !Number.isNaN(raw));
 }
-async function syncAllPageComponentWidgets(ref, widgetNames) {
-    for (const name of widgetNames) {
-        await ref.invokeWidget?.(name, 'syncContext', {});
+function normalizeWizardPersistedRecordPatch(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data)) {
+        return {};
+    }
+    const record = { ...data };
+    const rawId = record['id'] ?? record['_id'];
+    if (rawId != null && record['id'] == null) {
+        record['id'] = rawId;
+    }
+    return record;
+}
+async function continueActiveEntityFormPageStep(ref) {
+    const status = (await ref.invokeWidget?.(ENTITY_FORM_STEP_WIZARD_NAME, 'getStatus', {}));
+    const stepId = status?.currentStep?.id;
+    if (!stepId?.startsWith('page-')) {
+        return { success: true };
     }
+    const result = (await ref.invokeWidget?.(`pageComponent_${stepId}`, 'continueWizardStep', {
+        setLoading: ref.setLoading,
+    }));
+    return { success: result?.success !== false };
 }
 function buildEntityFormRelatedStepId(re) {
     const safe = re.entity.replace(/[^a-zA-Z0-9._-]/g, '_');
@@ -4374,6 +4394,7 @@ class AXPEntityListViewColumnViewModel {
         this.title = this.column.title ?? this.property.title;
         this.visible = this.column?.options?.visible ?? true;
         this.sortEnabled = this.property.options?.sort?.enabled;
+        this.width = this.column?.options?.width;
         this.node = computed(() => {
             const widget = this.property.schema.interface;
             return {
@@ -5787,10 +5808,11 @@ class AXPEntityMasterListViewModel {
             if (columns && columnVisibilityMap && columnWidthsMap) {
                 this.columns.update((prev) => prev
                     .map((c) => {
+                    const columnKey = c.column?.options?.dataPath ?? c.name;
                     return {
                         ...c,
-                        width: columnWidthsMap.get(c.column?.options?.dataPath ?? c.name),
-                        visible: columnVisibilityMap.get(c.column?.options?.dataPath ?? c.name) ?? c.visible,
+                        width: defaultTo(columnWidthsMap.get(columnKey), c.column?.options?.width),
+                        visible: columnVisibilityMap.get(columnKey) ?? c.visible,
                     };
                 }) // Update visibility
                     .sort((a, b) => columns.findIndex((col) => col.name === (a.column?.options?.dataPath ?? a.name)) -
@@ -12033,6 +12055,26 @@ function mapEntityColumnToWidgetColumn(entity, column) {
         widget,
     };
 }
+/**
+ * Applies entity column width (explicit or resolved via {@link AXPColumnWidthService}) to data-list columns.
+ */
+function applyDataListColumnWidths(columns, columnWidthService) {
+    return columns.map((column) => {
+        const existingWidth = column.width ?? column.widget?.options?.width;
+        if (existingWidth) {
+            return existingWidth === column.width ? column : { ...column, width: String(existingWidth) };
+        }
+        const columnWithWidth = {
+            name: column.name,
+            widget: column.widget ? { type: column.widget.type } : undefined,
+        };
+        const resolvedWidth = columnWidthService.resolveWidth(columnWithWidth);
+        if (!resolvedWidth) {
+            return column;
+        }
+        return { ...column, width: resolvedWidth };
+    });
+}
 //#endregion
 //#region ----   Include/Exclude Utilities   ----
 /**
@@ -12063,6 +12105,7 @@ class AXPEntityListTableService {
         this.commandService = inject(AXPCommandService);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.settings = inject(AXPSettingsService);
+        this.columnWidthService = inject(AXPColumnWidthService);
         this.evaluateExpressions = async (options, data) => {
             if (!options) {
                 return {};
@@ -12164,7 +12207,7 @@ class AXPEntityListTableService {
         else {
             baseColumns = getVisibleProperties(entity).map((prop) => mapPropertyToWidgetColumn(prop));
         }
-        return applyIncludeExclude(baseColumns, includeColumns, excludeColumns);
+        return applyDataListColumnWidths(applyIncludeExclude(baseColumns, includeColumns, excludeColumns), this.columnWidthService);
     }
     /**
      * Map EntityTableColumn to ListWidgetColumn
@@ -12483,6 +12526,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.commandService = inject(AXPCommandService);
         this.eventService = inject(AXPBroadcastEventService);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        this.columnWidthService = inject(AXPColumnWidthService);
         this.route = inject(ActivatedRoute);
         this.isMounted = signal(false, ...(ngDevMode ? [{ debugName: "isMounted" }] : /* istanbul ignore next */ []));
         this.entity = signal(null, ...(ngDevMode ? [{ debugName: "entity" }] : /* istanbul ignore next */ []));
@@ -13039,7 +13083,9 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         })
             .filter((c) => c != null);
         // Apply updated columns to the list widget and refresh
-        listInstance.setOptions({ columns: updatedColumns });
+        listInstance.setOptions({
+            columns: applyDataListColumnWidths(updatedColumns, this.columnWidthService),
+        });
     }
     async ngOnInit() {
         super.ngOnInit();
@@ -13406,6 +13452,8 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
         super(...arguments);
         //#region ----   Services & Dependencies   ----
         this.deviceService = inject(AXPDeviceService);
+        this.toastService = inject(AXToastService);
+        this.translationService = inject(AXTranslationService);
         this.pageRenderer = viewChild(AXPPageComponentRendererDirective, ...(ngDevMode ? [{ debugName: "pageRenderer" }] : /* istanbul ignore next */ []));
         //#endregion
         //#region ----   Computed Options   ----
@@ -13433,7 +13481,6 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
             }
             instance.primaryMenuItems();
             instance.secondaryMenuItems();
-            console.log({ primaryMenuItems: instance.primaryMenuItems(), secondaryMenuItems: instance.secondaryMenuItems() });
             untracked(() => this.syncActionsFromPageInstance(instance));
         }, ...(ngDevMode ? [{ debugName: "#syncPageActionsEffect" }] : /* istanbul ignore next */ []));
     }
@@ -13457,6 +13504,15 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
             syncContext: () => {
                 self.syncPageComponentIntoFormContext();
             },
+            continueWizardStep: async (callback) => {
+                callback?.setLoading?.(true);
+                try {
+                    return await self.runWizardStepContinue();
+                }
+                finally {
+                    callback?.setLoading?.(false);
+                }
+            },
             refreshPageActions: () => {
                 self.refreshPageActions();
             },
@@ -13490,6 +13546,66 @@ class AXPPageComponentWidgetViewComponent extends AXPBaseWidgetComponent {
         this.pageHostRevision.update((value) => value + 1);
     }
     //#endregion
+    //#region ----   Wizard Step Continue   ----
+    /**
+     * Persists the active page step when dirty (footer save action), then merges wizard context.
+     * Used by entity create/update step wizard footer Next/Done.
+     */
+    async runWizardStepContinue() {
+        const instance = this.resolvePageHost();
+        if (!instance) {
+            return { success: true };
+        }
+        const dirty = instance.hasUnsavedChanges?.() ?? false;
+        if (dirty) {
+            const command = this.resolveWizardContinueCommand(instance);
+            if (command.name) {
+                const result = await instance.execute(command);
+                if (isExecuteCommandFailure(result)) {
+                    await this.showExecuteFailureToast(result);
+                    return { success: false };
+                }
+            }
+        }
+        this.syncPageComponentIntoFormContext();
+        this.pageHostRevision.update((value) => value + 1);
+        return { success: true };
+    }
+    resolveWizardContinueCommand(instance) {
+        const explicit = instance.getWizardStepContinueCommand?.();
+        if (explicit?.name) {
+            return explicit;
+        }
+        const actions = [...instance.primaryMenuItems(), ...instance.secondaryMenuItems()];
+        const continueAction = actions.find((action) => action.visible !== false &&
+            isFooterZoneAction(action) &&
+            getActionPriority(action) === 'primary' &&
+            action.command);
+        return continueAction ? normalizeExecuteCommand(continueAction.command) : { name: '', options: {} };
+    }
+    async showExecuteFailureToast(result) {
+        const rawText = result.message?.text;
+        let content;
+        if (typeof rawText === 'string') {
+            content = rawText.startsWith('@') ? await this.translationService.translateAsync(rawText) : rawText;
+        }
+        else if (rawText) {
+            content = this.translationService.resolve(rawText);
+        }
+        else {
+            content = await this.translationService.translateAsync('@general:messages.generic.error.description');
+        }
+        this.toastService.show({
+            color: 'danger',
+            title: await this.translationService.translateAsync('@general:messages.generic.error.title'),
+            content,
+            location: 'bottom-center',
+            closeButton: true,
+            timeOut: 5000,
+            timeOutProgress: true,
+        });
+    }
+    //#endregion
     //#region ----   Context Sync   ----
     /** Merges the mounted page component's wizard payload into the dialog form context. */
     syncPageComponentIntoFormContext() {
@@ -13730,6 +13846,15 @@ function splitToolbarSecondaryActions(primary, secondary) {
 function isHeaderZoneAction(action) {
     return action.zone === 'header';
 }
+function isFooterZoneAction(action) {
+    return action.zone === 'footer';
+}
+function isExecuteCommandFailure(result) {
+    return (!!result &&
+        typeof result === 'object' &&
+        'success' in result &&
+        result.success === false);
+}
 function getActionPriority(action) {
     const priority = action.priority;
     return priority === 'secondary' ? 'secondary' : 'primary';