@open-mercato/core 0.6.8-develop.7042.1.413df59570 → 0.6.8-develop.7046.1.153faed87a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.8-develop.7042.1.413df59570",
+  "version": "0.6.8-develop.7046.1.153faed87a",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -252,16 +252,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.8-develop.7042.1.413df59570",
-    "@open-mercato/shared": "0.6.8-develop.7042.1.413df59570",
-    "@open-mercato/ui": "0.6.8-develop.7042.1.413df59570",
+    "@open-mercato/ai-assistant": "0.6.8-develop.7046.1.153faed87a",
+    "@open-mercato/shared": "0.6.8-develop.7046.1.153faed87a",
+    "@open-mercato/ui": "0.6.8-develop.7046.1.153faed87a",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.8-develop.7042.1.413df59570",
-    "@open-mercato/shared": "0.6.8-develop.7042.1.413df59570",
-    "@open-mercato/ui": "0.6.8-develop.7042.1.413df59570",
+    "@open-mercato/ai-assistant": "0.6.8-develop.7046.1.153faed87a",
+    "@open-mercato/shared": "0.6.8-develop.7046.1.153faed87a",
+    "@open-mercato/ui": "0.6.8-develop.7046.1.153faed87a",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.3.1",

package/src/modules/audit_logs/lib/display-helpers.tsx

