@open-mercato/core 0.6.8-develop.7095.1.465fbf8f80 → 0.6.8-develop.7099.1.7ba2771d06

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

@@ -2,9 +2,9 @@ import { z } from 'zod'
 import { makeCrudRoute } from '@open-mercato/shared/lib/crud/factory'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { parseScopedCommandInput, resolveCrudRecordId } from '@open-mercato/shared/lib/api/scoped'
-import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { E } from '#generated/entities.ids.generated'
+import { buildWarehouseListSearchOr } from '../warehouseSearch'
 import { Warehouse } from '../../data/entities'
 import { warehouseCreateSchema, warehouseUpdateSchema } from '../../data/validators'
 import { createPagedListResponseSchema, createWmsCrudOpenApi, defaultOkResponseSchema } from '../openapi'
@@ -77,6 +77,9 @@ const crud = makeCrudRoute({
       F.created_at,
       F.updated_at,
     ],
+    decorateCustomFields: {
+      entityIds: E.wms.warehouse,
+    },
     sortFieldMap: {
       name: F.name,
       code: F.code,
@@ -94,13 +97,7 @@ const crud = makeCrudRoute({
       if (isActive !== null) filters[F.is_active] = { $eq: isActive }
       const term = query.search?.trim()
       if (term) {
-        const like = `%${escapeLikePattern(term)}%`
-        filters.$or = [
-          { [F.name]: { $ilike: like } },
-          { [F.code]: { $ilike: like } },
-          { [F.city]: { $ilike: like } },
-          { [F.country]: { $ilike: like } },
-        ]
+        filters.$or = buildWarehouseListSearchOr(term)
       }
       return filters
     },
@@ -113,7 +110,10 @@ const crud = makeCrudRoute({
         const { translate } = await resolveTranslations()
         return parseScopedCommandInput(warehouseCreateSchema, raw ?? {}, ctx, translate)
       },
-      response: ({ result }) => ({ id: result?.warehouseId ?? null }),
+      response: ({ result }) => ({
+        id: result?.warehouseId ?? null,
+        updatedAt: result?.updatedAt ?? null,
+      }),
       status: 201,
     },
     update: {
@@ -166,6 +166,10 @@ export const openApi = createWmsCrudOpenApi({
   listResponseSchema: createPagedListResponseSchema(warehouseListItemSchema),
   create: {
     schema: warehouseCreateSchema,
+    responseSchema: z.object({
+      id: z.string().uuid().nullable(),
+      updatedAt: z.string().nullable(),
+    }),
     description: 'Creates a warehouse for inventory operations.',
   },
   update: {

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

@@ -31,16 +31,16 @@
 import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 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 { loadCustomFieldSnapshot, buildCustomFieldResetMap } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 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'
@@ -85,6 +85,7 @@ import {
   normalizeOptionalString,
   requireId,
   toNumericString,
+  warehouseCrudIndexer,
   warehouseZoneCrudIndexer,
 } from './shared'
 import { emitWmsEvent } from '../events'
@@ -105,6 +106,22 @@ function toJsonValue(value: Record<string, unknown> | null | undefined): JsonVal
   return (value ?? null) as JsonValue | null
 }
 
+async function persistWarehouseCustomFields(
+  ctx: CommandRuntimeContext,
+  warehouse: { id: string; organizationId: string; tenantId: string },
+  custom: Record<string, unknown>,
+) {
+  if (!custom || Object.keys(custom).length === 0) return
+  await setCustomFieldsIfAny({
+    dataEngine: ctx.container.resolve('dataEngine'),
+    entityId: E.wms.warehouse,
+    recordId: warehouse.id,
+    organizationId: warehouse.organizationId,
+    tenantId: warehouse.tenantId,
+    values: custom,
+  })
+}
+
 async function buildCrudLog(
   ctx: CommandRuntimeContext,
   input: { tenantId?: string | null; organizationId?: string | null; id?: string | null } | undefined,
@@ -184,6 +201,7 @@ type WarehouseSnapshot = {
   metadata: JsonValue | null
   createdAt: string
   updatedAt: string
+  custom?: Record<string, unknown> | null
 }
 
 type PrimaryDemotionSnapshot = {
@@ -317,7 +335,16 @@ async function loadWarehouseSnapshot(
   id: string,
 ): Promise<WarehouseSnapshot | null> {
   const record = await findOneWithDecryption(em, Warehouse, { id }, undefined, resolveScope(ctx))
-  return record ? snapshotWarehouse(record) : null
+  if (!record) return null
+  const snapshot = snapshotWarehouse(record)
+  const custom = await loadCustomFieldSnapshot(em, {
+    entityId: E.wms.warehouse,
+    recordId: record.id,
+    tenantId: record.tenantId,
+    organizationId: record.organizationId,
+  })
+  snapshot.custom = custom && Object.keys(custom).length ? custom : null
+  return snapshot
 }
 
 function snapshotWarehouseZone(record: WarehouseZone): WarehouseZoneSnapshot {
@@ -381,6 +408,30 @@ async function writeZoneCustomFields(
 // `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 emitWarehouseCrudSideEffects(
+  ctx: CommandRuntimeContext,
+  action: 'created' | 'updated' | 'deleted',
+  warehouse: Warehouse,
+  origin: 'write' | 'undo' = 'write',
+): Promise<void> {
+  const options = {
+    dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+    action,
+    entity: warehouse,
+    identifiers: {
+      id: warehouse.id,
+      organizationId: warehouse.organizationId,
+      tenantId: warehouse.tenantId,
+    },
+    indexer: warehouseCrudIndexer,
+  }
+  if (origin === 'undo') {
+    await emitCrudUndoSideEffects(options)
+    return
+  }
+  await emitCrudSideEffects(options)
+}
+
 async function emitZoneCrudSideEffects(
   ctx: CommandRuntimeContext,
   action: 'created' | 'updated' | 'deleted',
@@ -714,11 +765,11 @@ async function resolveParentLocation(
 
 const createWarehouseCommand: CommandHandler<
   WarehouseCreateInput,
-  { warehouseId: string; demotedPrimariesBefore?: PrimaryDemotionSnapshot[] }
+  { warehouseId: string; updatedAt?: string | null; demotedPrimariesBefore?: PrimaryDemotionSnapshot[] }
 > = {
   id: 'wms.warehouses.create',
   async execute(rawInput, ctx) {
-    const parsed = warehouseCreateSchema.parse(rawInput ?? {})
+    const { parsed, custom } = parseWithCustomFields(warehouseCreateSchema, rawInput ?? {})
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
     const em = resolveEm(ctx)
@@ -776,6 +827,8 @@ const createWarehouseCommand: CommandHandler<
       }
       throw err
     }
+    await persistWarehouseCustomFields(ctx, warehouse, custom)
+    await emitWarehouseCrudSideEffects(ctx, 'created', warehouse)
     void emitWmsEvent('wms.warehouse.created', {
       id: warehouse.id,
       warehouseId: warehouse.id,
@@ -784,6 +837,7 @@ const createWarehouseCommand: CommandHandler<
     }).catch(() => undefined)
     return {
       warehouseId: warehouse.id,
+      updatedAt: isoOrNull(warehouse.updatedAt),
       ...(demotedPrimariesBefore.length > 0 ? { demotedPrimariesBefore } : {}),
     }
   },
@@ -823,6 +877,8 @@ const createWarehouseCommand: CommandHandler<
     ensureOrganizationScope(ctx, record.organizationId)
     record.deletedAt = new Date()
     await em.flush()
+    await persistWarehouseCustomFields(ctx, after, buildCustomFieldResetMap(undefined, after.custom ?? undefined))
+    await emitWarehouseCrudSideEffects(ctx, 'deleted', record, 'undo')
     if (payload.demotedPrimariesBefore?.length) {
       await restoreDemotedPrimaryWarehouses(em, ctx, payload.demotedPrimariesBefore)
       await em.flush()
@@ -842,7 +898,7 @@ const updateWarehouseCommand: CommandHandler<
     return before ? { before } : {}
   },
   async execute(rawInput, ctx) {
-    const parsed = warehouseUpdateSchema.parse(rawInput ?? {})
+    const { parsed, custom } = parseWithCustomFields(warehouseUpdateSchema, rawInput ?? {})
     const em = resolveEm(ctx)
     const warehouse = await loadWarehouse(em, ctx, parsed.id)
     if (parsed.code !== undefined && parsed.code !== warehouse.code) {
@@ -902,6 +958,8 @@ const updateWarehouseCommand: CommandHandler<
       }
       throw err
     }
+    await persistWarehouseCustomFields(ctx, warehouse, custom)
+    await emitWarehouseCrudSideEffects(ctx, 'updated', warehouse)
     void emitWmsEvent('wms.warehouse.updated', {
       id: warehouse.id,
       warehouseId: warehouse.id,
@@ -982,6 +1040,12 @@ const updateWarehouseCommand: CommandHandler<
       record.deletedAt = null
     }
     await em.flush()
+    await persistWarehouseCustomFields(
+      ctx,
+      before,
+      buildCustomFieldResetMap(before.custom ?? undefined, payload.after?.custom ?? undefined),
+    )
+    await emitWarehouseCrudSideEffects(ctx, 'updated', record, 'undo')
     if (payload.demotedPrimariesBefore?.length) {
       await restoreDemotedPrimaryWarehouses(em, ctx, payload.demotedPrimariesBefore)
       await em.flush()
@@ -1003,6 +1067,7 @@ const deleteWarehouseCommand: CommandHandler<{ id?: string }, { warehouseId: str
     const warehouse = await loadWarehouse(em, ctx, warehouseId)
     warehouse.deletedAt = new Date()
     await em.flush()
+    await emitWarehouseCrudSideEffects(ctx, 'deleted', warehouse)
     return { warehouseId: warehouse.id }
   },
   buildLog: async ({ input, result, ctx, snapshots }) => {
@@ -1057,6 +1122,7 @@ const deleteWarehouseCommand: CommandHandler<{ id?: string }, { warehouseId: str
       record.metadata = before.metadata
     }
     await em.flush()
+    await emitWarehouseCrudSideEffects(ctx, 'created', record, 'undo')
   },
 }
 

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

@@ -7,6 +7,7 @@ import {
   InventoryBalance,
   InventoryMovement,
   InventoryReservation,
+  Warehouse,
   WarehouseZone,
 } from '../data/entities'
 
@@ -56,6 +57,14 @@ export const warehouseZoneCrudIndexer: CrudIndexerConfig<WarehouseZone> = {
   entityType: E.wms.warehouse_zone,
 }
 
+// Warehouse list/search goes through the hybrid query engine. Writing a custom
+// field upserts `entity_indexes`; delete must tombstone that row. A leftover
+// live index document makes `indexAnyRows` true and hides later warehouses that
+// were never indexed (empty combobox on the same integration shard).
+export const warehouseCrudIndexer: CrudIndexerConfig<Warehouse> = {
+  entityType: E.wms.warehouse,
+}
+
 export const inventoryBalanceCrudEvents: CrudEventsConfig<InventoryBalance> = {
   module: 'wms',
   entity: 'inventory_balance',

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

@@ -0,0 +1,216 @@
+"use client"
+
+import * as React from 'react'
+import { z } from 'zod'
+import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
+import { flash } from '@open-mercato/ui/backend/FlashMessages'
+import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
+import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
+import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
+import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
+import { E } from '#generated/entities.ids.generated'
+import { flashMutationError } from '../../lib/flashMutationError'
+import {
+  countryOptionFromStored,
+  loadCountryOptions,
+  loadTimezoneOptions,
+  timezoneOptionFromStored,
+} from './warehouseFormOptions'
+
+export type WarehouseDialogRow = {
+  id: string
+  name?: string | null
+  code?: string | null
+  city?: string | null
+  country?: string | null
+  timezone?: string | null
+  is_active?: boolean | null
+  is_primary?: boolean | null
+  updated_at?: string | null
+  updatedAt?: string | null
+  customValues?: Record<string, unknown> | null
+}
+
+export type WarehouseFormValues = {
+  name: string
+  code: string
+  city?: string
+  country?: string
+  timezone?: string
+  isActive: boolean
+  isPrimary: boolean
+}
+
+export const warehouseFormSchema = z.object({
+  name: z.string().trim().min(1),
+  code: z.string().trim().min(1),
+  city: z.string().trim().optional(),
+  country: z.string().trim().optional(),
+  timezone: z.string().trim().optional(),
+  isActive: z.boolean().default(true),
+  isPrimary: z.boolean().default(false),
+}).passthrough()
+
+type WarehouseEditDialogProps = {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  mode: 'create' | 'edit'
+  row?: WarehouseDialogRow | null
+  onSaved?: (info: {
+    mode: 'create' | 'edit'
+    id?: string
+    values: WarehouseFormValues
+    updatedAt?: string | null
+  }) => void | Promise<void>
+}
+
+export function WarehouseEditDialog({ open, onOpenChange, mode, row, onSaved }: WarehouseEditDialogProps) {
+  const t = useT()
+  const locale = useLocale()
+  const { runMutation } = useGuardedMutation<Record<string, unknown>>({ contextId: 'wms-config-warehouses' })
+  const [submitting, setSubmitting] = React.useState(false)
+
+  const countrySeedOptions = React.useMemo(() => {
+    if (mode !== 'edit' || !row?.country?.trim()) return undefined
+    return [countryOptionFromStored(row.country, locale)]
+  }, [locale, mode, row])
+
+  const timezoneSeedOptions = React.useMemo(() => {
+    if (mode !== 'edit' || !row?.timezone?.trim()) return undefined
+    return [timezoneOptionFromStored(row.timezone)]
+  }, [mode, row])
+
+  const fields = React.useMemo<CrudField[]>(() => [
+    { id: 'name', type: 'text', label: t('wms.backend.config.warehouses.form.name', 'Name'), required: true },
+    { id: 'code', type: 'text', label: t('wms.backend.config.warehouses.form.code', 'Code'), required: true },
+    { id: 'city', type: 'text', label: t('wms.backend.config.warehouses.form.city', 'City') },
+    {
+      id: 'country',
+      type: 'combobox',
+      label: t('wms.backend.config.warehouses.form.country', 'Country'),
+      placeholder: t('wms.backend.config.warehouses.form.countryPlaceholder', 'Search country'),
+      loadOptions: (query) => loadCountryOptions(query, locale),
+      allowCustomValues: false,
+      seedOptions: countrySeedOptions,
+      resolveLabel: (value) => countryOptionFromStored(value, locale).label,
+    },
+    {
+      id: 'timezone',
+      type: 'combobox',
+      label: t('wms.backend.config.warehouses.form.timezone', 'Timezone'),
+      placeholder: t('wms.backend.config.warehouses.form.timezonePlaceholder', 'Search timezone'),
+      loadOptions: loadTimezoneOptions,
+      allowCustomValues: false,
+      seedOptions: timezoneSeedOptions,
+    },
+    { id: 'isPrimary', type: 'checkbox', label: t('wms.backend.config.warehouses.form.primary', 'Primary warehouse') },
+    { id: 'isActive', type: 'checkbox', label: t('wms.backend.config.warehouses.form.active', 'Active') },
+  ], [countrySeedOptions, locale, t, timezoneSeedOptions])
+
+  const initialValues = React.useMemo<WarehouseFormValues>(() => {
+    if (mode === 'edit' && row) {
+      return {
+        name: row.name || '',
+        code: row.code || '',
+        city: row.city || '',
+        country: row.country || '',
+        timezone: row.timezone || '',
+        isActive: row.is_active !== false,
+        isPrimary: row.is_primary === true,
+        ...extractCustomFieldEntries(row as Record<string, unknown>),
+      } as WarehouseFormValues
+    }
+    return {
+      name: '',
+      code: '',
+      city: '',
+      country: '',
+      timezone: '',
+      isActive: true,
+      isPrimary: false,
+    }
+  }, [mode, row])
+
+  const handleSubmit = React.useCallback(async (values: WarehouseFormValues) => {
+    setSubmitting(true)
+    try {
+      const payload = mode === 'edit' && row ? { id: row.id, ...values } : values
+      const call = await runMutation({
+        operation: async () => {
+          const result = await apiCall<{ id?: string | null; updatedAt?: string | null; updated_at?: string | null }>(
+            '/api/wms/warehouses',
+            {
+              method: mode === 'edit' ? 'PUT' : 'POST',
+              headers: { 'x-om-forbidden-redirect': '0' },
+              body: JSON.stringify(payload),
+            },
+          )
+          if (!result.ok) {
+            await raiseCrudError(result.response, t('wms.backend.config.warehouses.errors.save', 'Failed to save warehouse.'))
+          }
+          return result
+        },
+        context: {},
+        mutationPayload: payload,
+      })
+      flash(
+        mode === 'edit'
+          ? t('wms.backend.config.warehouses.flash.updated', 'Warehouse updated')
+          : t('wms.backend.config.warehouses.flash.created', 'Warehouse created'),
+        'success',
+      )
+      const resultBody =
+        call?.result && typeof call.result === 'object'
+          ? (call.result as { id?: unknown; updatedAt?: unknown; updated_at?: unknown })
+          : null
+      const createdId =
+        mode === 'create' && typeof resultBody?.id === 'string'
+          ? resultBody.id.trim()
+          : undefined
+      const updatedAt =
+        (typeof resultBody?.updatedAt === 'string' && resultBody.updatedAt.trim()) ||
+        (typeof resultBody?.updated_at === 'string' && resultBody.updated_at.trim()) ||
+        undefined
+      onOpenChange(false)
+      await onSaved?.({
+        mode,
+        id: createdId || row?.id,
+        values,
+        updatedAt: updatedAt || null,
+      })
+    } catch (error) {
+      flashMutationError(error, t('wms.backend.config.warehouses.errors.save', 'Failed to save warehouse.'), t)
+    } finally {
+      setSubmitting(false)
+    }
+  }, [mode, onOpenChange, onSaved, row, runMutation, t])
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="max-w-3xl">
+        <DialogHeader>
+          <DialogTitle>
+            {mode === 'edit'
+              ? t('wms.backend.config.warehouses.dialog.edit', 'Edit warehouse')
+              : t('wms.backend.config.warehouses.dialog.create', 'Create warehouse')}
+          </DialogTitle>
+        </DialogHeader>
+        <CrudForm<WarehouseFormValues>
+          schema={warehouseFormSchema}
+          fields={fields}
+          entityId={E.wms.warehouse}
+          initialValues={initialValues}
+          submitLabel={t('common.save', 'Save')}
+          onSubmit={handleSubmit}
+          embedded
+          disableInitialFocus
+          isLoading={submitting}
+          twoColumn
+          optimisticLockUpdatedAt={mode === 'edit' ? (row?.updatedAt ?? row?.updated_at ?? null) : undefined}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}