@open-mercato/core 0.6.8-develop.7031.1.005201cd70 → 0.6.8-develop.7037.1.ea0277b01e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.8-develop.7031.1.005201cd70",
+  "version": "0.6.8-develop.7037.1.ea0277b01e",
   "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.7031.1.005201cd70",
-    "@open-mercato/shared": "0.6.8-develop.7031.1.005201cd70",
-    "@open-mercato/ui": "0.6.8-develop.7031.1.005201cd70",
+    "@open-mercato/ai-assistant": "0.6.8-develop.7037.1.ea0277b01e",
+    "@open-mercato/shared": "0.6.8-develop.7037.1.ea0277b01e",
+    "@open-mercato/ui": "0.6.8-develop.7037.1.ea0277b01e",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.8-develop.7031.1.005201cd70",
-    "@open-mercato/shared": "0.6.8-develop.7031.1.005201cd70",
-    "@open-mercato/ui": "0.6.8-develop.7031.1.005201cd70",
+    "@open-mercato/ai-assistant": "0.6.8-develop.7037.1.ea0277b01e",
+    "@open-mercato/shared": "0.6.8-develop.7037.1.ea0277b01e",
+    "@open-mercato/ui": "0.6.8-develop.7037.1.ea0277b01e",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.3.1",

package/src/modules/business_rules/lib/expression-evaluator.ts

@@ -1,7 +1,7 @@
 import type { ComparisonOperator, LogicalOperator } from '../data/validators'
 import { testLinearRegex } from '@open-mercato/shared/lib/regex/linear'
 import { getNestedValue, resolveSpecialValue } from './value-resolver'
-import { createLogger } from '@open-mercato/shared/lib/logger'
+import { createLogger, isLevelEnabled } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('business_rules').child({ component: 'expression-evaluator' })
 
@@ -86,14 +86,14 @@ function evaluateSimpleCondition(
 
   const result = applyOperator(leftValue, condition.operator, rightValue)
 
-  logger.debug('Simple condition evaluated', {
-    field: condition.field,
-    operator: condition.operator,
-    expectedValue: rightValue,
-    actualValue: leftValue,
-    actualValueType: typeof leftValue,
-    passed: result,
-  })
+  if (isLevelEnabled('debug')) {
+    logger.debug('Simple condition evaluated', {
+      field: condition.field,
+      operator: condition.operator,
+      actualValueType: typeof leftValue,
+      passed: result,
+    })
+  }
 
   return result
 }

package/src/modules/business_rules/lib/rule-evaluator.ts

@@ -1,6 +1,6 @@
 import type { BusinessRule } from '../data/entities'
 import { evaluateExpression, type EvaluationContext, type ConditionExpression } from './expression-evaluator'
-import { createLogger } from '@open-mercato/shared/lib/logger'
+import { createLogger, isLevelEnabled } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('business_rules').child({ component: 'rule-evaluator' })
 
