@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

package/dist/modules/catalog/backend/catalog/products/[id]/page.js

@@ -2,7 +2,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import Link from "next/link";
-import dynamic from "next/dynamic";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
 import { ErrorMessage, RecordNotFoundState } from "@open-mercato/ui/backend/detail";
 import {
@@ -16,6 +15,7 @@ import {
 import { createCrudFormError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { collectCustomFieldValues } from "@open-mercato/ui/backend/utils/customFieldValues";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
+import MarkdownField from "@open-mercato/ui/backend/inputs/MarkdownField";
 import { Button } from "@open-mercato/ui/primitives/button";
 import { Input } from "@open-mercato/ui/primitives/input";
 import { Label } from "@open-mercato/ui/primitives/label";
@@ -30,11 +30,13 @@ import { TagsInput } from "@open-mercato/ui/backend/inputs/TagsInput";
 import { Textarea } from "@open-mercato/ui/primitives/textarea";
 import { DataLoader } from "@open-mercato/ui/primitives/DataLoader";
 import { extractCustomFieldEntries } from "@open-mercato/shared/lib/crud/custom-fields-client";
-import { Spinner } from "@open-mercato/ui/primitives/spinner";
 import {
   apiCall,
-  readApiResultOrThrow
+  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 { useT } from "@open-mercato/shared/lib/i18n/context";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { E } from "../../../../../../generated/entities.ids.generated.js";
@@ -53,6 +55,8 @@ import {
   createLocalId,
   slugify,
   formatTaxRateLabel,
+  normalizeTaxRateSummary,
+  mergeTaxRateSummaries,
   buildOptionSchemaDefinition,
   convertSchemaToProductOptions,
   normalizePriceKindSummary,
@@ -104,10 +108,6 @@ import {
   DialogTitle
 } from "@open-mercato/ui/primitives/dialog";
 import { SendObjectMessageDialog } from "@open-mercato/ui/backend/messages/SendObjectMessageDialog.tsx";
-const MarkdownEditor = dynamic(() => import("@uiw/react-md-editor"), {
-  ssr: false,
-  loading: () => /* @__PURE__ */ jsx("div", { className: "flex h-48 items-center justify-center text-sm text-muted-foreground", children: /* @__PURE__ */ jsx(Spinner, {}) })
-});
 function mapVariantPriceSummary(item) {
   if (!item) return null;
   const getString2 = (value) => {
@@ -164,7 +164,8 @@ function readProductConversionRows(items) {
       unitCode,
       toBaseFactor: String(factor),
       sortOrder: String(sortOrderRaw),
-      isActive
+      isActive,
+      updatedAt: typeof item.updated_at === "string" ? item.updated_at : typeof item.updatedAt === "string" ? item.updatedAt : null
     };
   }).filter((entry) => Boolean(entry));
 }
@@ -192,6 +193,31 @@ function EditCatalogProductPage({
   const initialConversionsRef = React.useRef([]);
   const [categorizeOptions, setCategorizeOptions] = React.useState({ categories: [], channels: [], tags: [] });
   const [variantMediaGroups, setVariantMediaGroups] = React.useState([]);
+  const parseTaxRateSummary = React.useCallback(
+    (item) => normalizeTaxRateSummary(
+      item,
+      t("catalog.products.create.taxRates.unnamed", "Untitled tax rate")
+    ),
+    [t]
+  );
+  const fetchTaxRateById = React.useCallback(
+    async (taxRateId) => {
+      const payload = await readApiResultOrThrow(
+        `/api/sales/tax-rates?id=${encodeURIComponent(taxRateId)}&pageSize=1`,
+        void 0,
+        {
+          errorMessage: t(
+            "catalog.products.create.taxRates.error",
+            "Failed to load tax rates."
+          ),
+          fallback: { items: [] }
+        }
+      );
+      const items = Array.isArray(payload.items) ? payload.items : [];
+      return items.map((item) => parseTaxRateSummary(item)).find((item) => item?.id === taxRateId) ?? null;
+    },
+    [parseTaxRateSummary, t]
+  );
   const loadVariants = React.useCallback(async (id) => {
     try {
       const [variantsRes, pricesRes] = await Promise.all([
@@ -239,7 +265,8 @@ function EditCatalogProductPage({
           isDefault: Boolean(variant.is_default ?? variant.isDefault),
           defaultMediaId: typeof variant.default_media_id === "string" ? variant.default_media_id : typeof variant.defaultMediaId === "string" ? variant.defaultMediaId : null,
           prices: priceMap[variantId] ?? [],
-          optionValues
+          optionValues,
+          updatedAt: typeof variant.updatedAt === "string" ? variant.updatedAt : typeof variant.updated_at === "string" ? variant.updated_at : null
         };
       }).filter((entry) => Boolean(entry));
       setVariants(mapped);
@@ -328,21 +355,7 @@ function EditCatalogProductPage({
         });
         const items = Array.isArray(payload.items) ? payload.items : [];
         setTaxRates(
-          items.map((item) => {
-            const rawRate = typeof item.rate === "number" ? item.rate : Number(item.rate ?? Number.NaN);
-            return {
-              id: String(item.id),
-              name: typeof item.name === "string" && item.name.trim().length ? item.name : t(
-                "catalog.products.create.taxRates.unnamed",
-                "Untitled tax rate"
-              ),
-              code: typeof item.code === "string" && item.code.trim().length ? item.code : null,
-              rate: Number.isFinite(rawRate) ? rawRate : null,
-              isDefault: Boolean(
-                typeof item.isDefault === "boolean" ? item.isDefault : typeof item.is_default === "boolean" ? item.is_default : false
-              )
-            };
-          })
+          items.map((item) => parseTaxRateSummary(item)).filter((item) => item !== null)
         );
       } catch (err) {
         console.error("sales.tax-rates.fetch failed", err);
@@ -351,7 +364,15 @@ function EditCatalogProductPage({
     };
     loadTaxRates().catch(() => {
     });
-  }, [t]);
+  }, [parseTaxRateSummary, t]);
+  React.useEffect(() => {
+    const taxRateId = initialValues?.taxRateId;
+    if (!taxRateId || taxRates.some((rate) => rate.id === taxRateId)) return;
+    fetchTaxRateById(taxRateId).then((selected) => {
+      setTaxRates((current) => mergeTaxRateSummaries(current, selected));
+    }).catch(() => {
+    });
+  }, [fetchTaxRateById, initialValues?.taxRateId, taxRates]);
   React.useEffect(() => {
     if (!productId) {
       setLoading(false);
@@ -468,7 +489,8 @@ function EditCatalogProductPage({
           customFieldsetCode: typeof record.custom_fieldset_code === "string" ? record.custom_fieldset_code : typeof record.customFieldsetCode === "string" ? record.customFieldsetCode : null,
           categoryIds,
           channelIds,
-          tags: tagValues
+          tags: tagValues,
+          updatedAt: typeof record.updatedAt === "string" ? record.updatedAt : typeof record.updated_at === "string" ? record.updated_at : null
         };
         if (!cancelled) {
           setInitialValues({ ...initial, ...customValues });
@@ -926,12 +948,16 @@ function EditCatalogProductPage({
         try {
           for (const offer of removedOffers) {
             if (!offer.id) continue;
-            await deleteCrud("catalog/offers", offer.id, {
-              errorMessage: t(
-                "catalog.products.edit.offers.deleteError",
-                "Failed to remove sales channel offer."
-              )
-            });
+            const offerId = offer.id;
+            await withScopedApiRequestHeaders(
+              buildOptimisticLockHeader(offer.updatedAt),
+              () => deleteCrud("catalog/offers", offerId, {
+                errorMessage: t(
+                  "catalog.products.edit.offers.deleteError",
+                  "Failed to remove sales channel offer."
+                )
+              })
+            );
           }
         } catch (err) {
           console.error("catalog.products.edit.offers.delete", err);
@@ -947,6 +973,11 @@ function EditCatalogProductPage({
       const previousConversionIds = new Set(
         initialConversionsRef.current.map((entry) => toTrimmedOrNull(entry.id)).filter((id) => Boolean(id))
       );
+      const conversionVersions = /* @__PURE__ */ new Map();
+      for (const entry of initialConversionsRef.current) {
+        const cid = toTrimmedOrNull(entry.id);
+        if (cid) conversionVersions.set(cid, entry.updatedAt ?? null);
+      }
       const nextConversionIds = new Set(
         conversionInputs.map(
           (entry) => entry.id && entry.id.trim().length ? entry.id : null
@@ -956,23 +987,30 @@ function EditCatalogProductPage({
         (id) => !nextConversionIds.has(id)
       );
       for (const conversionId of removedConversionIds) {
-        await deleteCrud("catalog/product-unit-conversions", conversionId, {
-          errorMessage: t(
-            "catalog.products.uom.errors.sync",
-            "Failed to synchronize product conversions."
-          )
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(conversionVersions.get(conversionId) ?? null),
+          () => deleteCrud("catalog/product-unit-conversions", conversionId, {
+            errorMessage: t(
+              "catalog.products.uom.errors.sync",
+              "Failed to synchronize product conversions."
+            )
+          })
+        );
       }
       const persistedConversions = [];
       for (const conversion of conversionInputs) {
         if (conversion.id) {
-          await updateCrud("catalog/product-unit-conversions", {
-            id: conversion.id,
-            unitCode: conversion.unitCode,
-            toBaseFactor: conversion.toBaseFactor,
-            sortOrder: conversion.sortOrder,
-            isActive: conversion.isActive
-          });
+          const conversionId = conversion.id;
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(conversionVersions.get(conversionId) ?? null),
+            () => updateCrud("catalog/product-unit-conversions", {
+              id: conversionId,
+              unitCode: conversion.unitCode,
+              toBaseFactor: conversion.toBaseFactor,
+              sortOrder: conversion.sortOrder,
+              isActive: conversion.isActive
+            })
+          );
           persistedConversions.push({
             id: conversion.id,
             unitCode: conversion.unitCode,
@@ -1179,19 +1217,10 @@ function ProductDetailsSection({
         )
       ] }),
       values.useMarkdown ? /* @__PURE__ */ jsx(
-        "div",
+        MarkdownField,
         {
-          "data-color-mode": "light",
-          className: "overflow-hidden rounded-md border",
-          children: /* @__PURE__ */ jsx(
-            MarkdownEditor,
-            {
-              value: values.description,
-              height: 260,
-              onChange: (val) => setValue("description", val ?? ""),
-              previewOptions: { remarkPlugins: [] }
-            }
-          )
+          value: values.description,
+          onChange: (val) => setValue("description", val ?? "")
         }
       ) : /* @__PURE__ */ jsx(
         Textarea,
@@ -1384,23 +1413,32 @@ function ProductOptionsSection({ values, setValue }) {
   }, []);
   const handleDeleteSchema = React.useCallback(
     async (id) => {
+      const target = schemaTemplates.find((entry) => entry.id === id);
+      const lockVersion = target?.updatedAt ?? target?.updated_at ?? null;
       try {
-        await deleteCrud("catalog/option-schemas", id, {
-          errorMessage: t(
-            "catalog.products.edit.schemas.deleteError",
-            "Failed to delete schema."
-          )
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(lockVersion),
+          () => deleteCrud("catalog/option-schemas", id, {
+            errorMessage: t(
+              "catalog.products.edit.schemas.deleteError",
+              "Failed to delete schema."
+            )
+          })
+        );
         flash(
           t("catalog.products.edit.schemas.deleted", "Schema deleted."),
           "success"
         );
         void loadSchemas();
       } catch (err) {
+        if (surfaceRecordConflict(err, t)) {
+          void loadSchemas();
+          return;
+        }
         console.error("catalog.option-schemas.delete failed", err);
       }
     },
-    [loadSchemas, t]
+    [loadSchemas, schemaTemplates, t]
   );
   const handleSaveSchema = React.useCallback(
     async (name) => {
@@ -1431,8 +1469,25 @@ function ProductOptionsSection({ values, setValue }) {
         isActive: true
       };
       if (schemaToEdit?.id) payload.id = schemaToEdit.id;
-      if (schemaToEdit?.id) await updateCrud("catalog/option-schemas", payload);
-      else await createCrud("catalog/option-schemas", payload);
+      try {
+        if (schemaToEdit?.id) {
+          const lockVersion = schemaToEdit.updatedAt ?? schemaToEdit.updated_at ?? null;
+          await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(lockVersion),
+            () => updateCrud("catalog/option-schemas", payload)
+          );
+        } else {
+          await createCrud("catalog/option-schemas", payload);
+        }
+      } catch (err) {
+        if (surfaceRecordConflict(err, t)) {
+          setSaveSchemaOpen(false);
+          setSchemaToEdit(null);
+          void loadSchemas();
+          return;
+        }
+        throw err;
+      }
       flash(
         t("catalog.products.edit.schemas.saved", "Schema saved."),
         "success"
@@ -1738,18 +1793,22 @@ function ProductVariantsSection({
       if (!confirmed) return;
       setDeletingId(variant.id);
       try {
-        await deleteCrud("catalog/variants", variant.id, {
-          errorMessage: t(
-            "catalog.variants.form.deleteError",
-            "Failed to delete variant."
-          )
-        });
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(variant.updatedAt),
+          () => deleteCrud("catalog/variants", variant.id, {
+            errorMessage: t(
+              "catalog.variants.form.deleteError",
+              "Failed to delete variant."
+            )
+          })
+        );
         flash(
           t("catalog.variants.form.deleted", "Variant deleted."),
           "success"
         );
         onVariantDeleted(variant.id);
       } catch (err) {
+        if (surfaceRecordConflict(err, t)) return;
         console.error("catalog.products.edit.variants.delete", err);
         flash(
           t("catalog.variants.form.deleteError", "Failed to delete variant."),
@@ -1932,6 +1991,7 @@ function ProductMetaSection({
   const autoHandleEnabledRef = React.useRef(handleValue.trim().length === 0);
   const autoHandleInitializedRef = React.useRef(false);
   const previousTitleRef = React.useRef(titleSource);
+  const selectedTaxRate = values.taxRateId ? taxRates.find((rate) => rate.id === values.taxRateId) ?? null : null;
   React.useEffect(() => {
     if (isLoadingProduct) return;
     if (!autoHandleInitializedRef.current) {
@@ -2108,7 +2168,8 @@ function ProductMetaSection({
             /* @__PURE__ */ jsx(SelectTrigger, { children: /* @__PURE__ */ jsx(
               SelectValue,
               {
-                placeholder: taxRates.length ? t("catalog.products.create.taxRates.noneSelected", "No tax class selected") : t("catalog.products.create.taxRates.emptyOption", "No tax classes available")
+                placeholder: taxRates.length ? t("catalog.products.create.taxRates.noneSelected", "No tax class selected") : t("catalog.products.create.taxRates.emptyOption", "No tax classes available"),
+                children: selectedTaxRate ? formatTaxRateLabel(selectedTaxRate) : void 0
               }
             ) }),
             /* @__PURE__ */ jsx(SelectContent, { children: taxRates.map((rate) => /* @__PURE__ */ jsx(SelectItem, { value: rate.id, children: formatTaxRateLabel(rate) }, rate.id)) })
@@ -2208,7 +2269,8 @@ function readOfferSnapshots(record) {
       metadata: isRecord(offer.metadata) ? offer.metadata : null,
       isActive: offer.isActive !== false,
       channelName: getString(offer.channelName) ?? getString(offer.channel_name),
-      channelCode: getString(offer.channelCode) ?? getString(offer.channel_code)
+      channelCode: getString(offer.channelCode) ?? getString(offer.channel_code),
+      updatedAt: getString(offer.updatedAt) ?? getString(offer.updated_at) ?? null
     });
   }
   return snapshots;
@@ -2272,7 +2334,8 @@ function mergeOfferSnapshots(current, payloads) {
       metadata: entry.metadata ?? previous?.metadata ?? null,
       isActive: entry.isActive ?? previous?.isActive ?? true,
       channelName: previous?.channelName ?? null,
-      channelCode: previous?.channelCode ?? null
+      channelCode: previous?.channelCode ?? null,
+      updatedAt: previous?.updatedAt ?? null
     };
   });
 }