@@ -33,9 +33,9 @@ export function renderValue(value: unknown, fallback: string) {
   if (typeof value === 'boolean') return <span>{value ? 'true' : 'false'}</span>
   if (typeof value === 'number' || typeof value === 'bigint') return <span>{String(value)}</span>
   if (value instanceof Date) return <span>{value.toISOString()}</span>
-  if (typeof value === 'string') return <span className="break-words">{value}</span>
+  if (typeof value === 'string') return <span className="wrap-anywhere">{value}</span>
   return (
-    <pre className="max-h-40 overflow-y-auto whitespace-pre-wrap break-words rounded-md bg-muted/50 px-2 py-1 text-xs leading-5 text-muted-foreground">
+    <pre className="max-h-40 overflow-y-auto whitespace-pre-wrap wrap-anywhere rounded-md bg-muted/50 px-2 py-1 text-xs leading-5 text-muted-foreground">
       {safeStringify(value)}
     </pre>
   )
@@ -76,43 +76,53 @@ export type ChangedFieldsTableProps = {
 }
 
 export function ChangedFieldsTable({ changeRows, noneLabel, t, beforeLabel, afterLabel }: ChangedFieldsTableProps) {
+  const beforeHeading = beforeLabel ?? t('audit_logs.actions.details.before')
+  const afterHeading = afterLabel ?? t('audit_logs.actions.details.after')
   return (
     <section>
       <h3 className="text-sm font-semibold">
         {t('audit_logs.actions.details.changed_fields')}
       </h3>
       {changeRows.length ? (
-        <div className="mt-2 overflow-x-auto rounded-lg border">
-          <table className="min-w-full divide-y text-sm">
-            <thead className="bg-muted/50">
-              <tr>
-                <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
-                  {t('audit_logs.actions.details.field')}
-                </th>
-                <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
-                  {beforeLabel ?? t('audit_logs.actions.details.before')}
-                </th>
-                <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
-                  {afterLabel ?? t('audit_logs.actions.details.after')}
-                </th>
-              </tr>
-            </thead>
-            <tbody className="divide-y">
-              {changeRows.map((row) => (
-                <tr key={row.field} className="align-top">
-                  <td className="px-4 py-2 align-top font-medium">
-                    {humanizeField(normalizeChangeField(row.field))}
-                  </td>
-                  <td className="px-4 py-2">
-                    {renderValue(row.from, noneLabel)}
-                  </td>
-                  <td className="px-4 py-2">
-                    {renderValue(row.to, noneLabel)}
-                  </td>
+        <div className="@container/changes mt-2">
+          <div className="overflow-x-auto rounded-lg border">
+            <table className="block w-full divide-y text-sm @lg/changes:table @lg/changes:min-w-full">
+              <thead className="hidden bg-muted/50 @lg/changes:table-header-group">
+                <tr>
+                  <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
+                    {t('audit_logs.actions.details.field')}
+                  </th>
+                  <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
+                    {beforeHeading}
+                  </th>
+                  <th scope="col" className="px-4 py-2 text-left font-medium text-muted-foreground">
+                    {afterHeading}
+                  </th>
                 </tr>
-              ))}
-            </tbody>
-          </table>
+              </thead>
+              <tbody className="block divide-y @lg/changes:table-row-group">
+                {changeRows.map((row) => (
+                  <tr key={row.field} className="block px-4 py-3 align-top @lg/changes:table-row @lg/changes:p-0">
+                    <td className="block font-medium @lg/changes:table-cell @lg/changes:px-4 @lg/changes:py-2 @lg/changes:align-top">
+                      {humanizeField(normalizeChangeField(row.field))}
+                    </td>
+                    <td className="mt-2 block @lg/changes:mt-0 @lg/changes:table-cell @lg/changes:px-4 @lg/changes:py-2">
+                      <span className="mb-0.5 block text-xs font-medium uppercase tracking-wide text-muted-foreground @lg/changes:hidden">
+                        {beforeHeading}
+                      </span>
+                      {renderValue(row.from, noneLabel)}
+                    </td>
+                    <td className="mt-2 block @lg/changes:mt-0 @lg/changes:table-cell @lg/changes:px-4 @lg/changes:py-2">
+                      <span className="mb-0.5 block text-xs font-medium uppercase tracking-wide text-muted-foreground @lg/changes:hidden">
+                        {afterHeading}
+                      </span>
+                      {renderValue(row.to, noneLabel)}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
         </div>
       ) : (
         <p className="mt-2 text-sm text-muted-foreground">

package/src/modules/customer_accounts/api/admin/domain-mappings.ts

@@ -14,6 +14,7 @@ import {
 import { registerDomainSchema } from '@open-mercato/core/modules/customer_accounts/data/validators'
 import {
   DomainMappingService,
+  DomainMappingOrgScopeError,
   type ResolveResult,
 } from '@open-mercato/core/modules/customer_accounts/services/domainMappingService'
 import { DomainMapping } from '@open-mercato/core/modules/customer_accounts/data/entities'
@@ -142,6 +143,12 @@ export async function POST(req: Request) {
         { status: 409 },
       )
     }
+    if (err instanceof DomainMappingOrgScopeError) {
+      return NextResponse.json(
+        { ok: false, error: 'Organization was not found in the current tenant.' },
+        { status: 400 },
+      )
+    }
     const message = err instanceof Error ? err.message : 'Failed to register domain'
     return NextResponse.json({ ok: false, error: message }, { status: 500 })
   }

package/src/modules/customer_accounts/services/domainMappingService.ts

@@ -9,9 +9,17 @@ import {
 import { Organization } from '@open-mercato/core/modules/directory/data/entities'
 import { emitCustomerAccountsEvent } from '@open-mercato/core/modules/customer_accounts/events'
 import { normalizeHostname, tryNormalizeHostname } from '@open-mercato/core/modules/customer_accounts/lib/hostname'
+import { findOrganizationInTenant } from '@open-mercato/core/modules/customer_accounts/lib/organizationLookup'
 import { platformDomains } from '@open-mercato/core/modules/customer_accounts/lib/platformDomains'
 import { detectProxy, isInKnownProxyRange } from '@open-mercato/core/modules/customer_accounts/lib/proxyRanges'
 
+export class DomainMappingOrgScopeError extends Error {
+  constructor(organizationId: string) {
+    super(`[internal] organizationId ${organizationId} does not belong to the caller's tenant`)
+    this.name = 'DomainMappingOrgScopeError'
+  }
+}
+
 const DOMAIN_ROUTING_TAG = 'domain_routing'
 const RESOLVE_KEY_PREFIX = 'domain_routing:resolve'
 const ACTIVE_BY_ORG_KEY_PREFIX = 'domain_routing:active-by-org'
@@ -269,6 +277,8 @@ export class DomainMappingService {
 
   async register(input: RegisterInput): Promise<DomainMapping> {
     const hostname = normalizeHostname(input.hostname)
+    const organization = await findOrganizationInTenant(this.em, input.organizationId, input.tenantId)
+    if (!organization) throw new DomainMappingOrgScopeError(input.organizationId)
 
     let replacesDomain: DomainMapping | null = null
     if (input.replacesDomainId) {

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

@@ -26,7 +26,6 @@ import { buildIlikeTerm } from '@open-mercato/shared/lib/db/buildIlikeTerm'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { parseIdsParam } from '@open-mercato/shared/lib/crud/ids'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
-import { recalculateOrderTotalsForDisplay } from '../../commands/returns'
 import { parseDecryptedFieldValue } from '@open-mercato/shared/lib/encryption/tenantDataEncryptionService'
 
 type DocumentKind = 'order' | 'quote'
@@ -616,46 +615,6 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
       afterList: async (payload: any, ctx: CrudCtx) => {
         await attachTags(payload, { ...ctx, bindingKind: binding.kind })
         await attachChannelNames(payload, ctx)
-        if (binding.kind === 'order' && Array.isArray(payload?.items) && payload.items.length === 1) {
-          const item = payload.items[0] as Record<string, unknown>
-          const orderId = typeof item?.id === 'string' ? item.id : null
-          const tenantId = typeof item?.tenantId === 'string' ? item.tenantId : ctx?.auth?.tenantId ?? null
-          const organizationId =
-            typeof item?.organizationId === 'string' ? item.organizationId : ctx?.selectedOrganizationId ?? ctx?.auth?.orgId ?? null
-          if (orderId && tenantId && organizationId) {
-            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,
-                ctx.container,
-                orderId,
-                { tenantId, organizationId },
-              )
-              if (totals) {
-                Object.assign(item, {
-                  subtotalNetAmount: totals.subtotalNetAmount,
-                  subtotalGrossAmount: totals.subtotalGrossAmount,
-                  discountTotalAmount: totals.discountTotalAmount,
-                  taxTotalAmount: totals.taxTotalAmount,
-                  shippingNetAmount: totals.shippingNetAmount,
-                  shippingGrossAmount: totals.shippingGrossAmount,
-                  surchargeTotalAmount: totals.surchargeTotalAmount,
-                  grandTotalNetAmount: totals.grandTotalNetAmount,
-                  grandTotalGrossAmount: totals.grandTotalGrossAmount,
-                  paidTotalAmount: totals.paidTotalAmount,
-                  refundedTotalAmount: totals.refundedTotalAmount,
-                  outstandingAmount: totals.outstandingAmount,
-                })
-              }
-            }
-          }
-        }
       },
     },
   }

package/src/modules/sales/commands/returns.ts

@@ -198,8 +198,10 @@ function buildCalculationContext(order: SalesOrder) {
 }
 
 /**
- * Recalculates order totals (including line-scoped return adjustments) for display.
- * Returns the totals object to merge into an order API response, or null if order not found.
+ * Recalculates order totals (including line-scoped return adjustments) from lines and
+ * adjustments. Do not merge this into GET /api/sales/orders responses: provider
+ * calculators re-emit shipping/payment fees on top of already-persisted adjustments
+ * and make list vs detail totals diverge (#5438). Persist via commands instead.
  */
 export async function recalculateOrderTotalsForDisplay(
   em: EntityManager,