@acorex/platform 21.0.0-next.71 → 21.0.0-next.72

package/fesm2022/acorex-platform-layout-widget-core.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { signal, computed, Injectable, InjectionToken, inject, ElementRef, effect, untracked, EventEmitter, Injector, ChangeDetectorRef, ViewChild, Input, Output, ChangeDetectionStrategy, Component, input, output, ViewContainerRef, Directive, NgModule } from '@angular/core';
 import { convertArrayToDataSource, AXDataSource, AX_STYLE_COLOR_TYPES, AX_STYLE_LOOK_TYPES } from '@acorex/cdk/common';
-import { AXPContextStore, AXPDataSourceDefinitionProviderService, extractValue, AXPExpressionEvaluatorService, getSmart } from '@acorex/platform/core';
+import { AXPContextStore, isSelectionValueEqual, isFormValueEqual, AXPDataSourceDefinitionProviderService, extractValue, AXPExpressionEvaluatorService, getSmart } from '@acorex/platform/core';
 export { normalizeDefinitionCategories } from '@acorex/platform/core';
 import { set, merge, cloneDeep, isNil, get, isEqual, isUndefined, isObjectLike, sum, isEmpty, isString } from 'lodash-es';
 import { Subject, BehaviorSubject, filter } from 'rxjs';
@@ -65,7 +65,6 @@ class AXPWidgetCoreService {
             return [AXPPageStatus.Processing, AXPPageStatus.Submitting, AXPPageStatus.Rendering].includes(this.status());
         }, ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
         this.registeredWidgetsCount = signal(0, ...(ngDevMode ? [{ debugName: "registeredWidgetsCount" }] : /* istanbul ignore next */ []));
-        /** Bumped when a widget reports dirty-state changes via `api().isDirty()`. */
         this.dirtyWidgetsRevision = signal(0, ...(ngDevMode ? [{ debugName: "dirtyWidgetsRevision" }] : /* istanbul ignore next */ []));
         this.dirtyWidgetsRevisionSignal = this.dirtyWidgetsRevision.asReadonly();
     }
@@ -81,22 +80,19 @@ class AXPWidgetCoreService {
     }
     detectStatus() {
         const statuses = Array.from(this.widgets.values()).map((c) => c.status());
-        // Rendering statuses
         if (statuses.some((status) => status === AXPWidgetStatus.Rendering)) {
             return AXPPageStatus.Rendering;
         }
         if (statuses.every((status) => status === AXPWidgetStatus.Rendered)) {
             return AXPPageStatus.Rendered;
         }
-        // Processing statuses
         if (statuses.some((status) => status === AXPWidgetStatus.Processing)) {
             return AXPPageStatus.Processing;
         }
-        // Error handling
         if (statuses.some((status) => status === AXPWidgetStatus.Error)) {
             return AXPPageStatus.Error;
         }
-        return AXPPageStatus.Rendered; // Default to Loaded when all widgets are in a completed state
+        return AXPPageStatus.Rendered;
     }
     refresh() {
         setTimeout(() => {
@@ -131,11 +127,6 @@ class AXPWidgetCoreService {
     getWidget(id) {
         return this.widgets.get(id);
     }
-    /**
-     * Waits until a widget with the given id is registered, then resolves with it.
-     * If the widget is already registered, resolves immediately.
-     * Optionally accepts a timeout (in ms) after which it resolves with undefined.
-     */
     async waitForWidget(id, timeoutMs) {
         const existing = this.widgets.get(id);
         if (existing) {
@@ -165,28 +156,12 @@ class AXPWidgetCoreService {
             }
         });
     }
-    /**
-     * Returns a list of registered widget ids (names).
-     */
     listRegisteredWidgetNames() {
         return Array.from(this.widgets.keys());
     }
-    /** Notifies listeners that a widget's composite dirty state may have changed. */
     notifyWidgetDirtyChanged() {
         this.dirtyWidgetsRevision.update((value) => value + 1);
     }
-    /**
-     * Returns whether any registered widget reports dirty state via `api().isDirty()`.
-     */
-    hasDirtyWidgets() {
-        for (const widget of this.widgets.values()) {
-            const isDirty = widget.api()?.['isDirty'];
-            if (typeof isDirty === 'function' && isDirty()) {
-                return true;
-            }
-        }
-        return false;
-    }
     ngOnDestroy() { }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreService }); }
@@ -503,7 +478,7 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
             this.detectFullPath();
             // Set defaultValue if it exists and the path doesn't exist in context
             if (!isNil(this.defaultValue) && this.fullPath() && !this.contextService.hasValue(this.fullPath())) {
-                this.setValue(this.defaultValue, { origin: 'system' });
+                this.setValue(this.defaultValue);
             }
         }
         //
@@ -516,31 +491,38 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
         }
         return rawValue;
     }
