@open-mercato/core 0.6.6-develop.6338.1.c32cd17821 → 0.6.6-develop.6343.1.8120f84f30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6338.1.c32cd17821",
+  "version": "0.6.6-develop.6343.1.8120f84f30",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -246,16 +246,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6338.1.c32cd17821",
-    "@open-mercato/shared": "0.6.6-develop.6338.1.c32cd17821",
-    "@open-mercato/ui": "0.6.6-develop.6338.1.c32cd17821",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6343.1.8120f84f30",
+    "@open-mercato/shared": "0.6.6-develop.6343.1.8120f84f30",
+    "@open-mercato/ui": "0.6.6-develop.6343.1.8120f84f30",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6338.1.c32cd17821",
-    "@open-mercato/shared": "0.6.6-develop.6338.1.c32cd17821",
-    "@open-mercato/ui": "0.6.6-develop.6338.1.c32cd17821",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6343.1.8120f84f30",
+    "@open-mercato/shared": "0.6.6-develop.6343.1.8120f84f30",
+    "@open-mercato/ui": "0.6.6-develop.6343.1.8120f84f30",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/catalog/components/products/ProductComplianceSection.tsx

@@ -64,7 +64,7 @@ export function ProductComplianceSection({
     (code: string, checked: boolean) => {
       const current = Array.isArray(values.gtuCodes) ? values.gtuCodes : [];
       const next = checked
-        ? Array.from(new Set([...current, code])).sort()
+        ? Array.from(new Set([...current, code])).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))
         : current.filter((entry) => entry !== code);
       setValue("gtuCodes", next);
     },

package/src/modules/catalog/data/validators.ts

@@ -236,7 +236,7 @@ const productBaseSchema = scoped.extend({
   gtuCodes: z
     .array(z.enum(CATALOG_GTU_CODES))
     .max(13)
-    .transform((codes) => Array.from(new Set(codes)).sort())
+    .transform((codes) => Array.from(new Set(codes)).sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)))
     .nullable()
     .optional(),
   ageMin: z.coerce.number().int().min(0).max(120).nullable().optional(),

package/src/modules/communication_channels/backend/communication_channels/channels/[id]/page.tsx

