@open-mercato/ui 0.6.6-develop.6330.1.a261878aa8 → 0.6.6-develop.6331.1.a33b8e99b7

package/dist/backend/conflicts/index.js

@@ -1,4 +1,7 @@
-import { extractOptimisticLockConflict } from "../utils/optimisticLock.js";
+import {
+  extractOptimisticLockConflict,
+  extractRecordLockConflict
+} from "../utils/optimisticLock.js";
 import { showRecordConflict } from "./store.js";
 import {
   showRecordConflict as showRecordConflict2,
@@ -7,24 +10,58 @@ import {
   getRecordConflictForTest
 } from "./store.js";
 import { RecordConflictBanner } from "./RecordConflictBanner.js";
+let recordLockConflictHandler = null;
+function registerRecordLockConflictHandler(handler) {
+  recordLockConflictHandler = handler;
+  return () => {
+    if (recordLockConflictHandler === handler) recordLockConflictHandler = null;
+  };
+}
+function hasRecordLockConflictHandlerForTest() {
+  return recordLockConflictHandler !== null;
+}
+function resetRecordLockConflictHandlerForTest() {
+  recordLockConflictHandler = null;
+}
 function surfaceRecordConflict(error, t, options = {}) {
-  const conflict = extractOptimisticLockConflict(error);
-  if (!conflict) return false;
-  showRecordConflict({
-    message: t(
-      "ui.forms.flash.recordModified",
-      "This record was modified by someone else. Refresh and try again."
-    ),
-    title: options.title ?? null,
-    currentUpdatedAt: conflict.currentUpdatedAt,
-    onRefresh: options.onRefresh ?? null
-  });
-  return true;
+  const recordLockConflict = extractRecordLockConflict(error);
+  if (recordLockConflict && recordLockConflictHandler) {
+    if (recordLockConflictHandler(recordLockConflict, error)) return true;
+  }
+  const ossConflict = extractOptimisticLockConflict(error);
+  if (ossConflict) {
+    showRecordConflict({
+      message: t(
+        "ui.forms.flash.recordModified",
+        "This record was modified by someone else. Refresh and try again."
+      ),
+      title: options.title ?? null,
+      currentUpdatedAt: ossConflict.currentUpdatedAt,
+      onRefresh: options.onRefresh ?? null
+    });
+    return true;
+  }
+  if (recordLockConflict) {
+    showRecordConflict({
+      message: t(
+        "ui.forms.flash.recordModified",
+        "This record was modified by someone else. Refresh and try again."
+      ),
+      title: options.title ?? null,
+      currentUpdatedAt: null,
+      onRefresh: options.onRefresh ?? null
+    });
+    return true;
+  }
+  return false;
 }
 export {
   RecordConflictBanner,
   dismissRecordConflict,
   getRecordConflictForTest,
+  hasRecordLockConflictHandlerForTest,
+  registerRecordLockConflictHandler,
+  resetRecordLockConflictHandlerForTest,
   showRecordConflict2 as showRecordConflict,
   surfaceRecordConflict,
   useRecordConflict

package/dist/backend/conflicts/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/backend/conflicts/index.ts"],
-  "sourcesContent": ["import { extractOptimisticLockConflict } from '../utils/optimisticLock'\nimport { showRecordConflict } from './store'\n\nexport {\n  showRecordConflict,\n  dismissRecordConflict,\n  useRecordConflict,\n  getRecordConflictForTest,\n  type RecordConflictEntry,\n  type ShowRecordConflictInput,\n} from './store'\nexport { RecordConflictBanner } from './RecordConflictBanner'\n\ntype Translate = (key: string, fallback?: string) => string\n\nexport type SurfaceRecordConflictOptions = {\n  /** Custom refresh handler. Omit to let the banner reload the page. */\n  onRefresh?: (() => void) | null\n  /** Localized title override; the banner falls back to a generic title. */\n  title?: string | null\n}\n\n/**\n * If `error` is an OSS optimistic-lock conflict (HTTP 409 with\n * `code: 'optimistic_lock_conflict'`), push the localized \"record modified\"\n * message onto the shared conflict bar and return `true`. Otherwise return\n * `false` so callers can fall back to their normal error handling.\n *\n * This is the single entry point every form uses, so the conflict surfaces the\n * same persistent, error-styled bar everywhere.\n */\nexport function surfaceRecordConflict(\n  error: unknown,\n  t: Translate,\n  options: SurfaceRecordConflictOptions = {},\n): boolean {\n  const conflict = extractOptimisticLockConflict(error)\n  if (!conflict) return false\n  showRecordConflict({\n    message: t(\n      'ui.forms.flash.recordModified',\n      'This record was modified by someone else. Refresh and try again.',\n    ),\n    title: options.title ?? null,\n    currentUpdatedAt: conflict.currentUpdatedAt,\n    onRefresh: options.onRefresh ?? null,\n  })\n  return true\n}\n"],
-  "mappings": "AAAA,SAAS,qCAAqC;AAC9C,SAAS,0BAA0B;AAEnC;AAAA,EACE,sBAAAA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAGK;AACP,SAAS,4BAA4B;AAoB9B,SAAS,sBACd,OACA,GACA,UAAwC,CAAC,GAChC;AACT,QAAM,WAAW,8BAA8B,KAAK;AACpD,MAAI,CAAC,SAAU,QAAO;AACtB,qBAAmB;AAAA,IACjB,SAAS;AAAA,MACP;AAAA,MACA;AAAA,IACF;AAAA,IACA,OAAO,QAAQ,SAAS;AAAA,IACxB,kBAAkB,SAAS;AAAA,IAC3B,WAAW,QAAQ,aAAa;AAAA,EAClC,CAAC;AACD,SAAO;AACT;",
+  "sourcesContent": ["import {\n  extractOptimisticLockConflict,\n  extractRecordLockConflict,\n  type RecordLockConflictBody,\n} from '../utils/optimisticLock'\nimport { showRecordConflict } from './store'\n\nexport {\n  showRecordConflict,\n  dismissRecordConflict,\n  useRecordConflict,\n  getRecordConflictForTest,\n  type RecordConflictEntry,\n  type ShowRecordConflictInput,\n} from './store'\nexport { RecordConflictBanner } from './RecordConflictBanner'\n\ntype Translate = (key: string, fallback?: string) => string\n\nexport type SurfaceRecordConflictOptions = {\n  /** Custom refresh handler. Omit to let the banner reload the page. */\n  onRefresh?: (() => void) | null\n  /** Localized title override; the banner falls back to a generic title. */\n  title?: string | null\n}\n\n/**\n * Handler the enterprise `record_locks` merge-dialog widget registers (on mount)\n * so `surfaceRecordConflict` can defer the OSS conflict bar in favor of the\n * field-level merge dialog. Core/UI stays enterprise-free: enterprise calls\n * {@link registerRecordLockConflictHandler}; this module never imports it.\n *\n * MUST return `true` only when it actually owns/renders the surface for THIS\n * conflict (its widget is mounted for the conflicting record). Returning `false`\n * (different record / cannot render) makes `surfaceRecordConflict` fall through\n * to the OSS conflict bar, so a conflict is never swallowed and we never render\n * BOTH the merge dialog and the bar (single surface, S3).\n */\nexport type RecordLockConflictHandler = (conflict: RecordLockConflictBody, error: unknown) => boolean\n\nlet recordLockConflictHandler: RecordLockConflictHandler | null = null\n\n/**\n * Register the record-lock conflict handler (enterprise merge-dialog widget).\n * Returns an unregister function. When a handler is registered,\n * `surfaceRecordConflict` defers `record_lock_conflict` 409s to it instead of\n * rendering the OSS conflict bar (single surface, S3).\n *\n * SAFETY: when NO handler is registered (widget absent/removed),\n * `surfaceRecordConflict` still renders the OSS conflict bar for ANY 409 \u2014 a\n * conflict is never silently swallowed.\n */\nexport function registerRecordLockConflictHandler(handler: RecordLockConflictHandler): () => void {\n  recordLockConflictHandler = handler\n  return () => {\n    if (recordLockConflictHandler === handler) recordLockConflictHandler = null\n  }\n}\n\n/** Test-only: inspect whether a record-lock conflict handler is registered. */\nexport function hasRecordLockConflictHandlerForTest(): boolean {\n  return recordLockConflictHandler !== null\n}\n\n/** Test-only: clear any registered record-lock conflict handler. */\nexport function resetRecordLockConflictHandlerForTest(): void {\n  recordLockConflictHandler = null\n}\n\n/**\n * Single conflict surface (S3). Resolves a 409 to exactly one UI:\n *\n *   - `record_lock_conflict` payload AND a merge-dialog handler registered \u2192\n *     defer to the handler (no conflict bar) and return `true`.\n *   - otherwise (OSS `optimistic_lock_conflict`, OR a `record_lock_conflict`\n *     with NO handler registered) \u2192 render the OSS conflict bar and return\n *     `true`. A conflict is ALWAYS surfaced; the worst case is plainer UX, never\n *     a silently-swallowed conflict.\n *   - not a recognized conflict \u2192 return `false` so callers fall back to their\n *     normal error handling.\n */\nexport function surfaceRecordConflict(\n  error: unknown,\n  t: Translate,\n  options: SurfaceRecordConflictOptions = {},\n): boolean {\n  const recordLockConflict = extractRecordLockConflict(error)\n  if (recordLockConflict && recordLockConflictHandler) {\n    // The widget owns the surface ONLY when it handles this record's conflict\n    // (returns true). If it declines (different record / not mounted for it),\n    // fall through to the OSS bar so the conflict is never swallowed and we\n    // never render both the merge dialog AND the bar.\n    if (recordLockConflictHandler(recordLockConflict, error)) return true\n  }\n\n  const ossConflict = extractOptimisticLockConflict(error)\n  if (ossConflict) {\n    showRecordConflict({\n      message: t(\n        'ui.forms.flash.recordModified',\n        'This record was modified by someone else. Refresh and try again.',\n      ),\n      title: options.title ?? null,\n      currentUpdatedAt: ossConflict.currentUpdatedAt,\n      onRefresh: options.onRefresh ?? null,\n    })\n    return true\n  }\n\n  // No handler is registered but the server returned a record-lock 409: still\n  // render the OSS bar so the conflict is never swallowed.\n  if (recordLockConflict) {\n    showRecordConflict({\n      message: t(\n        'ui.forms.flash.recordModified',\n        'This record was modified by someone else. Refresh and try again.',\n      ),\n      title: options.title ?? null,\n      currentUpdatedAt: null,\n      onRefresh: options.onRefresh ?? null,\n    })\n    return true\n  }\n\n  return false\n}\n"],
+  "mappings": "AAAA;AAAA,EACE;AAAA,EACA;AAAA,OAEK;AACP,SAAS,0BAA0B;AAEnC;AAAA,EACE,sBAAAA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAGK;AACP,SAAS,4BAA4B;AAyBrC,IAAI,4BAA8D;AAY3D,SAAS,kCAAkC,SAAgD;AAChG,8BAA4B;AAC5B,SAAO,MAAM;AACX,QAAI,8BAA8B,QAAS,6BAA4B;AAAA,EACzE;AACF;AAGO,SAAS,sCAA+C;AAC7D,SAAO,8BAA8B;AACvC;AAGO,SAAS,wCAA8C;AAC5D,8BAA4B;AAC9B;AAcO,SAAS,sBACd,OACA,GACA,UAAwC,CAAC,GAChC;AACT,QAAM,qBAAqB,0BAA0B,KAAK;AAC1D,MAAI,sBAAsB,2BAA2B;AAKnD,QAAI,0BAA0B,oBAAoB,KAAK,EAAG,QAAO;AAAA,EACnE;AAEA,QAAM,cAAc,8BAA8B,KAAK;AACvD,MAAI,aAAa;AACf,uBAAmB;AAAA,MACjB,SAAS;AAAA,QACP;AAAA,QACA;AAAA,MACF;AAAA,MACA,OAAO,QAAQ,SAAS;AAAA,MACxB,kBAAkB,YAAY;AAAA,MAC9B,WAAW,QAAQ,aAAa;AAAA,IAClC,CAAC;AACD,WAAO;AAAA,EACT;AAIA,MAAI,oBAAoB;AACtB,uBAAmB;AAAA,MACjB,SAAS;AAAA,QACP;AAAA,QACA;AAAA,MACF;AAAA,MACA,OAAO,QAAQ,SAAS;AAAA,MACxB,kBAAkB;AAAA,MAClB,WAAW,QAAQ,aAAa;AAAA,IAClC,CAAC;AACD,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
   "names": ["showRecordConflict"]
 }

package/dist/backend/detail/AddressesSection.js

@@ -2,6 +2,7 @@
 import { jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
+import { surfaceRecordConflict } from "../conflicts/index.js";
 import { LoadingMessage } from "@open-mercato/ui/backend/detail";
 import { createTranslatorWithFallback } from "@open-mercato/shared/lib/i18n/translate";
 import { useT } from "@open-mercato/shared/lib/i18n/context";
@@ -134,7 +135,8 @@ function AddressesSectionImpl({
       pushLoading();
       setIsSubmitting(true);
       try {
-        await dataAdapter.update({ id, payload, context: dataContext });
+        const addressUpdatedAt = addresses.find((address) => address.id === id)?.updatedAt ?? null;
+        await dataAdapter.update({ id, payload, updatedAt: addressUpdatedAt, context: dataContext });
         setAddresses((prev) => {
           return prev.map((address) => {
             if (address.id !== id) {
@@ -159,6 +161,7 @@ function AddressesSectionImpl({
         });
         flash(label("success", "Address saved."), "success");
       } catch (err) {
+        surfaceRecordConflict(err, t);
         const message = err instanceof Error && err.message ? err.message : label("error", "Failed to save address.");
         const error = new Error(message);
         if (err && typeof err === "object" && err.details) {
@@ -170,7 +173,7 @@ function AddressesSectionImpl({
         popLoading();
       }
     },
-    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading]
+    [addresses, dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading, t]
   );
   const handleDelete = React.useCallback(
     async (id) => {
@@ -180,19 +183,20 @@ function AddressesSectionImpl({
       pushLoading();
       setIsSubmitting(true);
       try {
-        await dataAdapter.delete({ id, context: dataContext });
+        const addressUpdatedAt = addresses.find((address) => address.id === id)?.updatedAt ?? null;
+        await dataAdapter.delete({ id, updatedAt: addressUpdatedAt, context: dataContext });
         setAddresses((prev) => prev.filter((address) => address.id !== id));
         flash(label("deleted", "Address deleted."), "success");
       } catch (err) {
         const message = err instanceof Error && err.message ? err.message : label("error", "Failed to delete address.");
-        flash(message, "error");
+        if (!surfaceRecordConflict(err, t)) flash(message, "error");
         throw err;
       } finally {
         setIsSubmitting(false);
         popLoading();
       }
     },
-    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading]
+    [addresses, dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading, t]
   );
   const displayAddresses = React.useMemo(() => {
     return addresses.map((address) => ({

package/dist/backend/detail/AddressesSection.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/backend/detail/AddressesSection.tsx"],
-  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { LoadingMessage } from '@open-mercato/ui/backend/detail'\nimport { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport AddressTiles, { type AddressInput, type AddressValue } from './AddressTiles'\nimport type { AddressTypesAdapter } from './AddressEditor'\nimport type { AddressFormatStrategy } from './addressFormat'\nimport { ComponentReplacementHandles } from '@open-mercato/shared/modules/widgets/component-registry'\nimport { useRegisteredComponent } from '../injection/useRegisteredComponent'\n\ntype Translator = (key: string, fallback?: string, params?: Record<string, string | number>) => string\n\nexport type SectionAction = {\n  label: React.ReactNode\n  onClick: () => void\n  disabled?: boolean\n  icon?: React.ReactNode\n}\n\nexport type TabEmptyStateConfig = {\n  title: string\n  actionLabel: string\n  description?: string\n}\n\nexport type AddressSummary = {\n  id: string\n  name?: string | null\n  purpose?: string | null\n  companyName?: string | null\n  addressLine1: string\n  addressLine2?: string | null\n  buildingNumber?: string | null\n  flatNumber?: string | null\n  city?: string | null\n  region?: string | null\n  postalCode?: string | null\n  country?: string | null\n  isPrimary?: boolean\n}\n\nexport type AddressDataAdapter<C = unknown> = {\n  list: (params: { entityId: string | null; context?: C }) => Promise<AddressSummary[]>\n  create: (params: { entityId: string; payload: AddressInput; context?: C }) => Promise<{ id?: string } | void>\n  update: (params: { id: string; payload: AddressInput; context?: C }) => Promise<void>\n  delete: (params: { id: string; context?: C }) => Promise<void>\n}\n\nexport type AddressesSectionProps<C = unknown> = {\n  entityId: string | null\n  emptyLabel: string\n  addActionLabel: string\n  emptyState: TabEmptyStateConfig\n  onActionChange?: (action: SectionAction | null) => void\n  translator?: Translator\n  onLoadingChange?: (isLoading: boolean) => void\n  dataAdapter: AddressDataAdapter<C>\n  dataContext?: C\n  addressTypesAdapter?: AddressTypesAdapter<C>\n  addressTypesContext?: C\n  loadFormat?: (context?: C) => Promise<AddressFormatStrategy>\n  formatContext?: C\n  labelPrefix?: string\n}\n\nfunction generateTempId() {\n  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') return crypto.randomUUID()\n  return `tmp_${Math.random().toString(36).slice(2)}`\n}\n\nfunction AddressesSectionImpl<C = unknown>({\n  entityId,\n  emptyLabel,\n  addActionLabel,\n  emptyState,\n  onActionChange,\n  translator,\n  onLoadingChange,\n  dataAdapter,\n  dataContext,\n  addressTypesAdapter,\n  addressTypesContext,\n  loadFormat,\n  formatContext,\n  labelPrefix = 'customers.people.detail.addresses',\n}: AddressesSectionProps<C>) {\n  const tHook = useT()\n  const fallbackTranslator = React.useMemo<Translator>(() => createTranslatorWithFallback(tHook), [tHook])\n  const t = translator ?? fallbackTranslator\n\n  const label = React.useCallback(\n    (suffix: string, fallback?: string, params?: Record<string, string | number>) =>\n      t(`${labelPrefix}.${suffix}`, fallback, params),\n    [labelPrefix, t],\n  )\n\n  const normalizedEntityId = React.useMemo(() => {\n    if (typeof entityId !== 'string') return null\n    const trimmed = entityId.trim()\n    return trimmed.length ? trimmed : null\n  }, [entityId])\n  const [addresses, setAddresses] = React.useState<AddressSummary[]>([])\n  const [isSubmitting, setIsSubmitting] = React.useState(false)\n  const [isLoading, setIsLoading] = React.useState<boolean>(() => Boolean(normalizedEntityId))\n\n  const loadingCounterRef = React.useRef(0)\n  const pushLoading = React.useCallback(() => {\n    loadingCounterRef.current += 1\n    if (loadingCounterRef.current === 1) {\n      onLoadingChange?.(true)\n    }\n  }, [onLoadingChange])\n  const popLoading = React.useCallback(() => {\n    loadingCounterRef.current = Math.max(0, loadingCounterRef.current - 1)\n    if (loadingCounterRef.current === 0) {\n      onLoadingChange?.(false)\n    }\n  }, [onLoadingChange])\n\n  const loadAddresses = React.useCallback(async () => {\n    if (!normalizedEntityId) {\n      setAddresses([])\n      setIsLoading(false)\n      return\n    }\n    setIsLoading(true)\n    pushLoading()\n    try {\n      const items = await dataAdapter.list({ entityId: normalizedEntityId, context: dataContext })\n      setAddresses(items)\n    } catch (err) {\n      const message =\n        err instanceof Error && err.message\n          ? err.message\n          : label('error', 'Failed to load addresses.')\n      flash(message, 'error')\n      setAddresses([])\n    } finally {\n      setIsLoading(false)\n      popLoading()\n    }\n  }, [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading])\n\n  React.useEffect(() => {\n    void loadAddresses()\n  }, [loadAddresses])\n\n  const handleCreate = React.useCallback(\n    async (payload: AddressInput) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to save address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        const response = await dataAdapter.create({\n          entityId: normalizedEntityId,\n          payload,\n          context: dataContext,\n        })\n        const newAddress: AddressSummary = {\n          id: typeof response === 'object' && response && typeof response.id === 'string' ? response.id : generateTempId(),\n          name: payload.name ?? null,\n          purpose: payload.purpose ?? null,\n          companyName: payload.companyName ?? null,\n          addressLine1: payload.addressLine1,\n          addressLine2: payload.addressLine2 ?? null,\n          buildingNumber: payload.buildingNumber ?? null,\n          flatNumber: payload.flatNumber ?? null,\n          city: payload.city ?? null,\n          region: payload.region ?? null,\n          postalCode: payload.postalCode ?? null,\n          country: payload.country ? payload.country.toUpperCase() : null,\n          isPrimary: payload.isPrimary ?? false,\n        }\n        setAddresses((prev) => {\n          const existing = payload.isPrimary ? prev.map((addr) => ({ ...addr, isPrimary: false })) : prev\n          return [newAddress, ...existing]\n        })\n        flash(label('success', 'Address saved.'), 'success')\n      } catch (err) {\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to save address.')\n        const error = new Error(message) as Error & { details?: unknown }\n        if (err && typeof err === 'object' && (err as { details?: unknown }).details) {\n          error.details = (err as { details?: unknown }).details\n        }\n        throw error\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading],\n  )\n\n  const handleUpdate = React.useCallback(\n    async (id: string, payload: AddressInput) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to save address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        await dataAdapter.update({ id, payload, context: dataContext })\n        setAddresses((prev) => {\n          return prev.map((address) => {\n            if (address.id !== id) {\n              return payload.isPrimary ? { ...address, isPrimary: false } : address\n            }\n            return {\n              ...address,\n              name: payload.name ?? null,\n              purpose: payload.purpose ?? null,\n              companyName: payload.companyName ?? null,\n              addressLine1: payload.addressLine1,\n              addressLine2: payload.addressLine2 ?? null,\n              buildingNumber: payload.buildingNumber ?? null,\n              flatNumber: payload.flatNumber ?? null,\n              city: payload.city ?? null,\n              region: payload.region ?? null,\n              postalCode: payload.postalCode ?? null,\n              country: payload.country ? payload.country.toUpperCase() : null,\n              isPrimary: payload.isPrimary ?? false,\n            }\n          })\n        })\n        flash(label('success', 'Address saved.'), 'success')\n      } catch (err) {\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to save address.')\n        const error = new Error(message) as Error & { details?: unknown }\n        if (err && typeof err === 'object' && (err as { details?: unknown }).details) {\n          error.details = (err as { details?: unknown }).details\n        }\n        throw error\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading],\n  )\n\n  const handleDelete = React.useCallback(\n    async (id: string) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to delete address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        await dataAdapter.delete({ id, context: dataContext })\n        setAddresses((prev) => prev.filter((address) => address.id !== id))\n        flash(label('deleted', 'Address deleted.'), 'success')\n      } catch (err) {\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to delete address.')\n        flash(message, 'error')\n        throw err\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading],\n  )\n\n  const displayAddresses = React.useMemo<AddressValue[]>(() => {\n    return addresses.map((address) => ({\n      id: address.id,\n      name: address.name ?? undefined,\n      purpose: address.purpose ?? undefined,\n      companyName: address.companyName ?? undefined,\n      addressLine1: address.addressLine1,\n      addressLine2: address.addressLine2 ?? undefined,\n      buildingNumber: address.buildingNumber ?? undefined,\n      flatNumber: address.flatNumber ?? undefined,\n      city: address.city ?? undefined,\n      region: address.region ?? undefined,\n      postalCode: address.postalCode ?? undefined,\n      country: address.country ?? undefined,\n      isPrimary: address.isPrimary ?? false,\n    }))\n  }, [addresses])\n\n  const [addAction, setAddAction] = React.useState<{\n    openCreateForm: () => void\n    addDisabled: boolean\n  } | null>(null)\n\n  const handleAddActionChange = React.useCallback(\n    (action: { openCreateForm: () => void; addDisabled: boolean } | null) => {\n      setAddAction(action)\n    },\n    [],\n  )\n\n  React.useEffect(() => {\n    if (!onActionChange) return\n    if (!addAction || addresses.length === 0) {\n      onActionChange(null)\n      return\n    }\n    onActionChange({\n      label: addActionLabel,\n      onClick: addAction.openCreateForm,\n      disabled: addAction.addDisabled,\n    })\n  }, [addAction, addActionLabel, addresses.length, onActionChange])\n\n  return (\n    <div className=\"mt-4\">\n      {isLoading ? (\n        <div className=\"flex justify-center\">\n          <LoadingMessage\n            label={label('loading', 'Loading addresses\u2026')}\n            className=\"min-h-[120px] w-full justify-center border-0 bg-transparent p-0\"\n          />\n        </div>\n      ) : (\n        <AddressTiles\n          addresses={displayAddresses}\n          onCreate={handleCreate}\n          onUpdate={handleUpdate}\n          onDelete={handleDelete}\n          isSubmitting={isSubmitting}\n          emptyLabel={emptyLabel}\n          t={t}\n          hideAddButton\n          onAddActionChange={handleAddActionChange}\n          emptyStateTitle={emptyState.title}\n          emptyStateActionLabel={emptyState.actionLabel}\n          labelPrefix={labelPrefix}\n          addressTypesAdapter={addressTypesAdapter}\n          addressTypesContext={addressTypesContext}\n          loadFormat={loadFormat}\n          formatContext={formatContext}\n        />\n      )}\n    </div>\n  )\n}\n\nexport function AddressesSection<C = unknown>(props: AddressesSectionProps<C>) {\n  const handle = ComponentReplacementHandles.section('ui.detail', 'AddressesSection')\n  const Resolved = useRegisteredComponent<AddressesSectionProps<C>>(\n    handle,\n    AddressesSectionImpl as React.ComponentType<AddressesSectionProps<C>>,\n  )\n\n  return (\n    <div data-component-handle={handle}>\n      <Resolved {...props} />\n    </div>\n  )\n}\n\nexport default AddressesSection\n"],
-  "mappings": "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",
+  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { surfaceRecordConflict } from '../conflicts'\nimport { LoadingMessage } from '@open-mercato/ui/backend/detail'\nimport { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport AddressTiles, { type AddressInput, type AddressValue } from './AddressTiles'\nimport type { AddressTypesAdapter } from './AddressEditor'\nimport type { AddressFormatStrategy } from './addressFormat'\nimport { ComponentReplacementHandles } from '@open-mercato/shared/modules/widgets/component-registry'\nimport { useRegisteredComponent } from '../injection/useRegisteredComponent'\n\ntype Translator = (key: string, fallback?: string, params?: Record<string, string | number>) => string\n\nexport type SectionAction = {\n  label: React.ReactNode\n  onClick: () => void\n  disabled?: boolean\n  icon?: React.ReactNode\n}\n\nexport type TabEmptyStateConfig = {\n  title: string\n  actionLabel: string\n  description?: string\n}\n\nexport type AddressSummary = {\n  id: string\n  name?: string | null\n  purpose?: string | null\n  companyName?: string | null\n  addressLine1: string\n  addressLine2?: string | null\n  buildingNumber?: string | null\n  flatNumber?: string | null\n  city?: string | null\n  region?: string | null\n  postalCode?: string | null\n  country?: string | null\n  isPrimary?: boolean\n  updatedAt?: string | null\n}\n\nexport type AddressDataAdapter<C = unknown> = {\n  list: (params: { entityId: string | null; context?: C }) => Promise<AddressSummary[]>\n  create: (params: { entityId: string; payload: AddressInput; context?: C }) => Promise<{ id?: string } | void>\n  update: (params: { id: string; payload: AddressInput; updatedAt?: string | null; context?: C }) => Promise<void>\n  delete: (params: { id: string; updatedAt?: string | null; context?: C }) => Promise<void>\n}\n\nexport type AddressesSectionProps<C = unknown> = {\n  entityId: string | null\n  emptyLabel: string\n  addActionLabel: string\n  emptyState: TabEmptyStateConfig\n  onActionChange?: (action: SectionAction | null) => void\n  translator?: Translator\n  onLoadingChange?: (isLoading: boolean) => void\n  dataAdapter: AddressDataAdapter<C>\n  dataContext?: C\n  addressTypesAdapter?: AddressTypesAdapter<C>\n  addressTypesContext?: C\n  loadFormat?: (context?: C) => Promise<AddressFormatStrategy>\n  formatContext?: C\n  labelPrefix?: string\n}\n\nfunction generateTempId() {\n  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') return crypto.randomUUID()\n  return `tmp_${Math.random().toString(36).slice(2)}`\n}\n\nfunction AddressesSectionImpl<C = unknown>({\n  entityId,\n  emptyLabel,\n  addActionLabel,\n  emptyState,\n  onActionChange,\n  translator,\n  onLoadingChange,\n  dataAdapter,\n  dataContext,\n  addressTypesAdapter,\n  addressTypesContext,\n  loadFormat,\n  formatContext,\n  labelPrefix = 'customers.people.detail.addresses',\n}: AddressesSectionProps<C>) {\n  const tHook = useT()\n  const fallbackTranslator = React.useMemo<Translator>(() => createTranslatorWithFallback(tHook), [tHook])\n  const t = translator ?? fallbackTranslator\n\n  const label = React.useCallback(\n    (suffix: string, fallback?: string, params?: Record<string, string | number>) =>\n      t(`${labelPrefix}.${suffix}`, fallback, params),\n    [labelPrefix, t],\n  )\n\n  const normalizedEntityId = React.useMemo(() => {\n    if (typeof entityId !== 'string') return null\n    const trimmed = entityId.trim()\n    return trimmed.length ? trimmed : null\n  }, [entityId])\n  const [addresses, setAddresses] = React.useState<AddressSummary[]>([])\n  const [isSubmitting, setIsSubmitting] = React.useState(false)\n  const [isLoading, setIsLoading] = React.useState<boolean>(() => Boolean(normalizedEntityId))\n\n  const loadingCounterRef = React.useRef(0)\n  const pushLoading = React.useCallback(() => {\n    loadingCounterRef.current += 1\n    if (loadingCounterRef.current === 1) {\n      onLoadingChange?.(true)\n    }\n  }, [onLoadingChange])\n  const popLoading = React.useCallback(() => {\n    loadingCounterRef.current = Math.max(0, loadingCounterRef.current - 1)\n    if (loadingCounterRef.current === 0) {\n      onLoadingChange?.(false)\n    }\n  }, [onLoadingChange])\n\n  const loadAddresses = React.useCallback(async () => {\n    if (!normalizedEntityId) {\n      setAddresses([])\n      setIsLoading(false)\n      return\n    }\n    setIsLoading(true)\n    pushLoading()\n    try {\n      const items = await dataAdapter.list({ entityId: normalizedEntityId, context: dataContext })\n      setAddresses(items)\n    } catch (err) {\n      const message =\n        err instanceof Error && err.message\n          ? err.message\n          : label('error', 'Failed to load addresses.')\n      flash(message, 'error')\n      setAddresses([])\n    } finally {\n      setIsLoading(false)\n      popLoading()\n    }\n  }, [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading])\n\n  React.useEffect(() => {\n    void loadAddresses()\n  }, [loadAddresses])\n\n  const handleCreate = React.useCallback(\n    async (payload: AddressInput) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to save address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        const response = await dataAdapter.create({\n          entityId: normalizedEntityId,\n          payload,\n          context: dataContext,\n        })\n        const newAddress: AddressSummary = {\n          id: typeof response === 'object' && response && typeof response.id === 'string' ? response.id : generateTempId(),\n          name: payload.name ?? null,\n          purpose: payload.purpose ?? null,\n          companyName: payload.companyName ?? null,\n          addressLine1: payload.addressLine1,\n          addressLine2: payload.addressLine2 ?? null,\n          buildingNumber: payload.buildingNumber ?? null,\n          flatNumber: payload.flatNumber ?? null,\n          city: payload.city ?? null,\n          region: payload.region ?? null,\n          postalCode: payload.postalCode ?? null,\n          country: payload.country ? payload.country.toUpperCase() : null,\n          isPrimary: payload.isPrimary ?? false,\n        }\n        setAddresses((prev) => {\n          const existing = payload.isPrimary ? prev.map((addr) => ({ ...addr, isPrimary: false })) : prev\n          return [newAddress, ...existing]\n        })\n        flash(label('success', 'Address saved.'), 'success')\n      } catch (err) {\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to save address.')\n        const error = new Error(message) as Error & { details?: unknown }\n        if (err && typeof err === 'object' && (err as { details?: unknown }).details) {\n          error.details = (err as { details?: unknown }).details\n        }\n        throw error\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading],\n  )\n\n  const handleUpdate = React.useCallback(\n    async (id: string, payload: AddressInput) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to save address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        const addressUpdatedAt = addresses.find((address) => address.id === id)?.updatedAt ?? null\n        await dataAdapter.update({ id, payload, updatedAt: addressUpdatedAt, context: dataContext })\n        setAddresses((prev) => {\n          return prev.map((address) => {\n            if (address.id !== id) {\n              return payload.isPrimary ? { ...address, isPrimary: false } : address\n            }\n            return {\n              ...address,\n              name: payload.name ?? null,\n              purpose: payload.purpose ?? null,\n              companyName: payload.companyName ?? null,\n              addressLine1: payload.addressLine1,\n              addressLine2: payload.addressLine2 ?? null,\n              buildingNumber: payload.buildingNumber ?? null,\n              flatNumber: payload.flatNumber ?? null,\n              city: payload.city ?? null,\n              region: payload.region ?? null,\n              postalCode: payload.postalCode ?? null,\n              country: payload.country ? payload.country.toUpperCase() : null,\n              isPrimary: payload.isPrimary ?? false,\n            }\n          })\n        })\n        flash(label('success', 'Address saved.'), 'success')\n      } catch (err) {\n        surfaceRecordConflict(err, t)\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to save address.')\n        const error = new Error(message) as Error & { details?: unknown }\n        if (err && typeof err === 'object' && (err as { details?: unknown }).details) {\n          error.details = (err as { details?: unknown }).details\n        }\n        throw error\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [addresses, dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading, t],\n  )\n\n  const handleDelete = React.useCallback(\n    async (id: string) => {\n      if (!normalizedEntityId) {\n        throw new Error(label('error', 'Failed to delete address.'))\n      }\n      pushLoading()\n      setIsSubmitting(true)\n      try {\n        const addressUpdatedAt = addresses.find((address) => address.id === id)?.updatedAt ?? null\n        await dataAdapter.delete({ id, updatedAt: addressUpdatedAt, context: dataContext })\n        setAddresses((prev) => prev.filter((address) => address.id !== id))\n        flash(label('deleted', 'Address deleted.'), 'success')\n      } catch (err) {\n        const message =\n          err instanceof Error && err.message ? err.message : label('error', 'Failed to delete address.')\n        if (!surfaceRecordConflict(err, t)) flash(message, 'error')\n        throw err\n      } finally {\n        setIsSubmitting(false)\n        popLoading()\n      }\n    },\n    [addresses, dataAdapter, dataContext, label, normalizedEntityId, popLoading, pushLoading, t],\n  )\n\n  const displayAddresses = React.useMemo<AddressValue[]>(() => {\n    return addresses.map((address) => ({\n      id: address.id,\n      name: address.name ?? undefined,\n      purpose: address.purpose ?? undefined,\n      companyName: address.companyName ?? undefined,\n      addressLine1: address.addressLine1,\n      addressLine2: address.addressLine2 ?? undefined,\n      buildingNumber: address.buildingNumber ?? undefined,\n      flatNumber: address.flatNumber ?? undefined,\n      city: address.city ?? undefined,\n      region: address.region ?? undefined,\n      postalCode: address.postalCode ?? undefined,\n      country: address.country ?? undefined,\n      isPrimary: address.isPrimary ?? false,\n    }))\n  }, [addresses])\n\n  const [addAction, setAddAction] = React.useState<{\n    openCreateForm: () => void\n    addDisabled: boolean\n  } | null>(null)\n\n  const handleAddActionChange = React.useCallback(\n    (action: { openCreateForm: () => void; addDisabled: boolean } | null) => {\n      setAddAction(action)\n    },\n    [],\n  )\n\n  React.useEffect(() => {\n    if (!onActionChange) return\n    if (!addAction || addresses.length === 0) {\n      onActionChange(null)\n      return\n    }\n    onActionChange({\n      label: addActionLabel,\n      onClick: addAction.openCreateForm,\n      disabled: addAction.addDisabled,\n    })\n  }, [addAction, addActionLabel, addresses.length, onActionChange])\n\n  return (\n    <div className=\"mt-4\">\n      {isLoading ? (\n        <div className=\"flex justify-center\">\n          <LoadingMessage\n            label={label('loading', 'Loading addresses\u2026')}\n            className=\"min-h-[120px] w-full justify-center border-0 bg-transparent p-0\"\n          />\n        </div>\n      ) : (\n        <AddressTiles\n          addresses={displayAddresses}\n          onCreate={handleCreate}\n          onUpdate={handleUpdate}\n          onDelete={handleDelete}\n          isSubmitting={isSubmitting}\n          emptyLabel={emptyLabel}\n          t={t}\n          hideAddButton\n          onAddActionChange={handleAddActionChange}\n          emptyStateTitle={emptyState.title}\n          emptyStateActionLabel={emptyState.actionLabel}\n          labelPrefix={labelPrefix}\n          addressTypesAdapter={addressTypesAdapter}\n          addressTypesContext={addressTypesContext}\n          loadFormat={loadFormat}\n          formatContext={formatContext}\n        />\n      )}\n    </div>\n  )\n}\n\nexport function AddressesSection<C = unknown>(props: AddressesSectionProps<C>) {\n  const handle = ComponentReplacementHandles.section('ui.detail', 'AddressesSection')\n  const Resolved = useRegisteredComponent<AddressesSectionProps<C>>(\n    handle,\n    AddressesSectionImpl as React.ComponentType<AddressesSectionProps<C>>,\n  )\n\n  return (\n    <div data-component-handle={handle}>\n      <Resolved {...props} />\n    </div>\n  )\n}\n\nexport default AddressesSection\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/backend/detail/NotesSection.js

@@ -13,6 +13,7 @@ import {
   SelectValue
 } from "@open-mercato/ui/primitives/select";
 import { flash } from "../FlashMessages.js";
+import { surfaceRecordConflict } from "../conflicts/index.js";
 import { SwitchableMarkdownInput } from "../inputs/SwitchableMarkdownInput.js";
 import { ErrorMessage } from "./ErrorMessage.js";
 import { LoadingMessage } from "./LoadingMessage.js";
@@ -86,6 +87,7 @@ function mapCommentSummary(input) {
   const id = typeof data.id === "string" ? data.id : generateTempId();
   const body = typeof data.body === "string" ? data.body : "";
   const createdAt = typeof data.createdAt === "string" ? data.createdAt : typeof data.created_at === "string" ? data.created_at : (/* @__PURE__ */ new Date()).toISOString();
+  const updatedAt = typeof data.updatedAt === "string" ? data.updatedAt : typeof data.updated_at === "string" ? data.updated_at : null;
   const authorUserId = typeof data.authorUserId === "string" ? data.authorUserId : typeof data.author_user_id === "string" ? data.author_user_id : null;
   const authorName = typeof data.authorName === "string" ? data.authorName : typeof data.author_name === "string" ? data.author_name : null;
   const authorEmail = typeof data.authorEmail === "string" ? data.authorEmail : typeof data.author_email === "string" ? data.author_email : null;
@@ -97,6 +99,7 @@ function mapCommentSummary(input) {
     id,
     body,
     createdAt,
+    updatedAt,
     authorUserId,
     authorName,
     authorEmail,
@@ -463,7 +466,7 @@ function NotesSectionImpl({
         return true;
       } catch (err) {
         const message = err instanceof Error ? err.message : label("error");
-        flash(message, "error");
+        if (!surfaceRecordConflict(err, t)) flash(message, "error");
         return false;
       } finally {
         setIsSubmitting(false);
@@ -477,6 +480,7 @@ function NotesSectionImpl({
       const sanitizedBody = patch.body;
       const sanitizedIcon = patch.appearanceIcon !== void 0 && patch.appearanceIcon !== null && patch.appearanceIcon.trim().length ? patch.appearanceIcon.trim() : patch.appearanceIcon === null ? null : void 0;
       const sanitizedColor = patch.appearanceColor !== void 0 ? sanitizeHexColor(patch.appearanceColor ?? null) : void 0;
+      const noteUpdatedAt = notes.find((comment) => comment.id === noteId)?.updatedAt ?? null;
       try {
         await dataAdapter.update({
           id: noteId,
@@ -485,6 +489,7 @@ function NotesSectionImpl({
             appearanceIcon: sanitizedIcon,
             appearanceColor: sanitizedColor
           },
+          updatedAt: noteUpdatedAt,
           context: dataContext
         });
         setNotes((prev) => {
@@ -501,11 +506,11 @@ function NotesSectionImpl({
         flash(label("updateSuccess"), "success");
       } catch (error) {
         const message = error instanceof Error ? error.message : label("updateError");
-        flash(message, "error");
+        if (!surfaceRecordConflict(error, t)) flash(message, "error");
         throw error instanceof Error ? error : new Error(message);
       }
     },
-    [dataAdapter, dataContext, t]
+    [dataAdapter, dataContext, notes, t]
   );
   const handleDeleteNote = React.useCallback(
     async (note) => {
@@ -517,7 +522,7 @@ function NotesSectionImpl({
       setDeletingNoteId(note.id);
       pushLoading();
       try {
-        await dataAdapter.delete({ id: note.id, context: dataContext });
+        await dataAdapter.delete({ id: note.id, updatedAt: note.updatedAt ?? null, context: dataContext });
         setNotes((prev) => prev.filter((existing) => existing.id !== note.id));
         if (pagedMode) {
           setVisibleCount((prev) => Math.max(0, prev - 1));
@@ -525,13 +530,13 @@ function NotesSectionImpl({
         flash(label("deleteSuccess", "Note deleted"), "success");
       } catch (err) {
         const message = err instanceof Error ? err.message : label("deleteError", "Failed to delete note");
-        flash(message, "error");
+        if (!surfaceRecordConflict(err, t)) flash(message, "error");
       } finally {
         setDeletingNoteId(null);
         popLoading();
       }
     },
-    [confirm, dataAdapter, dataContext, label, popLoading, pushLoading]
+    [confirm, dataAdapter, dataContext, label, popLoading, pushLoading, t]
   );
   const handleSubmit = React.useCallback(
     async (event) => {