@open-mercato/checkout 0.6.5-develop.4534.1.b459babe6d → 0.6.5-develop.4559.1.839e136509

package/dist/modules/checkout/components/LinkTemplateForm.js

@@ -24,7 +24,9 @@ import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
 import { ComboboxInput } from "@open-mercato/ui/backend/inputs";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
 import { SwitchableMarkdownInput } from "@open-mercato/ui/backend/inputs";
-import { apiCall, apiCallOrThrow, readApiResultOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { collectCustomFieldValues } from "@open-mercato/ui/backend/utils/customFieldValues";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { ColorPicker } from "@open-mercato/ui/primitives/color-picker";
@@ -203,6 +205,7 @@ function normalizeFormValues(value, t) {
     primaryColor: readString(source.primaryColor).trim() || defaults.primaryColor,
     secondaryColor: readString(source.secondaryColor).trim() || defaults.secondaryColor,
     backgroundColor: readString(source.backgroundColor).trim() || defaults.backgroundColor,
+    gatewayProviderKey: readString(source.gatewayProviderKey).trim(),
     gatewaySettings: isRecord(source.gatewaySettings) ? source.gatewaySettings : {},
     customFieldsetCode: readString(source.customFieldsetCode).trim() || null,
     collectCustomerDetails: readBoolean(source.collectCustomerDetails, true),
@@ -1419,11 +1422,20 @@ function LinkTemplateForm({ mode, recordId }) {
           customFields: collectCustomFieldValues(values)
         };
         const endpoint = `/api/checkout/${mode === "link" ? "links" : "templates"}${recordId ? `/${encodeURIComponent(recordId)}` : ""}`;
-        const response = await readApiResultOrThrow(endpoint, {
-          method: recordId ? "PUT" : "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(payload)
-        });
+        let response;
+        try {
+          response = await withScopedApiRequestHeaders(
+            recordId ? buildOptimisticLockHeader(readString(initialValues?.updatedAt) || null) : {},
+            () => readApiResultOrThrow(endpoint, {
+              method: recordId ? "PUT" : "POST",
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify(payload)
+            })
+          );
+        } catch (error) {
+          if (surfaceRecordConflict(error, t)) return;
+          throw error;
+        }
         const targetId = recordId ?? (typeof response?.id === "string" ? response.id : null);
         const logoAttachmentId = readString(values.logoAttachmentId);
         if (!recordId && targetId && logoAttachmentId && logoAttachmentId !== initialLogoAttachmentIdRef.current) {
@@ -1459,7 +1471,15 @@ function LinkTemplateForm({ mode, recordId }) {
         )}&type=success` : `/backend/checkout/templates?flash=${encodeURIComponent(t("checkout.common.flash.saved"))}&type=success`;
       },
       onDelete: recordId ? async () => {
-        await apiCallOrThrow(`/api/checkout/${mode === "link" ? "links" : "templates"}/${encodeURIComponent(recordId)}`, { method: "DELETE" });
+        try {
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(readString(initialValues?.updatedAt) || null),
+            () => apiCallOrThrow(`/api/checkout/${mode === "link" ? "links" : "templates"}/${encodeURIComponent(recordId)}`, { method: "DELETE" })
+          );
+        } catch (error) {
+          if (surfaceRecordConflict(error, t)) return;
+          throw error;
+        }
         window.location.href = mode === "link" ? `/backend/checkout/pay-links?flash=${encodeURIComponent(t("checkout.common.flash.deleted"))}&type=success` : `/backend/checkout/templates?flash=${encodeURIComponent(t("checkout.common.flash.deleted"))}&type=success`;
       } : void 0
     },