@wildo-ai/saas-frontend-lib 1.1.4 → 1.1.5

package/dist/esm/components/form/automated/ResourceAutomatedForm.js

@@ -13,7 +13,8 @@ import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-run
  */
 import React, { useEffect, useMemo, useState, useCallback, useRef } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { CoreResourceOperation, CoreUserNotificationChannel, CoreUserNotificationTarget, RelationshipNature, ResourceRelationshipBulkAction, ResourcesConfig_OperationPathUtils, ResourceOperationVariantType, ErrorCustomMessageReference, ErrorType, UserNotificationLevel, ResourcesConfigOperationsUrlsBuilderUtils, Resources_SharedUtils, ResourceOperationRiskLevel, MAIN_API_BASE_PATH, } from '@wildo-ai/saas-models';
+import { z } from 'zod';
+import { CoreResourceOperation, CoreUserNotificationChannel, CoreUserNotificationTarget, RelationshipNature, ResourceRelationshipBulkAction, ResourcesConfig_OperationPathUtils, ResourceOperationVariantType, ErrorCustomMessageReference, ErrorType, UserNotificationLevel, ResourcesConfigOperationsUrlsBuilderUtils, Resources_SharedUtils, ResourceOperationRiskLevel, MAIN_API_BASE_PATH, BULK_OPERATION_SELECTOR_FIELD, } from '@wildo-ai/saas-models';
 import { OperationsConfirmCritical } from '../../../components/feedback/operations-confirm-critical.js';
 import { Button, ButtonVariants_Variant } from '../../../components/actions/button.js';
 import { AlertDialog, AlertDialogContent, AlertDialogHeader, AlertDialogFooter, AlertDialogTitle, AlertDialogDescription, AlertDialogCancel, AlertDialogAction, } from '../../../components/overlays/containers/alert-dialog.js';
@@ -22,32 +23,36 @@ import { FrontendComponentType, } from '@wildo-ai/presets-components-models';
 import { AutomatedForm } from './AutomatedForm.js';
 import { useOptionalFormTemplateContext } from './FormTemplateContext.js';
 import { ResourceFormActionsProvider, useOptionalResourceFormActions, } from './ResourceFormActionsContext.js';
-import { pickSubmissionDataPaths, sanitizeAutomatedFormSubmissionData, shouldOmitClearedFieldsForOperation } from './automated-form-submit.utils.js';
+import { carryStoredSiblingsIntoPartialWrites, pickSubmissionDataPaths, sanitizeAutomatedFormSubmissionData, shouldOmitClearedFieldsForOperation } from './automated-form-submit.utils.js';
 import { resolveCreateFormInitialValues } from './create-form-default-values.utils.js';
 import { AutomatedLayoutFrontendUtils } from '../../../core/automated-layout/automated-layout.frontend.utils.js';
 import { generateDefaultFormTemplate } from '../../../core/automated-layout/default-layout-generator.frontend.utils.js';
 import { AutosaveProvider } from '../../../components/form/automated/AutosaveContext.js';
 import { deriveAutosaveEnabledFromFields } from '../../../components/form/automated/autosave-derivation.frontend.utils.js';
 import { useOptionalAutosave } from '../../../components/form/automated/AutosaveContext.js';
+import { mutationErrorForReport } from '../../../core/resources/rmm/mutation-error-report.utils.js';
 import { extractServerValidationErrors } from '../../../components/form/validation-errors/form-error-extraction.utils.js';
 import { collectErroredFieldPaths, scrollAndFocusFirstErroredField } from '../../../components/form/validation-errors/scroll-to-first-error.utils.js';
 import { extractErrorInfo } from '../../../core/errors/errors.frontend.schemas.js';
+import { useUserFacingErrorMessage } from '../../../core/errors/useUserFacingErrorMessage.js';
 import { useServerErrorInjection } from '../../../components/form/validation-errors/useServerErrorInjection.js';
 import { LoggerFrontendService } from '../../../core/monitoring/logger.frontend.service.js';
 import { useResourceRegistry } from '../../../core/resources/useResourceRegistry.js';
