@open-mercato/core 0.6.5-develop.4516.1.88e6ab71a9 → 0.6.5-develop.4544.1.71c003c861

package/src/modules/sales/api/documents/factory.ts

@@ -202,6 +202,12 @@ const mapUpdateResponse = (entity: any) => {
     paymentMethodId: entity?.paymentMethodId ?? null,
     paymentMethodCode: entity?.paymentMethodCode ?? null,
     paymentMethodSnapshot: normalizeJsonRecord(entity?.paymentMethodSnapshot),
+    // Return the fresh version so the client can refresh its optimistic-lock
+    // token after a successful inline save — otherwise a second save on the same
+    // page sends the now-stale updatedAt and falsely 409s (#2055 QA).
+    updatedAt: entity?.updatedAt
+      ? (entity.updatedAt instanceof Date ? entity.updatedAt.toISOString() : entity.updatedAt)
+      : null,
   }
 }
 
@@ -492,7 +498,13 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
           const organizationId =
             typeof item?.organizationId === 'string' ? item.organizationId : ctx?.selectedOrganizationId ?? ctx?.auth?.orgId ?? null
           if (orderId && tenantId && organizationId) {
-            const em = ctx?.container?.resolve?.('em') as import('@mikro-orm/postgresql').EntityManager | undefined
+            const requestEm = ctx?.container?.resolve?.('em') as import('@mikro-orm/postgresql').EntityManager | undefined
+            // Display-only totals recalculation: run on a forked EntityManager so
+            // the order/line/adjustment entities loaded here never enter the
+            // request's Unit of Work. This guarantees a GET can never flush an
+            // UPDATE (and thus never advance `updated_at`), which would otherwise
+            // surface as a spurious optimistic-lock 409 in another tab.
+            const em = requestEm?.fork()
             if (em) {
               const totals = await recalculateOrderTotalsForDisplay(
                 em,

package/src/modules/sales/backend/sales/channels/[channelId]/edit/page.tsx

@@ -181,6 +181,7 @@ export default function EditChannelPage({ params }: { params?: { channelId?: str
               { id: 'custom', title: t('entities.customFields.title', 'Custom Attributes'), column: 2, kind: 'customFields' },
             ]}
             initialValues={initialValues ?? undefined}
+            optimisticLockUpdatedAt={typeof initialValues?.updatedAt === 'string' ? initialValues.updatedAt : null}
             isLoading={loading}
             loadingMessage={t('sales.channels.form.loading', 'Loading channel…')}
             submitLabel={t('sales.channels.form.updateSubmit', 'Save changes')}
@@ -225,6 +226,11 @@ function mapChannelToFormValues(item: Record<string, unknown>): ChannelFormValue
         ? item.status_entry_id
         : null,
     isActive: item.isActive === true || item.is_active === true,
+    updatedAt: typeof item.updatedAt === 'string'
+      ? item.updatedAt
+      : typeof item.updated_at === 'string'
+        ? item.updated_at
+        : null,
   }
   return { ...values, ...extractCustomFieldEntries(item) }
 }

package/src/modules/sales/backend/sales/channels/offers/page.tsx

@@ -10,7 +10,9 @@ import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { 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 { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -280,12 +282,16 @@ export default function SalesChannelOffersListPage() {
 
   const handleDelete = React.useCallback(async (row: OfferRow) => {
     try {
-      await deleteCrud('catalog/offers', row.id, {
-        errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
-      })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud('catalog/offers', row.id, {
+          errorMessage: t('sales.channels.offers.errors.delete', 'Failed to delete offer.'),
+        }),
+      )
       flash(t('sales.channels.offers.messages.deleted', 'Offer deleted.'), 'success')
       handleRefresh()
     } catch (err) {
+      if (surfaceRecordConflict(err, t)) { handleRefresh(); return }
       console.error('sales.channels.offers.delete', err)
     }
   }, [handleRefresh, t])

package/src/modules/sales/backend/sales/channels/page.tsx

@@ -10,8 +10,9 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader, extractOptimisticLockConflict } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
@@ -138,12 +139,26 @@ export default function SalesChannelsPage() {
 
   const handleDelete = React.useCallback(async (row: ChannelRow) => {
     try {
-      await deleteCrud('sales/channels', row.id, {
-        errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
-      })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(row.updatedAt),
+        () => deleteCrud('sales/channels', row.id, {
+          errorMessage: t('sales.channels.table.errors.delete', 'Failed to delete channel.'),
+        }),
+      )
       flash(t('sales.channels.table.messages.deleted', 'Channel deleted.'), 'success')
       handleRefresh()
     } catch (err) {
+      if (extractOptimisticLockConflict(err)) {
+        // Someone edited the channel after this list loaded — refuse the
+        // stale delete, surface the conflict, and reload so the row reflects
+        // the latest server state (QA #2055 channel edit/delete broken state).
+        flash(
+          t('ui.forms.flash.recordModified', 'This record was modified by someone else. Refresh and try again.'),
+          'error',
+        )
+        handleRefresh()
+        return
+      }
       console.error('sales.channels.delete', err)
     }
   }, [handleRefresh, t])

package/src/modules/sales/backend/sales/documents/[id]/page.tsx

@@ -29,7 +29,9 @@ import { VersionHistoryAction } from '@open-mercato/ui/backend/version-history'
 import { SendObjectMessageDialog } from '@open-mercato/ui/backend/messages'
 import Link from 'next/link'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-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 { mapCrudServerErrorToFormErrors } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -916,6 +918,7 @@ type DocumentUpdateResult = {
   customerName?: string | null
   contactEmail?: string | null
   metadata?: Record<string, unknown> | null
+  updatedAt?: string | null
 }
 
 const normalizeCustomFieldSubmitValue = (value: unknown): unknown => {
@@ -926,6 +929,18 @@ const normalizeCustomFieldSubmitValue = (value: unknown): unknown => {
   return value
 }
 
+export function handleDocumentMutationError(
+  err: unknown,
+  t: (key: string, fallback?: string) => string,
+  refresh: () => void,
+): boolean {
+  if (surfaceRecordConflict(err, t, { onRefresh: refresh })) {
+    refresh()
+    return true
+  }
+  return false
+}
+
 const prefixCustomFieldValues = (input: Record<string, unknown> | null | undefined): Record<string, unknown> => {
   if (!input || typeof input !== 'object') return {}
   return Object.entries(input).reduce<Record<string, unknown>>((acc, [key, value]) => {
@@ -3005,19 +3020,30 @@ export default function SalesDocumentDetailPage({
       }
       const endpoint = kind === 'order' ? '/api/sales/orders' : '/api/sales/quotes'
       const mutation = { id: record.id, ...patch }
-      return runMutationWithContext(
+      const call = await runMutationWithContext(
         () =>
-          apiCallOrThrow<DocumentUpdateResult>(
-            endpoint,
-            {
-              method: 'PUT',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify(mutation),
-            },
-            { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') }
+          withScopedApiRequestHeaders(buildOptimisticLockHeader(record.updatedAt), () =>
+            apiCallOrThrow<DocumentUpdateResult>(
+              endpoint,
+              {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(mutation),
+              },
+              { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') }
+            ),
           ),
         mutation,
       )
+      // Refresh the optimistic-lock token from the server's fresh updatedAt so a
+      // SUBSEQUENT inline save on the same page doesn't send a now-stale token and
+      // falsely 409 (#2055 QA). All per-field setRecord calls below spread from
+      // this updated `prev`, so the token stays consistent.
+      const freshUpdatedAt = call?.result?.updatedAt
+      if (typeof freshUpdatedAt === 'string' && freshUpdatedAt.length > 0) {
+        setRecord((prev) => (prev ? { ...prev, updatedAt: freshUpdatedAt } : prev))
+      }
+      return call
     },
     [kind, record, runMutationWithContext, t]
   )
@@ -3045,6 +3071,7 @@ export default function SalesDocumentDetailPage({
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
         return savedCode
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message = err instanceof Error && err.message ? err.message : t('sales.documents.detail.updateError', 'Failed to update document.')
         flash(message, 'error')
         throw err
@@ -3073,6 +3100,7 @@ export default function SalesDocumentDetailPage({
         setRecord((prev) => (prev ? { ...prev, placedAt: savedPlacedAt } : prev))
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3106,6 +3134,7 @@ export default function SalesDocumentDetailPage({
         setRecord((prev) => (prev ? { ...prev, expectedDeliveryAt: savedExpectedDelivery } : prev))
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3132,6 +3161,7 @@ export default function SalesDocumentDetailPage({
         setRecord((prev) => (prev ? { ...prev, comment: savedComment } : prev))
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3158,6 +3188,7 @@ export default function SalesDocumentDetailPage({
         setRecord((prev) => (prev ? { ...prev, externalReference: savedExternalReference } : prev))
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3184,6 +3215,7 @@ export default function SalesDocumentDetailPage({
         setRecord((prev) => (prev ? { ...prev, customerReference: savedCustomerReference } : prev))
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3246,6 +3278,7 @@ export default function SalesDocumentDetailPage({
         })
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3270,6 +3303,7 @@ export default function SalesDocumentDetailPage({
         }
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3319,6 +3353,7 @@ export default function SalesDocumentDetailPage({
         emitSalesDocumentTotalsRefresh({ documentId: record.id, kind })
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3376,6 +3411,7 @@ export default function SalesDocumentDetailPage({
         emitSalesDocumentTotalsRefresh({ documentId: record.id, kind })
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3412,6 +3448,7 @@ export default function SalesDocumentDetailPage({
         }
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3490,6 +3527,7 @@ export default function SalesDocumentDetailPage({
         )
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3539,6 +3577,7 @@ export default function SalesDocumentDetailPage({
         )
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3588,6 +3627,7 @@ export default function SalesDocumentDetailPage({
       setNumberEditing(false)
       flash(t('sales.documents.detail.numberGenerated', 'New number generated.'), 'success')
     } catch (err) {
+      if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
       const message =
         err instanceof Error && err.message
           ? err.message
@@ -3631,6 +3671,7 @@ export default function SalesDocumentDetailPage({
         )
         flash(t('sales.documents.detail.updatedMessage', 'Document updated.'), 'success')
       } catch (err) {
+        if (handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) return
         const message =
           err instanceof Error && err.message
             ? err.message
@@ -3651,7 +3692,10 @@ export default function SalesDocumentDetailPage({
           '/api/sales/quotes/convert',
           {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
+            headers: {
+              'Content-Type': 'application/json',
+              ...buildOptimisticLockHeader(record.updatedAt),
+            },
             body: JSON.stringify({ quoteId: record.id }),
           },
           { errorMessage: t('sales.documents.detail.convertError', 'Failed to convert quote.') },
@@ -3662,7 +3706,9 @@ export default function SalesDocumentDetailPage({
       }, { quoteId: record.id })
     } catch (err) {
       console.error('sales.documents.convert', err)
-      flash(t('sales.documents.detail.convertError', 'Failed to convert quote.'), 'error')
+      if (!handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) {
+        flash(t('sales.documents.detail.convertError', 'Failed to convert quote.'), 'error')
+      }
     } finally {
       setConverting(false)
     }
@@ -3702,20 +3748,24 @@ export default function SalesDocumentDetailPage({
     const endpoint = kind === 'order' ? '/api/sales/orders' : '/api/sales/quotes'
     try {
       await runMutationWithContext(async () => {
-        await apiCallOrThrow(endpoint, {
-          method: 'DELETE',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ id: record.id }),
-        }, {
-          errorMessage: t('sales.documents.detail.deleteFailed', 'Could not delete document.'),
-        })
+        await withScopedApiRequestHeaders(buildOptimisticLockHeader(record.updatedAt), () =>
+          apiCallOrThrow(endpoint, {
+            method: 'DELETE',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ id: record.id }),
+          }, {
+            errorMessage: t('sales.documents.detail.deleteFailed', 'Could not delete document.'),
+          }),
+        )
       }, { id: record.id })
       flash(t('sales.documents.detail.deleted', 'Document deleted.'), 'success')
       const listPath = kind === 'order' ? '/backend/sales/orders' : '/backend/sales/quotes'
       router.push(listPath)
     } catch (err) {
       console.error('sales.documents.delete', err)
-      flash(t('sales.documents.detail.deleteFailed', 'Could not delete document.'), 'error')
+      if (!handleDocumentMutationError(err, t, () => setReloadKey((prev) => prev + 1))) {
+        flash(t('sales.documents.detail.deleteFailed', 'Could not delete document.'), 'error')
+      }
     }
     setDeleting(false)
   }, [kind, record, router, runMutationWithContext, t])
@@ -4169,6 +4219,7 @@ export default function SalesDocumentDetailPage({
           documentId={record.id}
           kind={kind}
           currencyCode={record.currencyCode ?? null}
+          documentUpdatedAt={record.updatedAt}
           organizationId={(record as any)?.organizationId ?? (record as any)?.organization_id ?? null}
           tenantId={(record as any)?.tenantId ?? (record as any)?.tenant_id ?? null}
           onActionChange={handleSectionActionChange}
@@ -4215,6 +4266,7 @@ export default function SalesDocumentDetailPage({
         <SalesReturnsSection
           orderId={record.id}
           currencyCode={record.currencyCode ?? null}
+          documentUpdatedAt={record.updatedAt}
         />
       )
     }
@@ -4224,6 +4276,7 @@ export default function SalesDocumentDetailPage({
           documentId={record.id}
           kind={kind}
           currencyCode={record.currencyCode ?? null}
+          documentUpdatedAt={record.updatedAt}
           organizationId={(record as any)?.organizationId ?? (record as any)?.organization_id ?? null}
           tenantId={(record as any)?.tenantId ?? (record as any)?.tenant_id ?? null}
           onActionChange={handleSectionActionChange}

package/src/modules/sales/backend/sales/documents/create/page.tsx

@@ -83,6 +83,7 @@ export default function CreateSalesDocumentPage() {
               catalogPrice: item.catalogPrice ?? null,
             }
           }
+          // optimistic-lock-exempt: create-only line item on newly created document, no prior version
           await apiCall(lineEndpoint, {
             method: 'POST',
             body: JSON.stringify(linePayload),
@@ -93,6 +94,7 @@ export default function CreateSalesDocumentPage() {
       }
 
       try {
+        // optimistic-lock-exempt: one-time inbox action completion transition, create-only flow
         await apiCall(
           `/api/inbox_ops/proposals/${inboxDraft.proposalId}/actions/${inboxDraft.actionId}/complete`,
           {