@quadrel-enterprise-ui/framework 20.9.1-beta.137.1 → 20.10.0-beta.139.1

package/fesm2022/quadrel-enterprise-ui-framework.mjs

@@ -27062,6 +27062,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.18", ngImpo
                 type: Input
             }] } });
 
+class QdPageCommitActionExecutor {
+    static execute(action, values, context) {
+        const { formGroupManager, navigationInterceptor, destroyed$, onAfterSnapshot } = context;
+        const captured = formGroupManager.captureFormValues();
+        let result$;
+        navigationInterceptor.executeWithBypass(() => {
+            const handlerResult = action.handler(values);
+            if (isObservable(handlerResult))
+                result$ = handlerResult;
+        });
+        const applySuccess = () => {
+            formGroupManager.setFormGroupsSnapshot(captured);
+            navigationInterceptor.executeWithBypass(() => {
+                onAfterSnapshot?.();
+                try {
+                    action.onSuccess?.();
+                }
+                catch (err) {
+                    console.error('QD-UI | QdPage - onSuccess callback threw after form was marked as saved.', err);
+                }
+            });
+        };
+        if (result$) {
+            result$.pipe(take(1), takeUntil(destroyed$)).subscribe({
+                next: ok => {
+                    if (ok)
+                        applySuccess();
+                },
+                error: err => console.error('QD-UI | QdPage - Commit action observable errored — form was not marked as saved. Catch errors via catchError() in your handler.', err)
+            });
+        }
+        else {
+            applySuccess();
+        }
+    }
+}
+
 /**
  * The QdFormGroupManagerService provides centralized registration, snapshotting, and value tracking
  * for multiple Angular `FormGroup` instances. It supports efficient state restoration, including dynamic
@@ -27180,7 +27217,7 @@ class QdFormGroupManagerService {
      * Captures a deep-cloned snapshot of all current form values without mutating internal state.
      *
      * Used by framework orchestration code that needs to remember the "at click time" state of a form
-     * so the baseline can later be committed to exactly that state — even if the user edits the form
+     * so the snapshot can later be set to exactly those values — even if the user edits the form
      * while an async commit action is pending.
      *
      * Throws if any form value is not structured-cloneable (functions, symbols, DOM nodes).
@@ -27192,7 +27229,7 @@ class QdFormGroupManagerService {
                 captured.set(key, structuredClone(fg.getRawValue()));
             }
             catch (err) {
-                throw new Error(`QdFormGroupManagerService: captureFormValues() failed for group "${key}". ` +
+                throw new Error(`QD-UI | QdFormGroupManager - captureFormValues() failed for group "${key}". ` +
                     `Form values must be structured-cloneable. Non-cloneable values like functions, ` +
                     `symbols, or DOM nodes are not supported. Original error: ${String(err)}`);
             }
@@ -27200,13 +27237,13 @@ class QdFormGroupManagerService {
         return captured;
     }
     /**
-     * Replaces the internal baseline snapshot with the provided values.
+     * Replaces the internal saved snapshot with the provided values.
      *
-     * Intended to be paired with `captureFormValues()` so that the baseline can be advanced to the
-     * values present when a commit action was initiated — independent of whether the user edited the
-     * form in the meantime.
+     * Intended to be paired with `captureFormValues()` so that the snapshot can be set to the
+     * values present when a commit action was initiated — independent of whether the user edited
+     * the form in the meantime.
      */
-    commitBaseline(values) {
+    setFormGroupsSnapshot(values) {
         values.forEach((snapshot, key) => this._formGroupsSnapshot.set(key, snapshot));
     }
     restoreFormGroupsFromSnapshot() {
@@ -27218,20 +27255,6 @@ class QdFormGroupManagerService {
         });
         this.cancelPendingAsyncValidation();
     }