-import { isSingleResourceUpdateLikeOperation, isUpdateLikeCoreOperation, mergeBulkSelectionIntoRequestData, pickPreferredOperationForCoreSemantic, resolveEffectiveCoreOperation, } from '../../../core/resources/operation-semantics.frontend.utils.js';
+import { isSingleResourceUpdateLikeOperation, isUpdateLikeCoreOperation, mergeBulkSelectionIntoRequestData, pickPreferredOperationForCoreSemantic, resolveEffectiveCoreOperation, toOperationResultSummary, } from '../../../core/resources/operation-semantics.frontend.utils.js';
 import { pickPreferredOperationForCoreSemanticAddressability } from '../../../core/resources/resource-addressability.frontend.utils.js';
 import { useOperationEnabled } from '../../../core/resources/hooks/useOperationEnabled.js';
 import { frontendResourceUtils, FrontendResourceUtils } from '../../../core/resources/frontend-resource.utils.js';
 import { resolveRelationshipWriteSurface, } from '../../../core/resources/relationship-surface-runtime.frontend.utils.js';
 import { useEventBus } from '../../../core/events/useEventBus.js';
 import { useI18n } from '../../../core/i18n/useI18n.js';
+import { resolveOperationDisplayTitle } from '../../../core/i18n/operation-title-resolution.utils.js';
 import { LoadingGate } from '../../../core/loading/LoadingGate.js';
 import { ErrorBuilderFrontend } from '../../../core/errors/errors-builder.frontend.services.js';
 import { FrontendEvents } from '../../../core/events/events.frontend.schemas.js';
 import { isForeignKey, isUnique, getZodObjectShape } from '@wildo-ai/zod-decorators';
 import { envLoader } from '../../../core/runtime/env-variable-loader.frontend.service.js';
 import { NavigationUtils } from '../../../core/navigation/navigation.utils.js';
+import { buildValidateFieldUrl } from '../../../components/form/validation-errors/validate-field-url.frontend.js';
 import { MutationPriority, MutationType, MutationSourceType, MutationErrorType, RMMEventType, ConflictStrategy, ConflictReason, MutationCancelledError, } from '../../../core/resources/rmm/types.js';
 import { useResourceRMM } from '../../../core/resources/rmm/useResourceRMM.js';
 import { useExecutionDirtyBridge } from '../../../core/execution/useExecutionDirtyBridge.js';
@@ -58,6 +63,8 @@ import { emitQuickCreateCompleted, resolveQuickCreateCreatedResourceId, } from '
 import { normalizeContextResourceIdentifiersForOutcome, normalizeContextResourceIdentifiersForTransport, } from '../../../core/resources/context-resource-identifiers.frontend.utils.js';
 import { GeneratedAssociationRelationshipField } from './GeneratedAssociationRelationshipField.js';
 import { GeneratedReferenceRelationshipField } from './GeneratedReferenceRelationshipField.js';
+import { buildInlineUpdateRequestData } from '../../../components/data-display/display-field-resolution.utils.js';
+import { describeResourceErrorForNotification } from '../../../components/form/validation-errors/resource-error-notification-context.utils.js';
 const logger = LoggerFrontendService.getLogger();
 const logDebug = logger.debugByType('ResourceAutomatedForm');
 logger.setDebugTypeLogging('ResourceAutomatedForm', false);
@@ -177,9 +184,12 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
     // Contexts
     const { doOperation, registry } = useResourceRegistry();
     const { emit } = useEventBus();