@@ -105,14 +105,15 @@ export async function evaluateSingleRule(
 ): Promise<SingleRuleResult> {
   const startTime = Date.now()
 
-  logger.debug('Evaluating rule', {
-    ruleId: rule.ruleId,
-    ruleName: rule.ruleName,
-    ruleType: rule.ruleType,
-    entityType: rule.entityType,
-    eventType: rule.eventType,
-    conditions: rule.conditionExpression,
-  })
+  if (isLevelEnabled('debug')) {
+    logger.debug('Evaluating rule', {
+      ruleId: rule.ruleId,
+      ruleName: rule.ruleName,
+      ruleType: rule.ruleType,
+      entityType: rule.entityType,
+      eventType: rule.eventType,
+    })
+  }
 
   try {
     // Check if rule is enabled

package/src/modules/customers/ai-tools/deal-analyzer-pack.ts

@@ -192,14 +192,29 @@ const analyzeDealsToolDefinition: CustomersAiToolDefinition<AnalyzeDealsInput, A
     // has no encrypted columns, but the linked CustomerEntity.display_name is
     // encrypted, so resolve names via findWithDecryption rather than
     // populating the relation through raw em.find.
+    // Defense-in-depth: `customer_deal_people` carries no tenant/org columns,
+    // so DB-level scoping is via the tenant-filtered `dealIds` set. Filter the
+    // returned rows against the caller-scoped deals map so a future refactor
+    // that widens `dealIds` cannot surface cross-tenant links.
+    const dealById = new Map<string, CustomerDeal>(deals.map((deal) => [deal.id, deal]))
+    const scopedDealIds = Array.from(dealById.keys())
     const personLinkWhere: Record<string, unknown> = {
-      deal: { $in: dealIds },
+      deal: { $in: scopedDealIds },
     }
-    const personLinks = await em.find(
+    const personLinksRaw = await em.find(
       CustomerDealPersonLink,
       personLinkWhere as any,
       { limit: 500 },
     )
+    const personLinks = personLinksRaw.filter((link) => {
+      const dealRefId = refIdOf((link as { deal?: unknown }).deal)
+      if (!dealRefId) return false
+      const scopedDeal = dealById.get(dealRefId)
+      if (!scopedDeal) return false
+      if (scopedDeal.tenantId !== tenantId) return false
+      if (ctx.organizationId && scopedDeal.organizationId !== ctx.organizationId) return false
+      return true
+    })
 
     const linksByDeal = new Map<string, string>() // dealId → personId (first link wins)
     for (const link of personLinks) {

package/src/modules/wms/api/zones/route.ts

@@ -79,6 +79,10 @@ const crud = makeCrudRoute({
       }
       return filters
     },
+    // Zones had no decorator before this route gained custom fields, so there is no
+    // legacy consumer reading top-level `cf_*`/`cf:*` — take the canonical single-shape
+    // response (#1769) rather than emitting both forms.
+    decorateCustomFields: { entityIds: [E.wms.warehouse_zone], stripPrefixedKeys: true },
   },
   hooks: {
     afterList: async (payload, ctx) => {
@@ -122,6 +126,16 @@ export const POST = crud.POST
 export const PUT = crud.PUT
 export const DELETE = crud.DELETE
 
+// Mirrors `CustomFieldDisplayEntry` from @open-mercato/shared/lib/crud/custom-fields, so
+// the generated OpenAPI documents how to read an entry instead of an opaque record.
+const customFieldDisplayEntrySchema = z.object({
+  key: z.string(),
+  label: z.string().nullable(),
+  value: z.unknown(),
+  kind: z.string().nullable(),
+  multi: z.boolean(),
+})
+
 const zoneListItemSchema = z.object({
   id: z.string().uuid().nullable().optional(),
   organization_id: z.string().uuid().nullable().optional(),
@@ -134,6 +148,8 @@ const zoneListItemSchema = z.object({
   priority: z.number().nullable().optional(),
   created_at: z.string().nullable().optional(),
   updated_at: z.string().nullable().optional(),
+  customValues: z.record(z.string(), z.unknown()).nullable().optional(),
+  customFields: z.array(customFieldDisplayEntrySchema).optional(),
 })
 
 export const openApi = createWmsCrudOpenApi({

package/src/modules/wms/commands/configuration.ts

@@ -33,11 +33,20 @@ import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import {
+  emitCrudSideEffects,
+  emitCrudUndoSideEffects,
+  parseWithCustomFields,
+  setCustomFieldsIfAny,
+} from '@open-mercato/shared/lib/commands/helpers'
+import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import { buildCustomFieldResetMap, loadCustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
 import { CrudHttpError, isUniqueViolation } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
 import type { JsonValue } from '@open-mercato/shared/lib/json'
+import { E } from '#generated/entities.ids.generated'
 import {
   InventoryLot,
   type InventoryLotStatus,
@@ -76,6 +85,7 @@ import {
   normalizeOptionalString,
   requireId,
   toNumericString,
+  warehouseZoneCrudIndexer,
 } from './shared'
 import { emitWmsEvent } from '../events'
 
@@ -196,6 +206,7 @@ type WarehouseZoneSnapshot = {
   name: string
   priority: number
   metadata: JsonValue | null
+  custom?: Record<string, unknown>
   createdAt: string
   updatedAt: string
 }
@@ -331,7 +342,67 @@ async function loadWarehouseZoneSnapshot(
   id: string,
 ): Promise<WarehouseZoneSnapshot | null> {
   const record = await findOneWithDecryption(em, WarehouseZone, { id }, undefined, resolveScope(ctx))
-  return record ? snapshotWarehouseZone(record) : null
+  if (!record) return null
+  const snapshot = snapshotWarehouseZone(record)
+  // The snapshot always carries custom values because undo has to restore them, and
+  // every caller (prepare on update/delete, captureAfter on create/update) feeds undo.
+  // For the common tenant that defined no zone custom fields this costs a single
+  // `custom_field_values` lookup: `loadCustomFieldValues` returns early on an empty
+  // result and never reaches the `custom_field_defs` query.
+  snapshot.custom = await loadCustomFieldSnapshot(em, {
+    entityId: E.wms.warehouse_zone,
+    recordId: record.id,
+    tenantId: record.tenantId,
+    organizationId: record.organizationId,
+  })
+  return snapshot
+}
+
+async function writeZoneCustomFields(
+  ctx: CommandRuntimeContext,
+  zone: { id: string; organizationId: string; tenantId: string },
+  values: Record<string, unknown>,
+): Promise<void> {
+  if (!values || !Object.keys(values).length) return
+  await setCustomFieldsIfAny({
+    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+    entityId: E.wms.warehouse_zone,
+    recordId: zone.id,
+    organizationId: zone.organizationId,
+    tenantId: zone.tenantId,
+    values,
+  })
+}
+
+// Zone reads go through the hybrid query engine, which projects `cf:*` from
+// `entity_indexes`. Emitting the CRUD side effect is therefore what makes a
+// custom field value written above observable through the zones list API — without
+// it the value sits in `custom_field_values` that no read path consults (#5239).
+// `events` is deliberately omitted: the module already emits `wms.zone.*` itself,
+// and adding an events config here would introduce a second, undeclared
+// `wms.warehouse_zone.*` event id for the same write.
+async function emitZoneCrudSideEffects(
+  ctx: CommandRuntimeContext,
+  action: 'created' | 'updated' | 'deleted',
+  zone: WarehouseZone,
+  origin: 'write' | 'undo' = 'write',
+): Promise<void> {
+  const options = {
+    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+    action,
+    entity: zone,
+    identifiers: {
+      id: zone.id,
+      organizationId: zone.organizationId,
+      tenantId: zone.tenantId,
+    },
+    indexer: warehouseZoneCrudIndexer,
+  }
+  if (origin === 'undo') {
+    await emitCrudUndoSideEffects(options)
+    return
+  }
+  await emitCrudSideEffects(options)
 }
 
 function snapshotWarehouseLocation(record: WarehouseLocation): WarehouseLocationSnapshot {
@@ -989,7 +1060,7 @@ const deleteWarehouseCommand: CommandHandler<{ id?: string }, { warehouseId: str
   },
 }
 
-async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneSnapshot): Promise<void> {
+async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneSnapshot): Promise<WarehouseZone> {
   const scope = { tenantId: before.tenantId, organizationId: before.organizationId }
   const warehouseRef = await findOneWithDecryption(em, Warehouse, { id: before.warehouseId }, undefined, scope)
   if (!warehouseRef) {
@@ -1018,12 +1089,13 @@ async function restoreZoneFromSnapshot(em: EntityManager, before: WarehouseZoneS
     record.metadata = before.metadata
     record.deletedAt = null
   }
+  return record
 }
 
 const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zoneId: string }> = {
   id: 'wms.zones.create',
   async execute(rawInput, ctx) {
-    const parsed = warehouseZoneCreateSchema.parse(rawInput ?? {})
+    const { parsed, custom } = parseWithCustomFields(warehouseZoneCreateSchema, rawInput ?? {})
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
     const em = resolveEm(ctx)
@@ -1039,6 +1111,8 @@ const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zon
       metadata: toJsonValue(parsed.metadata),
     })
     await em.persist(zone).flush()
+    await writeZoneCustomFields(ctx, zone, custom)
+    await emitZoneCrudSideEffects(ctx, 'created', zone)
     void emitWmsEvent('wms.zone.created', {
       id: zone.id,
       zoneId: zone.id,
@@ -1074,6 +1148,8 @@ const createWarehouseZoneCommand: CommandHandler<WarehouseZoneCreateInput, { zon
     ensureOrganizationScope(ctx, record.organizationId)
     record.deletedAt = new Date()
     await em.flush()
+    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(undefined, after.custom))
+    await emitZoneCrudSideEffects(ctx, 'deleted', record, 'undo')
   },
 }
 
@@ -1086,7 +1162,7 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     return before ? { before } : {}
   },
   async execute(rawInput, ctx) {
-    const parsed = warehouseZoneUpdateSchema.parse(rawInput ?? {})
+    const { parsed, custom } = parseWithCustomFields(warehouseZoneUpdateSchema, rawInput ?? {})
     const em = resolveEm(ctx)
     const zone = await loadZone(em, ctx, parsed.id)
     if (parsed.warehouseId !== undefined) {
@@ -1102,6 +1178,8 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     if (parsed.priority !== undefined) zone.priority = parsed.priority
     if (parsed.metadata !== undefined) zone.metadata = toJsonValue(parsed.metadata)
     await em.flush()
+    await writeZoneCustomFields(ctx, zone, custom)
+    await emitZoneCrudSideEffects(ctx, 'updated', zone)
     void emitWmsEvent('wms.zone.updated', {
       id: zone.id,
       zoneId: zone.id,
@@ -1128,8 +1206,10 @@ const updateWarehouseZoneCommand: CommandHandler<WarehouseZoneUpdateInput, { zon
     const em = resolveEm(ctx)
     ensureTenantScope(ctx, before.tenantId)
     ensureOrganizationScope(ctx, before.organizationId)
-    await restoreZoneFromSnapshot(em, before)
+    const record = await restoreZoneFromSnapshot(em, before)
     await em.flush()
+    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(before.custom, payload?.after?.custom))
+    await emitZoneCrudSideEffects(ctx, 'updated', record, 'undo')
   },
 }
 
@@ -1147,6 +1227,7 @@ const deleteWarehouseZoneCommand: CommandHandler<{ id?: string }, { zoneId: stri
     const zone = await loadZone(em, ctx, zoneId)
     zone.deletedAt = new Date()
     await em.flush()
+    await emitZoneCrudSideEffects(ctx, 'deleted', zone)
     return { zoneId: zone.id }
   },
   buildLog: async ({ input, result, ctx, snapshots }) => {
@@ -1161,8 +1242,10 @@ const deleteWarehouseZoneCommand: CommandHandler<{ id?: string }, { zoneId: stri
     const em = resolveEm(ctx)
     ensureTenantScope(ctx, before.tenantId)
     ensureOrganizationScope(ctx, before.organizationId)
-    await restoreZoneFromSnapshot(em, before)
+    const record = await restoreZoneFromSnapshot(em, before)
     await em.flush()
+    await writeZoneCustomFields(ctx, record, buildCustomFieldResetMap(before.custom, undefined))
+    await emitZoneCrudSideEffects(ctx, 'created', record, 'undo')
   },
 }
 

package/src/modules/wms/commands/shared.ts

@@ -7,6 +7,7 @@ import {
   InventoryBalance,
   InventoryMovement,
   InventoryReservation,
+  WarehouseZone,
 } from '../data/entities'
 
 export function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {
@@ -48,6 +49,13 @@ export const inventoryMovementCrudIndexer: CrudIndexerConfig<InventoryMovement>
   entityType: E.wms.inventory_movement,
 }
 
+// Zones are read through the hybrid query engine, which projects `cf:*` out of
+// `entity_indexes` rather than joining `custom_field_values`. Without this indexer the
+// zone commands write custom field values that no read path can ever see (#5239).
+export const warehouseZoneCrudIndexer: CrudIndexerConfig<WarehouseZone> = {
+  entityType: E.wms.warehouse_zone,
+}
+
 export const inventoryBalanceCrudEvents: CrudEventsConfig<InventoryBalance> = {
   module: 'wms',
   entity: 'inventory_balance',

package/src/modules/wms/components/backend/WmsConfigurationPage.tsx

@@ -12,10 +12,12 @@ import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import { EmptyState } from '@open-mercato/ui/backend/EmptyState'
 import { CrudForm, type CrudField, type CrudFieldOption } from '@open-mercato/ui/backend/CrudForm'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
@@ -80,6 +82,11 @@ type ZoneRow = {
   code?: string | null
   name?: string | null
   priority?: number | null
+  updated_at?: string | null
+  // The zones list route decorates with `stripPrefixedKeys: true`, so custom values
+  // arrive only under this canonical key — never as top-level `cf_*` / `cf:*`.
+  customValues?: Record<string, unknown> | null
+  customFields?: Array<{ key: string; label: string | null; value: unknown; kind: string | null; multi: boolean }>
 }
 
 type InventoryProfileRow = {
@@ -109,12 +116,17 @@ type WarehouseFormValues = {
   isPrimary: boolean
 }
 
+// `id` / `updatedAt` are carried in edit mode so CrudForm recognises the form as an edit
+// and derives the optimistic-lock header; the `cf_` index signature holds the values
+// collected from the injected custom-field inputs.
 type ZoneFormValues = {
   warehouseId: string
   code: string
   name: string
   priority?: number
-}
+  id?: string
+  updatedAt?: string | null
+} & { [key: `cf_${string}`]: unknown }
 
 type InventoryProfileFormValues = {
   catalogProductId: string
@@ -142,12 +154,15 @@ const warehouseFormSchema = z.object({
   isPrimary: z.boolean().default(false),
 })
 
+// passthrough so CrudForm's schema.safeParse keeps the `cf_*` custom field values
+// it collected from the injected custom-field inputs — a plain z.object strips them
+// before onSubmit ever sees them.
 const zoneFormSchema = z.object({
   warehouseId: z.string().uuid(),
   code: z.string().trim().min(1).max(80),
   name: z.string().trim().min(1).max(200),
   priority: z.coerce.number().int().min(0).optional(),
-})
+}).passthrough()
 
 function buildInventoryProfileFormSchema(fefoRequiredMsg: string) {
   return z.object({
@@ -598,19 +613,54 @@ export function ZoneSection({ viewAllHref }: ConfigSectionOptions = {}) {
     },
   })
 
+  // Warehouse options for the dialog's combobox. Loaded whenever the dialog opens so a tenant
+  // with a single warehouse gets it pre-selected instead of an empty "type to search" input,
+  // and so the edit dialog can label the currently linked warehouse without a lookup round-trip.
+  const warehouseOptionsQuery = useQuery({
+    queryKey: ['wms-config', 'zones', 'warehouse-options'],
+    queryFn: () => loadWarehouseOptions(),
+    enabled: dialog !== null,
+    staleTime: 30_000,
+  })
+  const warehouseOptions = React.useMemo(
+    () => warehouseOptionsQuery.data ?? [],
+    [warehouseOptionsQuery.data],
+  )
+  const soleWarehouseId = warehouseOptions.length === 1 ? warehouseOptions[0].value : null
+
+  const warehouseSeedOptions = React.useMemo<CrudFieldOption[] | undefined>(() => {
+    if (dialog?.mode === 'edit') {
+      const warehouseId = dialog.row.warehouse_id
+      if (!warehouseId) return undefined
+      const label = dialog.row.warehouse_name?.trim() || dialog.row.warehouse_code?.trim() || ''
+      return label ? [{ value: warehouseId, label }] : undefined
+    }
+    return soleWarehouseId ? warehouseOptions : undefined
+  }, [dialog, soleWarehouseId, warehouseOptions])
+
+  // The dialog already holds the first page of warehouses; serve the combobox's initial
+  // (unsearched) open from that cache instead of repeating the same request, and only go
+  // back to the network once the user actually types a term the cached page cannot answer.
+  const loadZoneWarehouseOptions = React.useCallback(async (query?: string) => {
+    const term = query?.trim()
+    if (!term) return warehouseOptionsQuery.data ?? loadWarehouseOptions()
+    return loadWarehouseOptions(term)
+  }, [warehouseOptionsQuery.data])
+
   const fields = React.useMemo<CrudField[]>(() => [
     {
       id: 'warehouseId',
       type: 'combobox',
       label: t('wms.backend.config.zones.form.warehouse', 'Warehouse'),
       required: true,
-      loadOptions: loadWarehouseOptions,
+      loadOptions: loadZoneWarehouseOptions,
       allowCustomValues: false,
+      seedOptions: warehouseSeedOptions,
     },
     { id: 'code', type: 'text', label: t('wms.backend.config.zones.form.code', 'Code'), required: true },
     { id: 'name', type: 'text', label: t('wms.backend.config.zones.form.name', 'Name'), required: true },
     { id: 'priority', type: 'number', label: t('wms.backend.config.zones.form.priority', 'Priority') },
-  ], [t])
+  ], [t, loadZoneWarehouseOptions, warehouseSeedOptions])
 
   const columns = React.useMemo<ColumnDef<ZoneRow>[]>(() => [
     {
@@ -641,19 +691,22 @@ export function ZoneSection({ viewAllHref }: ConfigSectionOptions = {}) {
   const initialValues = React.useMemo<ZoneFormValues>(() => {
     if (dialog?.mode === 'edit') {
       return {
+        id: dialog.row.id,
+        updatedAt: dialog.row.updated_at ?? null,
         warehouseId: dialog.row.warehouse_id || '',
         code: dialog.row.code || '',
         name: dialog.row.name || '',
         priority: dialog.row.priority == null ? undefined : Number(dialog.row.priority),
+        ...extractCustomFieldEntries(dialog.row),
       }
     }
     return {
-      warehouseId: '',
+      warehouseId: soleWarehouseId ?? '',
       code: '',
       name: '',
       priority: undefined,
     }
-  }, [dialog])
+  }, [dialog, soleWarehouseId])
 
   const closeDialog = React.useCallback(() => {
     setDialog(null)
@@ -669,10 +722,14 @@ export function ZoneSection({ viewAllHref }: ConfigSectionOptions = {}) {
     const submitMode = dialog.mode
     setSubmitting(true)
     try {
-      const payload = {
-        ...values,
+      const customFields = collectCustomFieldValues(values)
+      const payload: Record<string, unknown> = {
+        warehouseId: values.warehouseId,
+        code: values.code,
+        name: values.name,
         priority: values.priority === undefined || Number.isNaN(values.priority) ? undefined : Number(values.priority),
       }
+      if (Object.keys(customFields).length) payload.customFields = customFields
       await runMutation({
         operation: async () => {
           const call = await apiCall(