-    setValue(value, options) {
+    setValue(value) {
         if (this.node.valueTransforms?.setter) {
             value = this.node.valueTransforms?.setter(value);
         }
+        const path = this.fullPath();
+        if (!path) {
+            return;
+        }
         const oldValue = this.getValue();
         value = isUndefined(value) ? null : value;
         if (isNil(value) && isNil(oldValue)) {
             return;
         }
+        const savedAtPath = this.contextService.getSavedValue(path);
+        if (this.contextService.isSavedCommitted() &&
+            isSelectionValueEqual(value, savedAtPath) &&
+            !isEqual(oldValue, savedAtPath)) {
+            this.contextService.update(path, cloneDeep(savedAtPath));
+            this.onValueChanged.next({ sender: this });
+            return;
+        }
         // Reordered arrays must persist even when items are deep-equal (e.g. empty row objects).
         const isArrayReorder = Array.isArray(oldValue) &&
             Array.isArray(value) &&
             oldValue.length === value.length &&
             oldValue.some((v, i) => v !== value[i]);
-        if (!isArrayReorder && isEqual(oldValue, value)) {
+        const isArrayLengthChange = Array.isArray(value) && (!Array.isArray(oldValue) || value.length !== oldValue.length);
+        if (!isArrayReorder && !isArrayLengthChange && isFormValueEqual(oldValue, value)) {
             return;
         }
-        if (this.fullPath()) {
-            this.contextService.update(this.fullPath(), value, { origin: options?.origin ?? 'user' });
-            this.onValueChanged.next({ sender: this });
-        }
-    }
-    /** Persists a user-initiated value change into the shared context store. */
-    setUserValue(value) {
-        this.setValue(value, { origin: 'user' });
+        this.contextService.update(path, value);
+        this.onValueChanged.next({ sender: this });
     }
     detectFullPath() {
         const sections = [];
@@ -578,7 +560,7 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
     }
     handleValueChanged(e) {
         if (e.isUserInteraction) {
-            this.setUserValue(e.value);
+            this.setValue(e.value);
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPValueWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1672,13 +1654,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 args: ['header']
             }] } });
 
