@open-mercato/core 0.6.8-develop.7082.1.f2a845b020 → 0.6.8-develop.7090.1.4dbca7b350

package/src/modules/sales/components/documents/ShipmentsSection.tsx

@@ -10,7 +10,7 @@ import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/u
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   emitSalesDocumentTotalsRefresh,
@@ -41,11 +41,11 @@ type SalesShipmentsSectionProps = {
   onAddComment?: (body: string) => Promise<void>
 }
 
-function formatDisplayDate(value: string | null | undefined): string | null {
+export function formatDisplayDate(value: string | null | undefined, locale?: string): string | null {
   if (!value) return null
   const date = new Date(value)
   if (Number.isNaN(date.getTime())) return null
-  return new Intl.DateTimeFormat(undefined, { dateStyle: 'medium' }).format(date)
+  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(date)
 }
 
 const formatShipmentAddress = (metadata?: Record<string, unknown> | null): string | null => {
@@ -123,6 +123,7 @@ export function SalesShipmentsSection({
   onAddComment,
 }: SalesShipmentsSectionProps) {
   const t = useT()
+  const locale = useLocale()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const resolvedOrganizationId = organizationIdProp ?? organizationId ?? null
@@ -486,8 +487,8 @@ export function SalesShipmentsSection({
       ) : (
         <div className="grid gap-3 md:grid-cols-2">
           {shipments.map((shipment) => {
-            const shippedAt = formatDisplayDate(shipment.shippedAt)
-            const deliveredAt = formatDisplayDate(shipment.deliveredAt)
+            const shippedAt = formatDisplayDate(shipment.shippedAt, locale)
+            const deliveredAt = formatDisplayDate(shipment.deliveredAt, locale)
             const addressSummary = formatShipmentAddress(shipment.metadata)
             const statusLabel =
               shipment.statusLabel ??

package/src/modules/sales/components/documents/lineItemUtils.ts

@@ -9,9 +9,14 @@ export function normalizeNumber(value: unknown, fallback = 0): number {
   return fallback
 }
 
-export function formatMoney(value: number, currency: string | null | undefined): string {
+/**
+ * Pass `locale` to format in the application locale (`useLocale()` in client components).
+ * Omitting it keeps the runtime default, which varies per machine and is therefore not
+ * assertable in tests.
+ */
+export function formatMoney(value: number, currency: string | null | undefined, locale?: string): string {
   if (!currency) return value.toFixed(2)
-  return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value)
+  return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)
 }
 
 export type LineDiscountDisplay = {

package/src/modules/sales/data/entities.ts

@@ -1790,6 +1790,9 @@ export class SalesPaymentAllocation {
 
 @Entity({ tableName: 'sales_notes' })
 @Index({ name: 'sales_notes_scope_idx', properties: ['organizationId', 'tenantId'] })
+@Index({ name: 'sales_notes_context_idx', properties: ['contextId'] })
+@Index({ name: 'sales_notes_order_idx', properties: ['order'] })
+@Index({ name: 'sales_notes_quote_idx', properties: ['quote'] })
 export class SalesNote {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -1836,6 +1839,9 @@ export class SalesNote {
 
 @Entity({ tableName: 'sales_document_addresses' })
 @Index({ name: 'sales_document_addresses_scope_idx', properties: ['organizationId', 'tenantId'] })
+@Index({ name: 'sales_document_addresses_document_idx', properties: ['documentId'] })
+@Index({ name: 'sales_document_addresses_order_idx', properties: ['order'] })
+@Index({ name: 'sales_document_addresses_quote_idx', properties: ['quote'] })
 export class SalesDocumentAddress {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string

package/src/modules/sales/migrations/.snapshot-open-mercato.json

@@ -1962,6 +1962,36 @@
           "keyName": "sales_document_addresses_scope_idx",
           "primary": false,
           "unique": false
+        },
+        {
+          "columnNames": [
+            "document_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_document_addresses_document_idx",
+          "primary": false,
+          "unique": false
+        },
+        {
+          "columnNames": [
+            "order_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_document_addresses_order_idx",
+          "primary": false,
+          "unique": false
+        },
+        {
+          "columnNames": [
+            "quote_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_document_addresses_quote_idx",
+          "primary": false,
+          "unique": false
         }
       ],
       "checks": [],
@@ -3750,6 +3780,36 @@
           "keyName": "sales_notes_scope_idx",
           "primary": false,
           "unique": false
+        },
+        {
+          "columnNames": [
+            "context_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_notes_context_idx",
+          "primary": false,
+          "unique": false
+        },
+        {
+          "columnNames": [
+            "order_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_notes_order_idx",
+          "primary": false,
+          "unique": false
+        },
+        {
+          "columnNames": [
+            "quote_id"
+          ],
+          "composite": false,
+          "constraint": false,
+          "keyName": "sales_notes_quote_idx",
+          "primary": false,
+          "unique": false
         }
       ],
       "checks": [],

package/src/modules/sales/migrations/Migration20260821120000_sales_notes_addresses_context_idx.ts

@@ -0,0 +1,87 @@
+import { Migration } from '@mikro-orm/migrations';
+
+// sales_notes and sales_document_addresses each carried a single index —
+// (organization_id, tenant_id) — and are never read by that predicate alone.
+// loadOrderSnapshot / loadQuoteSnapshot (commands/documents.ts) read them by
+// context in the same Promise.all:
+//
+//   findWithDecryption(em, SalesNote, { contextType, contextId, ...scope })
+//   findWithDecryption(em, SalesDocumentAddress, { documentId, documentKind, ...scope })
+//
+// On a single-organization deployment the scope index matches every row, so the
+// planner discards it and scans. The cost is CPU filtering, so a warm cache does
+// not reduce it. Measured on a table of ~331k rows / 110 MB: a parallel
+// sequential scan removing 110,457 rows per worker, 82 ms per read to return 0
+// rows. The command bus runs prepare() and captureAfter() around every command
+// and both load a document snapshot, so one written document — itself several
+// commands (the document, one per changed line, the payment reconcile) —
+// performs roughly 20 of these reads. Counters over one bulk-import batch of 100
+// records showed 1,971 sequential scans reading 217,670,528 rows, 2.18M rows per
+// imported record; repeatable across consecutive batches (1,971 / 1,974 / 1,911).
+//
+// context_type and document_kind are deliberately omitted, as they were for
+// sales_document_tag_assignments_document_idx (Migration20260806120000), and the
+// scope columns with them. sales_orders.id and sales_quotes.id are both
+// gen_random_uuid() from their own tables, so a context_id already determines its
+// context_type and its tenant; the seek returns the handful of rows belonging to
+// one document and the remaining terms are rechecked over those. Folding three
+// more columns in — one text and two uuids — roughly triples the index entry for
+// no selectivity, on tables that take a write per document save and a note per
+// order status change. The sibling scope indexes that do fold scope in
+// (sales_order_lines_scope_idx, sales_payments_scope_idx) predate that reasoning.
+//
+// order_id and quote_id are separate indexes rather than a widening of the above:
+// both tables are the child side of `on delete set null` constraints, which
+// PostgreSQL does not index automatically, and the constraint check probes
+// order_id / quote_id — columns the context index cannot serve even though they
+// hold the same uuid. Without them every delete of a parent order or quote scans
+// the child table in full.
+//
+// Both tables are high-churn, so the indexes are built CONCURRENTLY to avoid
+// blocking writes during the build. CREATE INDEX CONCURRENTLY cannot run inside a
+// transaction, hence isTransactional() => false; the migration runner applies
+// migrations one-by-one, so this opt-out is safe. Drop first so retrying a failed
+// concurrent build removes PostgreSQL's invalid index stub instead of letting IF
+// NOT EXISTS silently accept it: a half-built concurrent index is left INVALID,
+// the planner ignores it, and IF NOT EXISTS would report success while the table
+// stays unindexed. Same shape as Migration20260806120000 and
+// Migration20260731105052_query_index.
+//
+// On a database that does not have these indexes yet — every fresh install — the
+// drops are no-ops and there is no window without them. An operator who already
+// created one out of band should expect it to be rebuilt here, and the reads that
+// depend on it to fall back to their pre-index cost until the concurrent build
+// finishes; on a large table, run this while the writers that depend on it are
+// paused.
+export class Migration20260821120000_sales_notes_addresses_context_idx extends Migration {
+
+  override isTransactional(): boolean {
+    return false;
+  }
+
+  override up(): void | Promise<void> {
+    this.addSql(`drop index concurrently if exists "sales_notes_context_idx";`);
+    this.addSql(`create index concurrently "sales_notes_context_idx" on "sales_notes" ("context_id");`);
+    this.addSql(`drop index concurrently if exists "sales_notes_order_idx";`);
+    this.addSql(`create index concurrently "sales_notes_order_idx" on "sales_notes" ("order_id");`);
+    this.addSql(`drop index concurrently if exists "sales_notes_quote_idx";`);
+    this.addSql(`create index concurrently "sales_notes_quote_idx" on "sales_notes" ("quote_id");`);
+
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_document_idx";`);
+    this.addSql(`create index concurrently "sales_document_addresses_document_idx" on "sales_document_addresses" ("document_id");`);
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_order_idx";`);
+    this.addSql(`create index concurrently "sales_document_addresses_order_idx" on "sales_document_addresses" ("order_id");`);
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_quote_idx";`);
+    this.addSql(`create index concurrently "sales_document_addresses_quote_idx" on "sales_document_addresses" ("quote_id");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_quote_idx";`);
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_order_idx";`);
+    this.addSql(`drop index concurrently if exists "sales_document_addresses_document_idx";`);
+    this.addSql(`drop index concurrently if exists "sales_notes_quote_idx";`);
+    this.addSql(`drop index concurrently if exists "sales_notes_order_idx";`);
+    this.addSql(`drop index concurrently if exists "sales_notes_context_idx";`);
+  }
+
+}

package/src/modules/staff/backend/staff/timesheets/page.tsx

@@ -178,6 +178,12 @@ export default function MyTimesheetsPage() {
     blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
   })
 
+  const gridInstanceId = React.useId()
+  const durationHintId = `${gridInstanceId}-duration-hint`
+  const buildDurationErrorId = React.useCallback(
+    (projectId: string, dateKey: string): string => `${gridInstanceId}-duration-error-${projectId}-${dateKey}`,
+    [gridInstanceId],
+  )
   const durationFormatHint = t(
     'staff.timesheets.my.duration.hint',
     'Enter hours (8 or 1.5), h:mm (1:30) or minutes (90m). Max 24h per day.',
@@ -919,6 +925,7 @@ export default function MyTimesheetsPage() {
                       const isDirty = dirty[project.id]?.[dateKey] !== undefined
                       const cellError = cellErrors[project.id]?.[dateKey]
                       const cellErrorMessage = cellError ? describeDurationError(cellError) : undefined
+                      const cellErrorId = cellErrorMessage ? buildDurationErrorId(project.id, dateKey) : undefined
                       return (
                         <td key={dateKey} className={`px-0.5 py-0.5 ${weekend ? 'bg-muted/40' : ''}`}>
                           {weekend ? (
@@ -943,9 +950,13 @@ export default function MyTimesheetsPage() {
                               placeholder={t('staff.timesheets.my.durationPlaceholder', '0')}
                               aria-invalid={cellError !== undefined}
                               aria-label={describeDurationCell(project.name, date)}
+                              aria-describedby={[durationHintId, cellErrorId].filter(Boolean).join(' ')}
                               title={cellErrorMessage ?? durationFormatHint}
                             />
                           )}
+                          {cellErrorMessage ? (
+                            <span id={cellErrorId} role="alert" className="sr-only">{cellErrorMessage}</span>
+                          ) : null}
                         </td>
                       )
                     })}
@@ -984,7 +995,7 @@ export default function MyTimesheetsPage() {
                 </tr>
               </tfoot>
             </table>
-            <p className="px-3 py-2 text-xs text-muted-foreground">{durationFormatHint}</p>
+            <p id={durationHintId} className="px-3 py-2 text-xs text-muted-foreground">{durationFormatHint}</p>
           </div>
         )}
         </div>