@open-mercato/core 0.5.1-develop.2663.2c29774b5b → 0.5.1-develop.2681.c559bb2bc3

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

@@ -11,9 +11,15 @@
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
-          "primary": false,
+          "primary": true,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
           "default": "gen_random_uuid()",
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "organization_id": {
@@ -23,6 +29,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "tenant_id": {
@@ -32,6 +45,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "key": {
@@ -41,6 +61,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "name": {
@@ -50,6 +77,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "description": {
@@ -59,6 +93,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "is_system": {
@@ -68,7 +109,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
           "default": "false",
+          "comment": null,
+          "enumItems": [],
           "mappedType": "boolean"
         },
         "is_active": {
@@ -78,7 +125,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
           "default": "true",
+          "comment": null,
+          "enumItems": [],
           "mappedType": "boolean"
         },
         "manager_visibility": {
@@ -88,7 +141,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
           "default": "'default'",
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "created_at": {
@@ -98,7 +157,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
           "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "datetime"
         },
         "updated_at": {
@@ -108,7 +173,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
           "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "datetime"
         },
         "deleted_at": {
@@ -118,7 +189,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": true,
+          "unique": false,
           "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "datetime"
         }
       },
@@ -159,9 +236,15 @@
           "type": "uuid",
           "unsigned": false,
           "autoincrement": false,
-          "primary": false,
+          "primary": true,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
           "default": "gen_random_uuid()",
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "dictionary_id": {
@@ -171,6 +254,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "organization_id": {
@@ -180,6 +270,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "tenant_id": {
@@ -189,6 +286,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "uuid"
         },
         "value": {
@@ -198,6 +302,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "normalized_value": {
@@ -207,6 +318,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "label": {
@@ -216,6 +334,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "color": {
@@ -225,6 +350,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
         "icon": {
@@ -234,8 +366,47 @@
           "autoincrement": false,
           "primary": false,
           "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "text"
         },
+        "position": {
+          "name": "position",
+          "type": "int",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "0",
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "integer"
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": false,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": "false",
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "boolean"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -243,7 +414,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
           "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "datetime"
         },
         "updated_at": {
@@ -253,7 +430,13 @@
           "autoincrement": false,
           "primary": false,
           "nullable": false,
+          "unique": false,
           "length": 6,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
           "mappedType": "datetime"
         }
       },
@@ -308,7 +491,6 @@
             "id"
           ],
           "referencedTableName": "public.dictionaries",
-          "createForeignKeyConstraint": true,
           "updateRule": "cascade"
         }
       },

package/src/modules/dictionaries/migrations/Migration20260410171544.ts

@@ -0,0 +1,49 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260410171544 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "dictionary_entries" add column "position" int not null default 0, add column "is_default" boolean not null default false;`);
+    this.addSql(`
+      with ranked_entries as (
+        select
+          "id",
+          row_number() over (
+            partition by "dictionary_id", "organization_id", "tenant_id"
+            order by lower("label"), lower("value"), "id"
+          ) - 1 as "rank"
+        from "dictionary_entries"
+      )
+      update "dictionary_entries" as "entries"
+      set "position" = ranked_entries."rank"
+      from ranked_entries
+      where ranked_entries."id" = "entries"."id";
+    `);
+    this.addSql(`create unique index "dictionary_entries_one_default_per_dict" on "dictionary_entries" ("dictionary_id", "organization_id", "tenant_id") where "is_default" = true;`);
+    // Seed an initial default for the out-of-the-box `customers.status` dictionary only.
+    // Scoped by the seeded key + normalized 'active' value so tenants that customized
+    // their status dictionary (renamed the key, removed 'active', or already set a
+    // default through the new UI after deploying this migration) are not overridden.
+    this.addSql(`
+      update "dictionary_entries" as "entries"
+      set "is_default" = true
+      from "dictionaries" as "dictionaries"
+      where "entries"."dictionary_id" = "dictionaries"."id"
+        and "dictionaries"."key" = 'customers.status'
+        and "entries"."normalized_value" = 'active'
+        and not exists (
+          select 1 from "dictionary_entries" as "existing"
+          where "existing"."dictionary_id" = "entries"."dictionary_id"
+            and "existing"."organization_id" = "entries"."organization_id"
+            and "existing"."tenant_id" = "entries"."tenant_id"
+            and "existing"."is_default" = true
+        );
+    `);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "dictionary_entries_one_default_per_dict";`);
+    this.addSql(`alter table "dictionary_entries" drop column "position", drop column "is_default";`);
+  }
+
+}

package/src/modules/inbox_ops/api/proposals/[id]/route.ts

@@ -49,7 +49,10 @@ export async function GET(req: Request) {
     ])
 
     return NextResponse.json({
-      proposal,
+      proposal: {
+        ...proposal,
+        actions,
+      },
       actions,
       discrepancies,
       email,

package/src/modules/query_index/lib/engine.ts

@@ -753,6 +753,14 @@ export class HybridQueryEngine implements QueryEngine {
       }
     }
 
+    // `eq` is accepted alongside `like`/`ilike` so that filters against
+    // encrypted joined columns (whose ciphertext cannot be compared for
+    // equality in SQL) can still resolve via tokenized search. Routing
+    // only applies when `searchEnabled` is true AND the joined entity has
+    // search tokens installed (`searchAvailable`); non-searchable columns
+    // still fall through to exact SQL equality. Token match is approximate —
+    // callers needing strict equality on encrypted fields should filter on
+    // the deterministic `*_hash` column instead.
     const applyJoinSearchFilterOp = async (
       target: ResultBuilder,
       filter: { column: string; op: FilterOp; value?: unknown },
@@ -760,7 +768,7 @@ export class HybridQueryEngine implements QueryEngine {
       join: ResolvedJoin,
     ): Promise<boolean> => {
       if (!searchEnabled || !join.entityId) return false
-      if (!['like', 'ilike'].includes(filter.op)) return false
+      if (!['eq', 'like', 'ilike'].includes(filter.op)) return false
       if (typeof filter.value !== 'string' || filter.value.trim().length === 0) return false
 
       let searchAvailable = joinSearchAvailability.get(join.entityId)

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

@@ -6,6 +6,7 @@ import * as React from 'react'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { createCrud } from '@open-mercato/ui/backend/utils/crud'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { ErrorMessage, LoadingMessage, TabEmptyState } from '@open-mercato/ui/backend/detail'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Switch } from '@open-mercato/ui/primitives/switch'
@@ -219,6 +220,40 @@ export function SalesDocumentAddressesSection({
   const [editingAddressId, setEditingAddressId] = React.useState<string | null>(null)
   const [editingDraft, setEditingDraft] = React.useState<AddressEditorDraft>(emptyDraft)
   const [editingSaving, setEditingSaving] = React.useState(false)
+  const mutationContextId = React.useMemo(
+    () => `sales-document-addresses:${kind}:${documentId}`,
+    [documentId, kind],
+  )
+  const resourceKind = React.useMemo(() => (kind === 'order' ? 'sales.order' : 'sales.quote'), [kind])
+  const { runMutation, retryLastMutation } = useGuardedMutation<{
+    formId: string
+    resourceKind: string
+    resourceId: string
+    kind: 'order' | 'quote'
+    retryLastMutation: () => Promise<boolean>
+  }>({
+    contextId: mutationContextId,
+    blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
+  })
+  const mutationContext = React.useMemo(
+    () => ({
+      formId: mutationContextId,
+      resourceKind,
+      resourceId: documentId,
+      kind,
+      retryLastMutation,
+    }),
+    [documentId, kind, mutationContextId, resourceKind, retryLastMutation],
+  )
+  const runGuardedMutation = React.useCallback(
+    async <T,>(operation: () => Promise<T>, mutationPayload: Record<string, unknown>) =>
+      runMutation({
+        operation,
+        mutationPayload,
+        context: mutationContext,
+      }),
+    [mutationContext, runMutation],
+  )
 
   const customerRequired = !customerId
   const addressOptionsMap = React.useMemo(() => {
@@ -630,30 +665,35 @@ export function SalesDocumentAddressesSection({
 
     setEditingSaving(true)
     try {
-      await apiCallOrThrow(
-        '/api/sales/document-addresses',
-        {
-          method: 'PUT',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            id: editingAddressId,
-            documentId,
-            documentKind: kind,
-            customerAddressId: current.customerAddressId ?? undefined,
-            name: nameValue,
-            purpose: purposeValue,
-            companyName: updatedValue.companyName,
-            addressLine1: updatedValue.addressLine1,
-            addressLine2: updatedValue.addressLine2,
-            buildingNumber: updatedValue.buildingNumber,
-            flatNumber: updatedValue.flatNumber,
-            city: updatedValue.city,
-            region: updatedValue.region,
-            postalCode: updatedValue.postalCode,
-            country: updatedValue.country,
-          }),
-        },
-        { errorMessage: t('sales.documents.detail.addresses.saveError', 'Failed to update addresses.') }
+      const payload = {
+        id: editingAddressId,
+        documentId,
+        documentKind: kind,
+        customerAddressId: current.customerAddressId ?? undefined,
+        name: nameValue,
+        purpose: purposeValue,
+        companyName: updatedValue.companyName,
+        addressLine1: updatedValue.addressLine1,
+        addressLine2: updatedValue.addressLine2,
+        buildingNumber: updatedValue.buildingNumber,
+        flatNumber: updatedValue.flatNumber,
+        city: updatedValue.city,
+        region: updatedValue.region,
+        postalCode: updatedValue.postalCode,
+        country: updatedValue.country,
+      }
+      await runGuardedMutation(
+        () =>
+          apiCallOrThrow(
+            '/api/sales/document-addresses',
+            {
+              method: 'PUT',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(payload),
+            },
+            { errorMessage: t('sales.documents.detail.addresses.saveError', 'Failed to update addresses.') },
+          ),
+        payload,
       )
       setDocumentAddresses((prev) =>
         prev.map((entry) =>
@@ -680,7 +720,7 @@ export function SalesDocumentAddressesSection({
     } finally {
       setEditingSaving(false)
     }
-  }, [documentAddresses, documentId, editingAddressId, editingDraft, handleCancelEdit, kind, resolveAddressSummary, t])
+  }, [documentAddresses, documentId, editingAddressId, editingDraft, handleCancelEdit, kind, resolveAddressSummary, runGuardedMutation, t])
 
   const handleDeleteDocumentAddress = React.useCallback(
     async (id: string) => {
@@ -700,14 +740,19 @@ export function SalesDocumentAddressesSection({
         return next
       })
       try {
-        await apiCallOrThrow(
-          '/api/sales/document-addresses',
-          {
-            method: 'DELETE',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ id, documentId, documentKind: kind }),
-          },
-          { errorMessage: t('sales.documents.detail.addresses.deleteError', 'Failed to remove address.') }
+        const payload = { id, documentId, documentKind: kind }
+        await runGuardedMutation(
+          () =>
+            apiCallOrThrow(
+              '/api/sales/document-addresses',
+              {
+                method: 'DELETE',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+              },
+              { errorMessage: t('sales.documents.detail.addresses.deleteError', 'Failed to remove address.') },
+            ),
+          payload,
         )
         setDocumentAddresses((prev) => prev.filter((entry) => entry.id !== id))
         if (editingAddressId === id) {
@@ -728,7 +773,7 @@ export function SalesDocumentAddressesSection({
         })
       }
     },
-    [confirm, documentId, editingAddressId, handleCancelEdit, kind, t]
+    [confirm, documentId, editingAddressId, handleCancelEdit, kind, runGuardedMutation, t]
   )
 
   const handleSave = React.useCallback(async () => {
@@ -795,14 +840,18 @@ export function SalesDocumentAddressesSection({
       payload.billingAddressId = billingSnapshot ? null : billingId
 
       const endpoint = kind === 'order' ? '/api/sales/orders' : '/api/sales/quotes'
-      const call = await apiCallOrThrow<Record<string, unknown>>(
-        endpoint,
-        {
-          method: 'PUT',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload),
-        },
-        { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') }
+      const call = await runGuardedMutation(
+        () =>
+          apiCallOrThrow<Record<string, unknown>>(
+            endpoint,
+            {
+              method: 'PUT',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(payload),
+            },
+            { errorMessage: t('sales.documents.detail.updateError', 'Failed to update document.') },
+          ),
+        payload,
       )
       const result = call.result ?? {}
       onUpdated?.({
@@ -843,6 +892,7 @@ export function SalesDocumentAddressesSection({
     shippingDraft,
     t,
     loadAddresses,
+    runGuardedMutation,
     useCustomBilling,
     useCustomShipping,
   ])