+/** Idle period after widgets register / hydrate before committing the saved baseline. */
+const FORM_SAVED_BASELINE_IDLE_MS = 500;
 class AXPWidgetContainerComponent {
     set context(value) {
-        // Parent re-binds the same context after widget-driven updates; avoid reset() clearing dirty paths.
-        if (isEqual(this.contextService.data(), value)) {
-            return;
-        }
-        this.contextService.set(value);
+        this.syncExternalContext(value);
     }
     set functions(v) {
         this.builderService.setFunctions(v);
@@ -1687,25 +1667,38 @@ class AXPWidgetContainerComponent {
         this.contextService = inject(AXPContextStore);
         this.builderService = inject(AXPWidgetCoreService);
         this.onContextChanged = new EventEmitter();
-        /** True when user-edited context paths or composite widgets report dirty state. */
+        this.isSavedCommitted = computed(() => this.contextService.isSavedCommitted(), ...(ngDevMode ? [{ debugName: "isSavedCommitted" }] : /* istanbul ignore next */ []));
         this.isFormDirty = computed(() => {
-            this.builderService.dirtyWidgetsRevisionSignal();
-            return this.contextService.isUserDirty() || this.builderService.hasDirtyWidgets();
+            if (!this.contextService.isSavedCommitted()) {
+                return false;
+            }
+            this.contextService.data();
+            return this.contextService.isDirty();
         }, ...(ngDevMode ? [{ debugName: "isFormDirty" }] : /* istanbul ignore next */ []));
-        this.status = computed(() => {
-            return this.builderService.status();
-        }, ...(ngDevMode ? [{ debugName: "status" }] : /* istanbul ignore next */ []));
-        this.isBusy = computed(() => {
-            return this.builderService.isBusy();
-        }, ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
+        this.status = computed(() => this.builderService.status(), ...(ngDevMode ? [{ debugName: "status" }] : /* istanbul ignore next */ []));
+        this.isBusy = computed(() => this.builderService.isBusy(), ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
         effect(() => {
-            if (this.contextService.isChanged()) {
-                const changeEvent = this.contextService.changeEvent();
-                this.onContextChanged.emit({
-                    ...changeEvent,
-                    isFormDirty: this.isFormDirty(),
-                });
+            const isDirty = this.isFormDirty();
+            const data = this.contextService.data();
+            const changeEvent = this.contextService.changeEvent();
+            if (!this.contextService.isChanged() && this.lastEmittedFormDirty === isDirty) {
+                return;
+            }
+            this.lastEmittedFormDirty = isDirty;
+            this.onContextChanged.emit({
+                ...changeEvent,
+                data: cloneDeep(data),
+                isFormDirty: isDirty,
+            });
+        });
+        effect(() => {
+            if (this.contextService.isSavedCommitted()) {
+                return;
+            }
+            if (this.builderService.registeredWidgetsCount() === 0) {
+                return;
             }
+            untracked(() => void this.settleSavedBaseline());
         });
     }
     refresh() {
@@ -1714,17 +1707,61 @@ class AXPWidgetContainerComponent {
     find(name) {
         return this.builderService.waitForWidget(name);
     }
-    /** Replaces context and clears dirty tracking (discard, save reload, external reset). */
-    replaceContext(value) {
-        const next = cloneDeep(value);
-        this.contextService.clearUserDirtyPaths();
-        // After save the parent often re-binds deeply-equal data; still reset the clean baseline.
-        if (isEqual(this.contextService.data(), next)) {
-            this.contextService.commitBaseline();
-            this.builderService.notifyWidgetDirtyChanged();
+    syncExternalContext(value) {
+        const next = cloneDeep(value ?? {});
+        const current = this.contextService.data();
+        if (isEqual(current, next)) {
+            return;
+        }
+        if (this.contextService.isSavedCommitted() && this.isFormDirty()) {
+            return;
+        }
+        if (this.contextService.isSavedCommitted()) {
+            this.contextService.set(next);
+            void this.settleSavedBaseline();
+            return;
+        }
+        if (this.contextService.isChanged()) {
             return;
         }
         this.contextService.set(next);
+        void this.settleSavedBaseline();
+    }
+    /** Commits the current data as saved after widget hydration settles. */
+    settleSavedBaseline() {
+        this.clearSavedBaselineTimer();
+        return new Promise((resolve) => {
+            const commit = () => {
+                if (this.builderService.registeredWidgetsCount() === 0) {
+                    this.savedBaselineTimer = setTimeout(commit, FORM_SAVED_BASELINE_IDLE_MS);
+                    return;
+                }
+                this.contextService.commitSaved();
+                this.lastEmittedFormDirty = undefined;
+                this.savedBaselineTimer = undefined;
+                resolve();
+            };
+            this.savedBaselineTimer = setTimeout(commit, FORM_SAVED_BASELINE_IDLE_MS);
+        });
+    }
+    async replaceContext(value) {
+        this.clearSavedBaselineTimer();
+        this.contextService.set(cloneDeep(value));
+        // Commit immediately so save/replace is clean even when `set()` no-ops (data already matches).
+        this.contextService.commitSaved();
+        this.lastEmittedFormDirty = undefined;
+        await this.settleSavedBaseline();
+    }
+    revertAndSettle() {
+        this.clearSavedBaselineTimer();
+        this.contextService.revertToSaved();
+        this.lastEmittedFormDirty = undefined;
+    }
+    clearSavedBaselineTimer() {
+        if (this.savedBaselineTimer) {
+            clearTimeout(this.savedBaselineTimer);
+            this.savedBaselineTimer = undefined;
+        }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetContainerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "21.2.9", type: AXPWidgetContainerComponent, isStandalone: false, selector: "axp-widgets-container", inputs: { context: "context", functions: "functions" }, outputs: { onContextChanged: "onContextChanged" }, host: { styleAttribute: "display: contents;" }, providers: [AXPWidgetCoreService, AXPContextStore], ngImport: i0, template: `<ng-content></ng-content>`, isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
@@ -1801,6 +1838,7 @@ class AXPWidgetRendererDirective {
         this.isVisible = signal(true, ...(ngDevMode ? [{ debugName: "isVisible" }] : /* istanbul ignore next */ []));
         this.expressionEvaluators = new Map();
         this.renderTimeoutId = null;
+        this.renderGeneration = 0;
         this.hasInitialRender = false;
         this.onContextChanged = new Subject();
         this.onLoadEvent = new Subject();
@@ -2159,18 +2197,18 @@ class AXPWidgetRendererDirective {
         }
     }
     rerenderComponent() {
-        // Clear any pending render operation to prevent double rendering
         if (this.renderTimeoutId) {
             clearTimeout(this.renderTimeoutId);
             this.renderTimeoutId = null;
         }
-        // Reset loading state to allow re-rendering
-        this.isLoading.set(false);
-        // Schedule the component loading
+        const generation = ++this.renderGeneration;
         this.renderTimeoutId = setTimeout(async () => {
-            await this.loadComponent();
             this.renderTimeoutId = null;
-        });
+            if (generation !== this.renderGeneration) {
+                return;
+            }
+            await this.loadComponent();
+        }, 0);
     }
     ngOnDestroy() {
         if (this.renderTimeoutId) {
@@ -2559,7 +2597,10 @@ class AXPWidgetRendererDirective {
                 return this.contextService.data();
             },
             isDirty: () => {
-                return this.contextService.isUserDirty() || this.builderService.hasDirtyWidgets();
+                if (!this.contextService.isSavedCommitted()) {
+                    return false;
+                }
+                return this.contextService.isDirty();
             },
             /**
              * Host/widget-under-edit `options` from the shared context store (same values as