-    restoreFormGroup(fg, snapshot) {
-        Object.entries(fg.controls).forEach(([ctrlKey, ctrl]) => {
-            const newValue = snapshot[ctrlKey];
-            if (ctrl instanceof FormArray && Array.isArray(newValue)) {
-                this.resetFormArrayToValues(ctrl, newValue);
-            }
-            else if (ctrl instanceof FormGroup && newValue && typeof newValue === 'object') {
-                this.restoreFormGroup(ctrl, newValue);
-            }
-            else {
-                ctrl.reset(newValue);
-            }
-        });
-    }
     /**
      * Cancels any in-flight async validators on all registered form groups.
      *
@@ -27255,6 +27278,20 @@ class QdFormGroupManagerService {
             }
         });
     }
+    restoreFormGroup(fg, snapshot) {
+        Object.entries(fg.controls).forEach(([ctrlKey, ctrl]) => {
+            const newValue = snapshot[ctrlKey];
+            if (ctrl instanceof FormArray && Array.isArray(newValue)) {
+                this.resetFormArrayToValues(ctrl, newValue);
+            }
+            else if (ctrl instanceof FormGroup && newValue && typeof newValue === 'object') {
+                this.restoreFormGroup(ctrl, newValue);
+            }
+            else {
+                ctrl.reset(newValue);
+            }
+        });
+    }
     collectPendingControls(control) {
         const result = [];
         if (control instanceof FormGroup) {
@@ -27336,14 +27373,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.18", ngImpo
  *
  * #### When navigation is allowed
  *
- * - No unsaved changes exist — the form is either pristine or the framework has advanced the
- *   baseline after a successful commit action (Submit, Save, SaveDraft).
+ * - No unsaved changes exist — the form is either pristine or the framework has updated the
+ *   saved snapshot after a successful commit action (Submit, Save, SaveDraft).
  * - The page switches to view mode via `deactivate()`.
  *
- * The service has no concept of "pending actions" or bypass windows. Framework actions advance the
- * baseline directly via `QdFormGroupManagerService.commitBaseline(...)`; cancel-discard flows reset
- * the baseline via `restoreFormGroupsFromSnapshot()`. Either way, the interceptor only observes the
- * resulting form state — there is no time window where a bypass is active.
+ * The service has no concept of "pending actions" or bypass windows. Framework actions update the
+ * saved snapshot directly via `QdFormGroupManagerService.setFormGroupsSnapshot(...)`; cancel-discard
+ * flows reset the form to the saved snapshot via `restoreFormGroupsFromSnapshot()`. Either way, the
+ * interceptor only observes the resulting form state — there is no time window where a bypass is active.
  */
 class QdPageNavigationInterceptorService {
     router = inject(Router);
@@ -27651,38 +27688,17 @@ class QdPageObjectHeaderComponent {
     }
     save() {
         const saveAction = this.saveButton;
-        const applySuccess = (captured) => {
-            this.formGroupManagerService.cancelPendingAsyncValidation();
-            this.pageStoreService.toggleViewonly(true);
-            if (captured) {
-                this.formGroupManagerService.commitBaseline(captured);
-            }
-            else {
-                this.formGroupManagerService.takeFormGroupsSnapshot();
-            }
-            saveAction?.onSuccess?.();
-        };
-        if (!saveAction?.handler) {
-            this.navigationInterceptor.executeWithBypass(() => applySuccess(null));
+        if (!saveAction)
             return;
-        }
-        const captured = this.formGroupManagerService.captureFormValues();
-        let result;
-        this.navigationInterceptor.executeWithBypass(() => {
-            result = saveAction.handler(this.formGroupManagerService.getAllValues());
+        QdPageCommitActionExecutor.execute(saveAction, this.formGroupManagerService.getAllValues(), {
+            formGroupManager: this.formGroupManagerService,
+            navigationInterceptor: this.navigationInterceptor,
+            destroyed$: this._destroyed$,
+            onAfterSnapshot: () => {
+                this.formGroupManagerService.cancelPendingAsyncValidation();
+                this.pageStoreService.toggleViewonly(true);
+            }
         });
-        if (isObservable(result)) {
-            result.pipe(take(1), takeUntil(this._destroyed$)).subscribe({
-                next: ok => {
-                    if (ok)
-                        this.navigationInterceptor.executeWithBypass(() => applySuccess(captured));
-                },
-                error: err => console.error('QdPage save action observable errored — baseline not committed. Catch errors via catchError() in your handler.', err)
-            });
-        }
-        else {
-            this.navigationInterceptor.executeWithBypass(() => applySuccess(captured));
-        }
     }
     changeContext(context, selection, event) {
         event.stopPropagation();
@@ -28771,7 +28787,7 @@ class QdPageSubmitActionService {
                 key: 'submit',
                 action: {
                     titleI18n: this._labelI18n,
-                    handler: () => this.executeSubmit(),
+                    handler: (...args) => this.executeSubmit(...args),
                     isDisabled: true,
                     isVisible: this._isVisible,
                     type: QdFooterActionType.Primary
@@ -28779,33 +28795,16 @@ class QdPageSubmitActionService {
             }
         ]);
     }
-    executeSubmit() {
+    executeSubmit(...args) {
         const action = this._submitAction;
-        if (!action?.handler)
+        if (!action)
             return;
-        const values = this.formGroupManagerService.hasFormGroups()
-            ? this.formGroupManagerService.getAllValues()
-            : undefined;
-        const captured = this.formGroupManagerService.captureFormValues();
-        let result;
-        this.navigationInterceptor.executeWithBypass(() => {
-            result = action.handler(values);
+        const values = this.formGroupManagerService.hasFormGroups() ? this.formGroupManagerService.getAllValues() : args;
+        QdPageCommitActionExecutor.execute(action, values, {
+            formGroupManager: this.formGroupManagerService,
+            navigationInterceptor: this.navigationInterceptor,
+            destroyed$: this._destroyed$
         });
-        if (isObservable(result)) {
-            result.pipe(take(1), takeUntil(this._destroyed$)).subscribe({
-                next: ok => {
-                    if (!ok)
-                        return;
-                    this.formGroupManagerService.commitBaseline(captured);
-                    this.navigationInterceptor.executeWithBypass(() => action.onSuccess?.());
-                },
-                error: err => console.error('QdPage commit action observable errored — baseline not committed. Catch errors via catchError() in your handler.', err)
-            });
-        }
-        else {
-            this.formGroupManagerService.commitBaseline(captured);
-            this.navigationInterceptor.executeWithBypass(() => action.onSuccess?.());
-        }
     }
     trackFormValidity() {
         this._cancelTrackFormValidity$.next();
@@ -28820,7 +28819,7 @@ class QdPageSubmitActionService {
                 key: 'submit',
                 action: {
                     titleI18n: this._labelI18n,
-                    handler: () => this.executeSubmit(),
+                    handler: (...args) => this.executeSubmit(...args),
                     isDisabled: !isValid,
                     isVisible: this._isVisible,
                     type: QdFooterActionType.Primary
@@ -29315,7 +29314,7 @@ class QdPageComponent {
         if (this.config.pageType === 'create' && this.config?.pageTypeConfig?.cancel !== undefined)
             this.handleCancelActionWithFormChanges();
         if (this.config.pageType === 'create' && this.config?.pageTypeConfig?.saveDraft !== undefined)
-            this.initSaveDraftFooterAction();
+            this.initSaveDraftFooterAction(this.config.pageTypeConfig.saveDraft);
         if (this.config.pageType === 'inspect')
             this.pageStoreService.isViewonly$
                 .pipe(takeUntil(this._destroyed$))
@@ -29371,15 +29370,14 @@ class QdPageComponent {
             ]);
         });
     }
-    initSaveDraftFooterAction() {
-        const pageTypeConfig = this.config.pageTypeConfig;
+    initSaveDraftFooterAction(saveDraft) {
         this.footerService.setActions([
             {
                 key: 'saveDraft',
                 action: {
-                    titleI18n: pageTypeConfig.saveDraft.label?.i18n ?? 'i18n.qd.page.footer.saveDraft',
+                    titleI18n: saveDraft.label?.i18n ?? 'i18n.qd.page.footer.saveDraft',
                     type: QdFooterActionType.Secondary,
-                    handler: this.generateCommitActionHandler(pageTypeConfig.saveDraft),
+                    handler: this.generateCommitActionHandler(saveDraft),
                     isVisible: true,
                     isDisabled: false
                 }
@@ -29408,29 +29406,12 @@ class QdPageComponent {
     }
     generateCommitActionHandler(action) {
         return (...args) => {
-            if (!action?.handler)
-                return;
             const values = this.formGroupManagerService.hasFormGroups() ? this.formGroupManagerService.getAllValues() : args;
-            const captured = this.formGroupManagerService.captureFormValues();
-            let result;
-            this.navigationInterceptor.executeWithBypass(() => {
-                result = action.handler(values);
+            QdPageCommitActionExecutor.execute(action, values, {
+                formGroupManager: this.formGroupManagerService,
+                navigationInterceptor: this.navigationInterceptor,
+                destroyed$: this._destroyed$
             });
-            if (isObservable(result)) {
-                result.pipe(take(1), takeUntil(this._destroyed$)).subscribe({
-                    next: ok => {
-                        if (!ok)
-                            return;
-                        this.formGroupManagerService.commitBaseline(captured);
-                        this.navigationInterceptor.executeWithBypass(() => action.onSuccess?.());
-                    },
-                    error: err => console.error('QdPage commit action observable errored — baseline not committed. Catch errors via catchError() in your handler.', err)
-                });
-            }
-            else {
-                this.formGroupManagerService.commitBaseline(captured);
-                this.navigationInterceptor.executeWithBypass(() => action.onSuccess?.());
-            }
         };
     }
     setupCancelConfirmation() {
@@ -32728,9 +32709,11 @@ class QdQuickEditComponent {
         window.setTimeout(() => this.focusFirstControl());
     }
     removeRow(index) {
-        if (this.config.removeConfirmationMessage) {
+        const { hasRemoveConfirmation, removeConfirmationMessage } = this.config;
+        if (hasRemoveConfirmation || removeConfirmationMessage) {
+            const message = removeConfirmationMessage ?? { i18n: 'i18n.qd.quick.edit.removeConfirmation.message' };
             this.confirmationDialogService
-                .showConfirmDialog({ message: this.config.removeConfirmationMessage }, (this.testId ?? 'quick-edit') + '-remove-confirmation')
+                .showConfirmDialog({ message }, (this.testId ?? 'quick-edit') + '-remove-confirmation')
                 .pipe(filter$1(confirmed => confirmed))
                 .subscribe(() => this.executeRemoveRow(index));
             return;