-    const { tComponent, isReady } = useI18n({
+    const { tComponent, tResourceOperation, isReady } = useI18n({
         component: FrontendComponentType.RESOURCES_LAYOUTS_CREATE,
+        resource: resourceContext.resourceType,
     });
+    // Stable identity, so the data-fetch effect may call it without listing it.
+    const toUserFacingErrorMessage = useUserFacingErrorMessage();
     // Refs for stable function references (avoid infinite loops in useEffect)
     const doOperationRef = useRef(doOperation);
     const emitRef = useRef(emit);
@@ -219,6 +229,12 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
     const [isSubmitting, setIsSubmitting] = useState(false);
     const [isSavingDraft, setIsSavingDraft] = useState(false);
     const [defaultValues, setDefaultValues] = useState(undefined);
+    /**
+     * A failed load of the record the form edits. `wildoError` is the classified failure (context carries the
+     * original message, stack and HTTP facts for inspection); `message` is the ONLY text the alert renders,
+     * resolved from the caught error at catch time. The alert used to render `context.originalErrorMessage`,
+     * which for a backend rejection is the i18n reference (`not_found`, `authorization`) (#1160).
+     */
     const [fetchError, setFetchError] = useState(null);
     // Store form methods for setting server errors on individual fields
     const formMethodsRef = useRef(null);
@@ -240,6 +256,29 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
         const schema = operation.requestDto;
         if (!schema) {
             logger.error(`[ResourceAutomatedForm] No requestDto found for operation ${operationIdentifier} on resource ${resourceType}`);
+            return schema;
+        }
+        /*
+         * A BULK action's selector is not a form input, so it is not in the form's schema.
+         *
+         * The bulk twin's request is the single-row request plus `_ids`, required and non-empty. The
+         * collection fills it — `mergeBulkSelectionIntoRequestData` adds the selection at EXECUTION —
+         * but the form validates BEFORE execution, against the whole request. So the resolver refused
+         * every submit on a required `_ids` that no template places and no field renders: an error
+         * with nowhere to appear. Measured on the Wonder Todos bulk "Change status": status chosen,
+         * Save changes pressed, no request sent and nothing on screen.
+         *
+         * Not panel-specific. The dialog host uses this same form, so a bulk action that asks for
+         * anything has been unable to submit from either host; only zero-input bulk actions, which
+         * execute without a form, ever reached the backend.
+         *
+         * Omitted rather than defaulted: a default would put a fake selection in the form's values,
+         * and the merge at execution is the one place that knows the real one.
+         */
+        if (operation.isBulkOperation === true
+            && schema instanceof z.ZodObject
+            && BULK_OPERATION_SELECTOR_FIELD in schema.shape) {
+            return schema.omit({ [BULK_OPERATION_SELECTOR_FIELD]: true });
         }
         return schema;
     }, [operation, operationIdentifier, resourceType]);
