@open-mercato/core 0.6.6-develop.6317.1.b3be10ab84 → 0.6.6-develop.6331.1.a33b8e99b7

package/dist/modules/resources/components/detail/notesAdapter.js

@@ -1,5 +1,6 @@
 "use client";
-import { apiCallOrThrow, readApiResultOrThrow } from "@open-mercato/ui/backend/utils/apiCall";
+import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
+import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { mapCommentSummary } from "@open-mercato/ui/backend/detail/NotesSection";
 function createResourceNotesAdapter(translator, options = {}) {
   const runWrite = async (runner, payload) => {
@@ -41,33 +42,39 @@ function createResourceNotesAdapter(translator, options = {}) {
       );
       return response.result ?? {};
     },
-    update: async ({ id, patch }) => {
+    update: async ({ id, patch, updatedAt }) => {
       const payload = { id };
       if (patch.body !== void 0) payload.body = patch.body;
       if (patch.appearanceIcon !== void 0) payload.appearanceIcon = patch.appearanceIcon;
       if (patch.appearanceColor !== void 0) payload.appearanceColor = patch.appearanceColor;
       await runWrite(
-        () => apiCallOrThrow(
-          "/api/resources/comments",
-          {
-            method: "PUT",
-            headers: { "content-type": "application/json" },
-            body: JSON.stringify(payload)
-          },
-          { errorMessage: translator("resources.resources.detail.notes.updateError", "Failed to update note.") }
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            "/api/resources/comments",
+            {
+              method: "PUT",
+              headers: { "content-type": "application/json" },
+              body: JSON.stringify(payload)
+            },
+            { errorMessage: translator("resources.resources.detail.notes.updateError", "Failed to update note.") }
+          )
         ),
         { operation: "updateNote", id }
       );
     },
-    delete: async ({ id }) => {
+    delete: async ({ id, updatedAt }) => {
       await runWrite(
-        () => apiCallOrThrow(
-          `/api/resources/comments?id=${encodeURIComponent(id)}`,
-          {
-            method: "DELETE",
-            headers: { "content-type": "application/json" }
-          },
-          { errorMessage: translator("resources.resources.detail.notes.deleteError", "Failed to delete note") }
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            `/api/resources/comments?id=${encodeURIComponent(id)}`,
+            {
+              method: "DELETE",
+              headers: { "content-type": "application/json" }
+            },
+            { errorMessage: translator("resources.resources.detail.notes.deleteError", "Failed to delete note") }
+          )
         ),
         { operation: "deleteNote", id }
       );

package/dist/modules/resources/components/detail/notesAdapter.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/resources/components/detail/notesAdapter.ts"],
-  "sourcesContent": ["\"use client\"\n\nimport { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'\nimport { mapCommentSummary, type NotesDataAdapter } from '@open-mercato/ui/backend/detail/NotesSection'\n\ntype Translator = (key: string, fallback?: string, params?: Record<string, string | number>) => string\n\nexport type ResourceNotesGuardedMutation = <T>(\n  runner: () => Promise<T>,\n  payload?: Record<string, unknown>,\n) => Promise<T>\n\nexport type CreateResourceNotesAdapterOptions = {\n  runMutation?: ResourceNotesGuardedMutation\n}\n\nexport function createResourceNotesAdapter(\n  translator: Translator,\n  options: CreateResourceNotesAdapterOptions = {},\n): NotesDataAdapter {\n  const runWrite = async <T,>(\n    runner: () => Promise<T>,\n    payload: Record<string, unknown>,\n  ): Promise<T> => {\n    if (options.runMutation) {\n      return options.runMutation(runner, payload)\n    }\n    return runner()\n  }\n\n  return {\n    list: async ({ entityId }) => {\n      const params = new URLSearchParams()\n      if (entityId) params.set('entityId', entityId)\n      const payload = await readApiResultOrThrow<Record<string, unknown>>(\n        `/api/resources/comments?${params.toString()}`,\n        undefined,\n        { errorMessage: translator('resources.resources.detail.notes.loadError', 'Failed to load notes.') },\n      )\n      const items = Array.isArray(payload?.items) ? payload.items : []\n      return items.map(mapCommentSummary)\n    },\n    create: async ({ entityId, body, appearanceIcon, appearanceColor }) => {\n      const requestBody = {\n        entityId,\n        body,\n        appearanceIcon: appearanceIcon ?? undefined,\n        appearanceColor: appearanceColor ?? undefined,\n      }\n      const response = await runWrite(\n        () => apiCallOrThrow<Record<string, unknown>>(\n          '/api/resources/comments',\n          {\n            method: 'POST',\n            headers: { 'content-type': 'application/json' },\n            body: JSON.stringify(requestBody),\n          },\n          { errorMessage: translator('resources.resources.detail.notes.error', 'Failed to save note.') },\n        ),\n        { operation: 'createNote', entityId },\n      )\n      return response.result ?? {}\n    },\n    update: async ({ id, patch }) => {\n      const payload: Record<string, unknown> = { id }\n      if (patch.body !== undefined) payload.body = patch.body\n      if (patch.appearanceIcon !== undefined) payload.appearanceIcon = patch.appearanceIcon\n      if (patch.appearanceColor !== undefined) payload.appearanceColor = patch.appearanceColor\n      await runWrite(\n        () => apiCallOrThrow(\n          '/api/resources/comments',\n          {\n            method: 'PUT',\n            headers: { 'content-type': 'application/json' },\n            body: JSON.stringify(payload),\n          },\n          { errorMessage: translator('resources.resources.detail.notes.updateError', 'Failed to update note.') },\n        ),\n        { operation: 'updateNote', id },\n      )\n    },\n    delete: async ({ id }) => {\n      await runWrite(\n        () => apiCallOrThrow(\n          `/api/resources/comments?id=${encodeURIComponent(id)}`,\n          {\n            method: 'DELETE',\n            headers: { 'content-type': 'application/json' },\n          },\n          { errorMessage: translator('resources.resources.detail.notes.deleteError', 'Failed to delete note') },\n        ),\n        { operation: 'deleteNote', id },\n      )\n    },\n  }\n}\n"],
-  "mappings": ";AAEA,SAAS,gBAAgB,4BAA4B;AACrD,SAAS,yBAAgD;AAalD,SAAS,2BACd,YACA,UAA6C,CAAC,GAC5B;AAClB,QAAM,WAAW,OACf,QACA,YACe;AACf,QAAI,QAAQ,aAAa;AACvB,aAAO,QAAQ,YAAY,QAAQ,OAAO;AAAA,IAC5C;AACA,WAAO,OAAO;AAAA,EAChB;AAEA,SAAO;AAAA,IACL,MAAM,OAAO,EAAE,SAAS,MAAM;AAC5B,YAAM,SAAS,IAAI,gBAAgB;AACnC,UAAI,SAAU,QAAO,IAAI,YAAY,QAAQ;AAC7C,YAAM,UAAU,MAAM;AAAA,QACpB,2BAA2B,OAAO,SAAS,CAAC;AAAA,QAC5C;AAAA,QACA,EAAE,cAAc,WAAW,8CAA8C,uBAAuB,EAAE;AAAA,MACpG;AACA,YAAM,QAAQ,MAAM,QAAQ,SAAS,KAAK,IAAI,QAAQ,QAAQ,CAAC;AAC/D,aAAO,MAAM,IAAI,iBAAiB;AAAA,IACpC;AAAA,IACA,QAAQ,OAAO,EAAE,UAAU,MAAM,gBAAgB,gBAAgB,MAAM;AACrE,YAAM,cAAc;AAAA,QAClB;AAAA,QACA;AAAA,QACA,gBAAgB,kBAAkB;AAAA,QAClC,iBAAiB,mBAAmB;AAAA,MACtC;AACA,YAAM,WAAW,MAAM;AAAA,QACrB,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,QAAQ;AAAA,YACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,YAC9C,MAAM,KAAK,UAAU,WAAW;AAAA,UAClC;AAAA,UACA,EAAE,cAAc,WAAW,0CAA0C,sBAAsB,EAAE;AAAA,QAC/F;AAAA,QACA,EAAE,WAAW,cAAc,SAAS;AAAA,MACtC;AACA,aAAO,SAAS,UAAU,CAAC;AAAA,IAC7B;AAAA,IACA,QAAQ,OAAO,EAAE,IAAI,MAAM,MAAM;AAC/B,YAAM,UAAmC,EAAE,GAAG;AAC9C,UAAI,MAAM,SAAS,OAAW,SAAQ,OAAO,MAAM;AACnD,UAAI,MAAM,mBAAmB,OAAW,SAAQ,iBAAiB,MAAM;AACvE,UAAI,MAAM,oBAAoB,OAAW,SAAQ,kBAAkB,MAAM;AACzE,YAAM;AAAA,QACJ,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,QAAQ;AAAA,YACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,YAC9C,MAAM,KAAK,UAAU,OAAO;AAAA,UAC9B;AAAA,UACA,EAAE,cAAc,WAAW,gDAAgD,wBAAwB,EAAE;AAAA,QACvG;AAAA,QACA,EAAE,WAAW,cAAc,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,IACA,QAAQ,OAAO,EAAE,GAAG,MAAM;AACxB,YAAM;AAAA,QACJ,MAAM;AAAA,UACJ,8BAA8B,mBAAmB,EAAE,CAAC;AAAA,UACpD;AAAA,YACE,QAAQ;AAAA,YACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,UAChD;AAAA,UACA,EAAE,cAAc,WAAW,gDAAgD,uBAAuB,EAAE;AAAA,QACtG;AAAA,QACA,EAAE,WAAW,cAAc,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["\"use client\"\n\nimport { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'\nimport { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'\nimport { mapCommentSummary, type NotesDataAdapter } from '@open-mercato/ui/backend/detail/NotesSection'\n\ntype Translator = (key: string, fallback?: string, params?: Record<string, string | number>) => string\n\nexport type ResourceNotesGuardedMutation = <T>(\n  runner: () => Promise<T>,\n  payload?: Record<string, unknown>,\n) => Promise<T>\n\nexport type CreateResourceNotesAdapterOptions = {\n  runMutation?: ResourceNotesGuardedMutation\n}\n\nexport function createResourceNotesAdapter(\n  translator: Translator,\n  options: CreateResourceNotesAdapterOptions = {},\n): NotesDataAdapter {\n  const runWrite = async <T,>(\n    runner: () => Promise<T>,\n    payload: Record<string, unknown>,\n  ): Promise<T> => {\n    if (options.runMutation) {\n      return options.runMutation(runner, payload)\n    }\n    return runner()\n  }\n\n  return {\n    list: async ({ entityId }) => {\n      const params = new URLSearchParams()\n      if (entityId) params.set('entityId', entityId)\n      const payload = await readApiResultOrThrow<Record<string, unknown>>(\n        `/api/resources/comments?${params.toString()}`,\n        undefined,\n        { errorMessage: translator('resources.resources.detail.notes.loadError', 'Failed to load notes.') },\n      )\n      const items = Array.isArray(payload?.items) ? payload.items : []\n      return items.map(mapCommentSummary)\n    },\n    create: async ({ entityId, body, appearanceIcon, appearanceColor }) => {\n      const requestBody = {\n        entityId,\n        body,\n        appearanceIcon: appearanceIcon ?? undefined,\n        appearanceColor: appearanceColor ?? undefined,\n      }\n      const response = await runWrite(\n        () => apiCallOrThrow<Record<string, unknown>>(\n          '/api/resources/comments',\n          {\n            method: 'POST',\n            headers: { 'content-type': 'application/json' },\n            body: JSON.stringify(requestBody),\n          },\n          { errorMessage: translator('resources.resources.detail.notes.error', 'Failed to save note.') },\n        ),\n        { operation: 'createNote', entityId },\n      )\n      return response.result ?? {}\n    },\n    update: async ({ id, patch, updatedAt }) => {\n      const payload: Record<string, unknown> = { id }\n      if (patch.body !== undefined) payload.body = patch.body\n      if (patch.appearanceIcon !== undefined) payload.appearanceIcon = patch.appearanceIcon\n      if (patch.appearanceColor !== undefined) payload.appearanceColor = patch.appearanceColor\n      // Run through the guarded-mutation runner AND send the optimistic-lock header\n      // (note's loaded updatedAt) so a stale edit fails with a 409; the shared\n      // NotesSection host surfaces it through surfaceRecordConflict instead of\n      // silently overwriting.\n      await runWrite(\n        () => withScopedApiRequestHeaders(\n          buildOptimisticLockHeader(updatedAt ?? null),\n          () => apiCallOrThrow(\n            '/api/resources/comments',\n            {\n              method: 'PUT',\n              headers: { 'content-type': 'application/json' },\n              body: JSON.stringify(payload),\n            },\n            { errorMessage: translator('resources.resources.detail.notes.updateError', 'Failed to update note.') },\n          ),\n        ),\n        { operation: 'updateNote', id },\n      )\n    },\n    delete: async ({ id, updatedAt }) => {\n      await runWrite(\n        () => withScopedApiRequestHeaders(\n          buildOptimisticLockHeader(updatedAt ?? null),\n          () => apiCallOrThrow(\n            `/api/resources/comments?id=${encodeURIComponent(id)}`,\n            {\n              method: 'DELETE',\n              headers: { 'content-type': 'application/json' },\n            },\n            { errorMessage: translator('resources.resources.detail.notes.deleteError', 'Failed to delete note') },\n          ),\n        ),\n        { operation: 'deleteNote', id },\n      )\n    },\n  }\n}\n"],
+  "mappings": ";AAEA,SAAS,gBAAgB,sBAAsB,mCAAmC;AAClF,SAAS,iCAAiC;AAC1C,SAAS,yBAAgD;AAalD,SAAS,2BACd,YACA,UAA6C,CAAC,GAC5B;AAClB,QAAM,WAAW,OACf,QACA,YACe;AACf,QAAI,QAAQ,aAAa;AACvB,aAAO,QAAQ,YAAY,QAAQ,OAAO;AAAA,IAC5C;AACA,WAAO,OAAO;AAAA,EAChB;AAEA,SAAO;AAAA,IACL,MAAM,OAAO,EAAE,SAAS,MAAM;AAC5B,YAAM,SAAS,IAAI,gBAAgB;AACnC,UAAI,SAAU,QAAO,IAAI,YAAY,QAAQ;AAC7C,YAAM,UAAU,MAAM;AAAA,QACpB,2BAA2B,OAAO,SAAS,CAAC;AAAA,QAC5C;AAAA,QACA,EAAE,cAAc,WAAW,8CAA8C,uBAAuB,EAAE;AAAA,MACpG;AACA,YAAM,QAAQ,MAAM,QAAQ,SAAS,KAAK,IAAI,QAAQ,QAAQ,CAAC;AAC/D,aAAO,MAAM,IAAI,iBAAiB;AAAA,IACpC;AAAA,IACA,QAAQ,OAAO,EAAE,UAAU,MAAM,gBAAgB,gBAAgB,MAAM;AACrE,YAAM,cAAc;AAAA,QAClB;AAAA,QACA;AAAA,QACA,gBAAgB,kBAAkB;AAAA,QAClC,iBAAiB,mBAAmB;AAAA,MACtC;AACA,YAAM,WAAW,MAAM;AAAA,QACrB,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,YACE,QAAQ;AAAA,YACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,YAC9C,MAAM,KAAK,UAAU,WAAW;AAAA,UAClC;AAAA,UACA,EAAE,cAAc,WAAW,0CAA0C,sBAAsB,EAAE;AAAA,QAC/F;AAAA,QACA,EAAE,WAAW,cAAc,SAAS;AAAA,MACtC;AACA,aAAO,SAAS,UAAU,CAAC;AAAA,IAC7B;AAAA,IACA,QAAQ,OAAO,EAAE,IAAI,OAAO,UAAU,MAAM;AAC1C,YAAM,UAAmC,EAAE,GAAG;AAC9C,UAAI,MAAM,SAAS,OAAW,SAAQ,OAAO,MAAM;AACnD,UAAI,MAAM,mBAAmB,OAAW,SAAQ,iBAAiB,MAAM;AACvE,UAAI,MAAM,oBAAoB,OAAW,SAAQ,kBAAkB,MAAM;AAKzE,YAAM;AAAA,QACJ,MAAM;AAAA,UACJ,0BAA0B,aAAa,IAAI;AAAA,UAC3C,MAAM;AAAA,YACJ;AAAA,YACA;AAAA,cACE,QAAQ;AAAA,cACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,cAC9C,MAAM,KAAK,UAAU,OAAO;AAAA,YAC9B;AAAA,YACA,EAAE,cAAc,WAAW,gDAAgD,wBAAwB,EAAE;AAAA,UACvG;AAAA,QACF;AAAA,QACA,EAAE,WAAW,cAAc,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,IACA,QAAQ,OAAO,EAAE,IAAI,UAAU,MAAM;AACnC,YAAM;AAAA,QACJ,MAAM;AAAA,UACJ,0BAA0B,aAAa,IAAI;AAAA,UAC3C,MAAM;AAAA,YACJ,8BAA8B,mBAAmB,EAAE,CAAC;AAAA,YACpD;AAAA,cACE,QAAQ;AAAA,cACR,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,YAChD;AAAA,YACA,EAAE,cAAc,WAAW,gDAAgD,uBAAuB,EAAE;AAAA,UACtG;AAAA,QACF;AAAA,QACA,EAAE,WAAW,cAAc,GAAG;AAAA,MAChC;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/sales/backend/sales/documents/[id]/page.js

@@ -1,7 +1,7 @@
 "use client";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
-import { useSearchParams, useRouter } from "next/navigation";
+import { useSearchParams, useRouter, usePathname } from "next/navigation";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
 import {
   CustomDataSection,
@@ -61,6 +61,7 @@ import { ICON_SUGGESTIONS } from "@open-mercato/core/modules/customers/lib/dicti
 import { readMarkdownPreferenceCookie, writeMarkdownPreferenceCookie } from "@open-mercato/core/modules/customers/lib/markdownPreference";
 import { InjectionSpot, useInjectionWidgets } from "@open-mercato/ui/backend/injection/InjectionSpot";
 import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
+import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from "@open-mercato/ui/backend/injection/recordContext";
 function formatMessageAmount(amount, currency) {
   if (typeof amount !== "number" || !Number.isFinite(amount)) return null;
   if (!currency) return amount.toLocaleString();
@@ -1495,6 +1496,7 @@ function SalesDocumentDetailPage({
   const t = useT();
   const router = useRouter();
   const searchParams = useSearchParams();
+  const pathname = usePathname();
   const { confirm, ConfirmDialogElement } = useConfirmDialog();
   const [loading, setLoading] = React.useState(true);
   const [isNotFound, setIsNotFound] = React.useState(false);
@@ -1565,6 +1567,15 @@ function SalesDocumentDetailPage({
     },
     [detailInjectionContext, runMutation]
   );
+  useSetCurrentRecordInjectionContext(
+    buildRecordInjectionContext({
+      resourceKind: `sales.${kind}`,
+      resourceId: record?.id ?? null,
+      updatedAt: record?.updatedAt ?? null,
+      data: record,
+      path: pathname
+    })
+  );
   const clearCustomerError = React.useCallback(() => setCustomerError(null), []);
   const { data: currencyDictionary } = useCurrencyDictionary();
   const scopeVersion = useOrganizationScopeVersion();
@@ -3515,6 +3526,7 @@ function SalesDocumentDetailPage({
             currencyCode: record.currencyCode ?? null,
             organizationId: record?.organizationId ?? record?.organization_id ?? null,
             tenantId: record?.tenantId ?? record?.tenant_id ?? null,
+            documentUpdatedAt: record.updatedAt ?? null,
             shippingAddressSnapshot: shippingSnapshot ?? null,
             onActionChange: handleSectionActionChange,
             onAddComment: appendShipmentComment
@@ -3578,6 +3590,7 @@ function SalesDocumentDetailPage({
           currencyCode: record.currencyCode ?? null,
           organizationId: record?.organizationId ?? record?.organization_id ?? null,
           tenantId: record?.tenantId ?? record?.tenant_id ?? null,
+          documentUpdatedAt: record.updatedAt ?? null,
           onActionChange: handleSectionActionChange,
           onPaymentsChange: (payments) => setHasPayments(payments.length > 0),
           onTotalsChange: () => {