@@ -159,7 +159,7 @@ export default function ChannelDetailPage() {
             </p>
           ) : (
             <dl className="grid grid-cols-2 gap-x-6 gap-y-1 text-sm md:grid-cols-3">
-              {capabilityKeys.sort().map((key) => (
+              {capabilityKeys.sort((a, b) => a.localeCompare(b)).map((key) => (
                 <React.Fragment key={key}>
                   <dt className="text-muted-foreground">{key}</dt>
                   <dd className="md:col-span-2">{renderCapabilityValue(capabilities[key])}</dd>

package/src/modules/communication_channels/lib/route-mutation-guard.ts

@@ -1,9 +1,5 @@
 import type { AwilixContainer } from 'awilix'
-import {
-  runCrudMutationGuardAfterSuccess,
-  validateCrudMutationGuard,
-  type CrudMutationGuardValidationResult,
-} from '@open-mercato/shared/lib/crud/mutation-guard'
+import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 
 type RouteAuth = {
   sub?: string | null
@@ -19,10 +15,21 @@ type RouteMutationGuardInput = {
 }
 
 export type RouteMutationGuardContext = {
-  result: CrudMutationGuardValidationResult | null
+  /**
+   * Marker kept for source compatibility with callers; the registry result is
+   * fully handled inside the wrapper, so callers only need `afterSuccess`.
+   */
+  result: { ok: true } | null
   afterSuccess: () => Promise<void>
 }
 
+/**
+ * Run a communication-channels custom write route through the full mutation
+ * guard registry (`runRouteMutationGuards`) instead of only the legacy DI
+ * service. Returns `{ response }` when a guard blocks the mutation, or
+ * `{ result, afterSuccess }` to run after a successful write — preserving the
+ * shape the dependent routes already consume.
+ */
 export async function validateRouteMutationGuard(params: {
   container: AwilixContainer
   req: Request
@@ -34,35 +41,28 @@ export async function validateRouteMutationGuard(params: {
     return { result: null, afterSuccess: async () => undefined }
   }
 
-  const base = {
-    tenantId: auth.tenantId,
-    organizationId: auth.orgId ?? null,
-    userId: auth.sub,
-    resourceKind: input.resourceKind,
-    resourceId: input.resourceId,
-    operation: input.operation ?? 'custom',
-    requestMethod: req.method,
-    requestHeaders: req.headers,
-  } as const
-
-  const result = await validateCrudMutationGuard(container, {
-    ...base,
-    mutationPayload: input.mutationPayload ?? null,
+  const guarded = await runRouteMutationGuards({
+    container,
+    req,
+    auth: {
+      userId: auth.sub,
+      tenantId: auth.tenantId,
+      organizationId: auth.orgId ?? null,
+    },
+    input: {
+      resourceKind: input.resourceKind,
+      resourceId: input.resourceId,
+      operation: input.operation ?? 'custom',
+      mutationPayload: input.mutationPayload ?? null,
+    },
   })
-  if (result && !result.ok) {
-    return {
-      response: Response.json(result.body, { status: result.status }),
-    }
+
+  if (!guarded.ok) {
+    return { response: guarded.response }
   }
 
   return {
-    result,
-    afterSuccess: async () => {
-      if (!result?.ok || !result.shouldRunAfterSuccess) return
-      await runCrudMutationGuardAfterSuccess(container, {
-        ...base,
-        metadata: result.metadata ?? null,
-      })
-    },
+    result: { ok: true },
+    afterSuccess: guarded.runAfterSuccess,
   }
 }

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -606,10 +606,10 @@ export default function DealsKanbanPage(): React.ReactElement {
     () => ({
       pipelineId: selectedPipelineId,
       search: search.trim(),
-      status: statusFilters.slice().sort().join(','),
-      owners: ownerFilters.slice().sort().join(','),
-      people: peopleFilters.slice().sort().join(','),
-      companies: companyFilters.slice().sort().join(','),
+      status: statusFilters.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(','),
+      owners: ownerFilters.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(','),
+      people: peopleFilters.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(','),
+      companies: companyFilters.slice().sort((a, b) => (a < b ? -1 : a > b ? 1 : 0)).join(','),
       closeFrom: closeDateFilter.from ?? '',
       closeTo: closeDateFilter.to ?? '',
       currency: currencyFilter ?? '',

package/src/modules/customers/components/calendar/CalendarScreen.tsx

@@ -223,7 +223,7 @@ export function CalendarScreen() {
     const values = new Set<string>(Object.keys(typeLabels))
     for (const item of items) values.add(item.interactionType)
     return [...values]
-      .sort()
+      .sort((a, b) => a.localeCompare(b))
       .map((value) => ({ value, label: typeLabels[value] ?? value }))
   }, [items, typeLabels])
 

package/src/modules/notifications/lib/routeHelpers.ts

@@ -2,10 +2,7 @@ import { z } from 'zod'
 import type { AwilixContainer } from 'awilix'
 import { resolveRequestContext } from '@open-mercato/shared/lib/api/context'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
-import {
-  runCrudMutationGuardAfterSuccess,
-  validateCrudMutationGuard,
-} from '@open-mercato/shared/lib/crud/mutation-guard'
+import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveNotificationService, type NotificationService } from './notificationService'
 
@@ -106,33 +103,28 @@ export async function runGuardedNotificationWrite<T>(
   options: NotificationMutationGuardOptions,
   write: () => Promise<T>,
 ): Promise<GuardedNotificationWriteResult<T>> {
-  const guardScope = {
-    tenantId: scope.tenantId,
-    organizationId: scope.organizationId,
-    userId: scope.userId ?? '',
-    resourceKind: options.resourceKind,
-    resourceId: options.resourceId ?? '',
-    operation: options.operation,
-    requestMethod: req.method,
-    requestHeaders: req.headers,
-  }
-
-  const guardResult = await validateCrudMutationGuard(container, {
-    ...guardScope,
-    mutationPayload: options.payload ?? null,
+  const guarded = await runRouteMutationGuards({
+    container,
+    req,
+    auth: {
+      userId: scope.userId ?? '',
+      tenantId: scope.tenantId,
+      organizationId: scope.organizationId,
+    },
+    input: {
+      resourceKind: options.resourceKind,
+      resourceId: options.resourceId ?? null,
+      operation: options.operation,
+      mutationPayload: options.payload ?? null,
+    },
   })
-  if (guardResult && !guardResult.ok) {
-    return { ok: false, response: Response.json(guardResult.body, { status: guardResult.status }) }
+  if (!guarded.ok) {
+    return { ok: false, response: guarded.response }
   }
 
   const result = await write()
 
-  if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
-    await runCrudMutationGuardAfterSuccess(container, {
-      ...guardScope,
-      metadata: guardResult.metadata ?? null,
-    })
-  }
+  await guarded.runAfterSuccess()
 
   return { ok: true, result }
 }

package/src/modules/payment_gateways/backend/payment-gateways/page.tsx

@@ -354,7 +354,7 @@ export default function PaymentTransactionsPage() {
   }, [loadDetail, loadRows, runMutation, selectedId, t])
 
   const providerOptions = React.useMemo(() => {
-    const values = Array.from(new Set(rows.map((row) => row.providerKey).filter(Boolean))).sort()
+    const values = Array.from(new Set(rows.map((row) => row.providerKey).filter(Boolean))).sort((a, b) => a.localeCompare(b))
     return values.map((value) => ({
       label: formatTypeLabel(value),
       value,