@@ -833,9 +872,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                 const routePaths = ResourcesConfigOperationsUrlsBuilderUtils.buildOperationFrontendRoutePaths(resourceConfig, routeBearingMutationOperation, registry.allResourceFieldIdentifiers);
                 if (routePaths.length > 0) {
                     const routePath = frontendResourceUtils.selectMatchingRoutePath(routePaths, contextResourceIdentifiersWithResourceId, resourceConfig.resourceIdentifier, resourceFieldIdentifier, resourceContext.parentResourcesRequirements);
-                    // Frontend route paths omit `MAIN_API_BASE_PATH` (`/api/v1`); this `basePath`
-                    // is used to build BACKEND API endpoints (the `validate-field` route), so it
-                    // must carry the API prefix — same reason as the upload endpoint below.
+                    // Frontend route paths omit `MAIN_API_BASE_PATH` (`/api/v1`), so this carries the prefix.
+                    // NOTE it no longer serves `validate-field` (#1238): that route is mounted on the CREATE
+                    // operation's initiator-info URL and must not carry a route segment such as `/create`.
+                    // The upload endpoint below builds its own URL from `apiBaseUrl` + contextual parameters.
                     basePath = `${MAIN_API_BASE_PATH}${routePath.url}`;
                     basePath = NavigationUtils.resolveUrlPath(basePath, contextualParameters);
                     if (basePath && NavigationUtils.hasUnresolvedPlaceholders(basePath)) {
@@ -989,8 +1029,52 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
         );
         if (!hasServerValidatedFields)
             return undefined;
-        return `${resourceApiBase.apiBaseUrl}${resourceApiBase.basePath}/validate-field`;
-    }, [resourceApiBase, resourceConfig]);
+        /*
+         * Built from the CREATE operation's INITIATOR INFO, not from `resourceApiBase.basePath` (#1238).
+         *
+         * `basePath` is the FRONTEND ROUTE of the create surface, so on a create form it carries the
+         * `/create` segment and the request went to `…/todo-lists/create/validate-field` — a path the
+         * backend does not serve. It answered 404, and `useFieldUniquenessValidation` treats a failed
+         * check as "no conflict found", so the whole early-warning affordance was dead on every create
+         * form with nothing to see: a 404 and a genuinely free value are indistinguishable to the person.
+         *
+         * The backend mounts this route on `createOperation.initiatorInfos[].url`
+         * (`validate-field-handler.backend.service.ts`, "Register routes for each parent combination"),
+         * which is the API collection URL and has no route segment beyond the resource. Selecting the
+         * initiator here puts both sides on ONE authority instead of two descriptions of the same path —
+         * and `selectOperationUrlInitiatorInfo`'s own contract is that its algorithm "must stay in sync
+         * with backend URL generation", which is precisely the question being asked.
+         *
+         * The CREATE operation is used even on an UPDATE form, deliberately: the backend registers this
+         * route from the CREATE operation alone and authorizes it with CREATE rights, because field
+         * validation is a create-surface helper. An update form reaches the same path and passes
+         * `excludeId`.
+         */
+        const createOperation = pickPreferredOperationForCoreSemantic(resourceConfig.operations ?? [], CoreResourceOperation.CREATE);
+        const initiatorInfo = createOperation?.initiatorInfos?.length
+            ? FrontendResourceUtils.selectOperationUrlInitiatorInfo({
+                initiatorInfos: createOperation.initiatorInfos,
+                contextualParameters: resourceApiBase.contextualParameters,
+                targetResourceType: resourceConfig.resourceIdentifier,
+                targetDefaultFieldIdentifier: resourceApiBase.resourceFieldIdentifier,
+                parentResourcesRequirements: resourceContext.parentResourcesRequirements,
+            })
+            : undefined;
+        if (!initiatorInfo)
+            return undefined;
+        const composed = buildValidateFieldUrl({
+            apiBaseUrl: resourceApiBase.apiBaseUrl,
+            initiatorInfo,
+            contextualParameters: resourceApiBase.contextualParameters,
+        });
+        if (!composed) {
+            logger.warn('[ResourceAutomatedForm] validate-field URL has unresolved parameters; blur-time validation disabled', {
+                initiatorUrl: initiatorInfo.url,
+                resourceType,
+            });
+        }
+        return composed;
+    }, [resourceApiBase, resourceConfig, resourceContext.parentResourcesRequirements, resourceType]);
     /**
      * Resource ID for UPDATE operations.
      * Passed as excludeId to the validate-field endpoint so server-side validation
@@ -1145,7 +1229,9 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         httpContext: errorInfo.context,
                     },
                 });
-                setFetchError(wildoError);
+                // Resolved from the CAUGHT error, not from `wildoError`: the synthesized reference would hide the real
+                // cause (a permission refusal, a network failure) behind a generic "not available".
+                setFetchError({ wildoError, message: toUserFacingErrorMessage(error) });
                 onErrorRef.current?.(originalError);
             }
         };
@@ -1177,11 +1263,19 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                     if (isConflictMutationFailure(mutationResult)) {
                         return;
                     }
+                    /*
+                     * Report the transport failure ITSELF (`error.cause`), not a fresh `Error` rebuilt from its message.
+                     * The caught error carries the backend's `wildoError` — its reference and type — and a new `Error`
+                     * dropped both: a save the server refused for a stated reason (`409
+                     * organization_unit_directory_managed`) reached the person as "Unexpected error", classified as an
+                     * uncaught exception (#1447). The rebuilt `Error` stays only as the fallback for a failure with no
+                     * transport error behind it.
+                     */
                     if (mutationResult.error?.type === MutationErrorType.VALIDATION) {
-                        onErrorRef.current?.(new Error(mutationResult.error.message ?? 'Validation failed'));
+                        onErrorRef.current?.(mutationErrorForReport(mutationResult.error, 'Validation failed'));
                         return;
                     }
-                    throw new Error(mutationResult.error?.message ?? 'Submit failed');
+                    throw mutationErrorForReport(mutationResult.error, 'Submit failed');
                 }
                 result = mutationResult.responseData;
             }
@@ -1217,9 +1311,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         contextResourceIdentifiers: resourceContext.contextResourceIdentifiers,
                         resourceType,
                         result,
+                        isBulkOperation: resourceContext.operation?.isBulkOperation === true,
                     }),
                     parentResourcesRequirements: resourceContext.parentResourcesRequirements || [],
-                    resultSummary: typeof result === 'object' && result !== null ? result : undefined,
+                    resultSummary: toOperationResultSummary(result),
                     additionalContext: {
                         ...resourceContext.additionalContext,
                         notificationIdentifier: frontendNotification.identifier,
@@ -1276,8 +1371,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         // Carry the backend error reference + status so the notification layer
                         // can resolve a localized human message (tErrorMessage) instead of
                         // falling back to the operation title. See NotificationContext.resolveMessage.
-                        errorCustomMessageReference: error?.customMessageReference,
-                        errorHttpStatus: error?.httpStatus,
+                        ...describeResourceErrorForNotification(error),
                     },
                 });
             }
@@ -1350,7 +1444,14 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
         };
         // Check if already aborted before starting
         checkAborted();
-        const requestData = mergeRequestDataWithBulkSelection({ [fieldName]: value });
+        // A composite child autosaves under its dotted path (`address.city`). This handler supplies the
+        // RMM's `transportOverride.requestData`, which the RMM sends as given, so the body must already be
+        // in the resource's own shape: the WHOLE top-level field with the edit written into it. A flat
+        // dotted key is dropped by the strict UPDATE parse with a 200, and a bare nested fragment would
+        // erase the siblings, because an UPDATE replaces a nested object (#1395). The stored parent comes
+        // from the RMM's confirmed state, the last thing the server said; without an RMM, from the form.
+        const storedRecord = (rmm?.getSnapshot().confirmedData ?? formMethodsRef.current?.getValues() ?? null);
+        const requestData = mergeRequestDataWithBulkSelection(buildInlineUpdateRequestData(storedRecord, fieldName, value));
         // Check abort again after shaping the request payload.
         checkAborted();
         const operationPromise = rmm
@@ -1429,7 +1530,11 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
         }
         try {
             let result;
-            const requestData = mergeRequestDataWithBulkSelection(sanitizedData);
+            // A section may hold only SOME of a composite's children, and an UPDATE replaces the nested
+            // object whole — so the body carries the stored siblings of every partially-written parent
+            // (#1410). Stored = the RMM's confirmed state, or on the direct lane the record the form loaded.
+            const storedRecord = (rmm ? rmm.getSnapshot().confirmedData : defaultValues);
+            const requestData = mergeRequestDataWithBulkSelection(carryStoredSiblingsIntoPartialWrites(sanitizedData, fieldNames, storedRecord));
             if (rmm) {
                 const mutationResult = await rmm.queueMutation(sanitizedData, {
                     type: MutationType.SECTION,
@@ -1445,10 +1550,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         return;
                     }
                     if (mutationResult.error?.type === MutationErrorType.VALIDATION) {
-                        onErrorRef.current?.(new Error(mutationResult.error.message ?? 'Section save validation failed'));
+                        onErrorRef.current?.(mutationErrorForReport(mutationResult.error, 'Section save validation failed'));
                         return;
                     }
-                    throw new Error(mutationResult.error?.message ?? 'Section save failed');
+                    throw mutationErrorForReport(mutationResult.error, 'Section save failed');
                 }
                 result = mutationResult.responseData;
             }
@@ -1470,9 +1575,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                     contextResourceIdentifiers: resourceContext.contextResourceIdentifiers,
                     resourceType,
                     result,
+                    isBulkOperation: resourceContext.operation?.isBulkOperation === true,
                 }),
                 parentResourcesRequirements: resourceContext.parentResourcesRequirements || [],
-                resultSummary: typeof result === 'object' && result !== null ? result : undefined,
+                resultSummary: toOperationResultSummary(result),
                 additionalContext: {
                     ...resourceContext.additionalContext,
                     sectionRef,
@@ -1500,7 +1606,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                     ...resourceContext.additionalContext,
                     sectionRef,
                     error: err.message,
-                    errorCustomMessageReference: error?.customMessageReference,
+                    ...describeResourceErrorForNotification(error),
                 },
             });
         }
@@ -1509,6 +1615,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
         currentOperationTransportOverride,
         contextFieldValues,
         contextualParameters,
+        defaultValues,
         hiddenFieldNames,
         mergeRequestDataWithBulkSelection,
         resourceContext,
@@ -1609,7 +1716,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         if (isConflictMutationFailure(mutationResult)) {
                             return;
                         }
-                        throw new Error(mutationResult.error?.message ?? 'Draft save failed');
+                        throw mutationErrorForReport(mutationResult.error, 'Draft save failed');
                     }
                     result = mutationResult.responseData;
                 }
@@ -1632,9 +1739,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         contextResourceIdentifiers: resourceContext.contextResourceIdentifiers,
                         resourceType,
                         result,
+                        isBulkOperation: resourceContext.operation?.isBulkOperation === true,
                     }),
                     parentResourcesRequirements: resourceContext.parentResourcesRequirements || [],
-                    resultSummary: typeof result === 'object' && result !== null ? result : undefined,
+                    resultSummary: toOperationResultSummary(result),
                     additionalContext: {
                         ...resourceContext.additionalContext,
                         notificationIdentifier: 'draftSaved',
@@ -1661,7 +1769,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         notificationIdentifier: 'draftSaveFailed',
                         // Fallback if the 'draftSaveFailed' label is absent: resolveMessage then
                         // degrades to the localized backend error rather than the generic default.
-                        errorCustomMessageReference: error?.customMessageReference,
+                        ...describeResourceErrorForNotification(error),
                     },
                 });
             }
@@ -1712,7 +1820,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         if (isConflictMutationFailure(mutationResult)) {
                             return;
                         }
-                        throw new Error(mutationResult.error?.message ?? 'Publish failed');
+                        throw mutationErrorForReport(mutationResult.error, 'Publish failed');
                     }
                     result = mutationResult.responseData;
                 }
@@ -1737,9 +1845,10 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                             contextResourceIdentifiers: resourceContext.contextResourceIdentifiers,
                             resourceType,
                             result,
+                            isBulkOperation: resourceContext.operation?.isBulkOperation === true,
                         }),
                         parentResourcesRequirements: resourceContext.parentResourcesRequirements || [],
-                        resultSummary: typeof result === 'object' && result !== null ? result : undefined,
+                        resultSummary: toOperationResultSummary(result),
                         additionalContext: {
                             ...resourceContext.additionalContext,
                             notificationIdentifier: frontendNotification.identifier,
@@ -1767,7 +1876,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
                         notificationIdentifier: 'publishFailed',
                         // Fallback if the 'publishFailed' label is absent: resolveMessage then
                         // degrades to the localized backend error rather than the generic default.
-                        errorCustomMessageReference: error?.customMessageReference,
+                        ...describeResourceErrorForNotification(error),
                     },
                 });
             }
@@ -1819,12 +1928,9 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
     // action label in the confirm dialog. This is the form-submit twin of the
     // confirm-dialog gate in `useResourceOperationActions`.
     const isCriticalOperation = operation.riskLevel === ResourceOperationRiskLevel.CRITICAL;
-    const criticalConfirmationPhrase = useMemo(() => {
-        // Humanise the operation identifier (e.g. `reset_to_defaults` → "Reset to
-        // defaults"), matching the action-bar phrase for custom operations.
-        const opId = String(operation.operationIdentifier);
-        return opId.charAt(0).toUpperCase() + opId.slice(1).replace(/_/g, ' ').toLowerCase();
-    }, [operation.operationIdentifier]);
+    // The operation's own name, resolved exactly as the action bar names it — so the phrase to type is
+    // the label the person clicked.
+    const criticalConfirmationPhrase = useMemo(() => resolveOperationDisplayTitle(tResourceOperation, resourceType, String(operation.operationIdentifier)), [tResourceOperation, resourceType, operation.operationIdentifier]);
     const handleSubmitWithCriticalGuard = useCallback((data) => {
         if (isCriticalOperation) {
             setPendingCriticalSubmit(data);
@@ -1962,13 +2068,7 @@ export function ResourceAutomatedForm({ resourceContext, onSuccess, onError, onC
     // Error state if fetch failed
     if (fetchError) {
         const errorTitle = tComponent(FrontendComponentType.RESOURCES_LAYOUTS_CREATE, 'failedToLoadData');
-        // Type-safe access to error context - use type assertion to help TypeScript
-        const errorContext = fetchError.context;
-        const customMessageReference = fetchError.customMessageReference;
-        const errorMessage = (errorContext && typeof errorContext === 'object' && 'originalErrorMessage' in errorContext
-            ? errorContext.originalErrorMessage
-            : undefined) || customMessageReference;
-        return (_jsx("div", { className: className, children: _jsxs("div", { className: "p-card bg-destructive/10 border border-destructive rounded-lg", role: "alert", children: [_jsx("p", { className: "text-destructive font-medium", children: errorTitle }), _jsx("p", { className: "text-sm text-destructive/80 mt-item-xs", children: errorMessage })] }) }));
+        return (_jsx("div", { className: className, children: _jsxs("div", { className: "p-card bg-destructive/10 border border-destructive rounded-lg", role: "alert", children: [_jsx("p", { className: "text-destructive font-medium", children: errorTitle }), _jsx("p", { className: "text-sm text-destructive/80 mt-item-xs", children: fetchError.message })] }) }));
     }
     // EA: the operation is no longer available for THIS record (its
     // `enabledCondition` is unmet now that the real object is loaded — e.g. a