@open-mercato/core 0.7.0 → 0.7.1-develop.7102.1.b41f7e3e51

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'
@@ -36,6 +38,8 @@ import {
   inventoryRotationStrategyLabel,
 } from '../../lib/inventoryDisplayUi'
 import { LocationEditDialog } from './LocationEditDialog'
+import { WarehouseEditDialog, type WarehouseFormValues } from './WarehouseEditDialog'
+import { formatWarehouseCountryLabel } from './warehouseFormOptions'
 import { useWmsInventoryMutationAccess } from './useWmsInventoryMutationAccess'
 import { flashMutationError } from '../../lib/flashMutationError'
 
@@ -43,6 +47,7 @@ type PagedResponse<T> = {
   items: T[]
   total: number
   totalPages: number
+  totalIsCapped?: boolean
   page?: number
   pageSize?: number
 }
@@ -56,6 +61,9 @@ type WarehouseRow = {
   timezone?: string | null
   is_active?: boolean | null
   is_primary?: boolean | null
+  updated_at?: string | null
+  updatedAt?: string | null
+  customValues?: Record<string, unknown> | null
 }
 
 type LocationRow = {
@@ -79,6 +87,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 = {
@@ -98,22 +111,14 @@ type InventoryProfileRow = {
   safety_stock?: string | number | null
 }
 
-type WarehouseFormValues = {
-  name: string
-  code: string
-  city?: string
-  country?: string
-  timezone?: string
-  isActive: boolean
-  isPrimary: boolean
-}
-
 type ZoneFormValues = {
   warehouseId: string
   code: string
   name: string
   priority?: number
-}
+  id?: string
+  updatedAt?: string | null
+} & { [key: `cf_${string}`]: unknown }
 
 type InventoryProfileFormValues = {
   catalogProductId: string
@@ -131,22 +136,12 @@ type DialogMode<T> =
   | { mode: 'create' }
   | { mode: 'edit'; row: T }
 
-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),
-})
-
 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({
@@ -181,6 +176,7 @@ function mergeCreatedWarehouseIntoWarehousesCaches(
   queryClient: QueryClient,
   newId: string,
   values: WarehouseFormValues,
+  updatedAt?: string | null,
 ) {
   const row: WarehouseRow = {
     id: newId,
@@ -191,6 +187,8 @@ function mergeCreatedWarehouseIntoWarehousesCaches(
     timezone: values.timezone || null,
     is_active: values.isActive,
     is_primary: values.isPrimary,
+    updated_at: updatedAt ?? null,
+    updatedAt: updatedAt ?? null,
   }
   const haystack = `${values.name}\n${values.code}`.toLowerCase()
 
@@ -275,6 +273,7 @@ type ConfigSectionOptions = {
 
 export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
   const t = useT()
+  const locale = useLocale()
   const queryClient = useQueryClient()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const { runMutation } = useGuardedMutation<Record<string, unknown>>({ contextId: 'wms-config-warehouses' })
@@ -282,7 +281,6 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
   const [page, setPage] = React.useState(1)
   const [search, setSearch] = React.useState('')
   const [sorting, setSorting] = React.useState<SortingState>([{ id: 'updatedAt', desc: true }])
-  const [submitting, setSubmitting] = React.useState(false)
   const [dialog, setDialog] = React.useState<DialogMode<WarehouseRow> | null>(null)
 
   const handleSortingChange = React.useCallback((nextSorting: SortingState) => {
@@ -314,16 +312,6 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
     },
   })
 
-  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: 'text', label: t('wms.backend.config.warehouses.form.country', 'Country') },
-    { id: 'timezone', type: 'text', label: t('wms.backend.config.warehouses.form.timezone', 'Timezone') },
-    { 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') },
-  ], [t])
-
   const columns = React.useMemo<ColumnDef<WarehouseRow>[]>(() => [
     {
       accessorKey: 'name',
@@ -333,7 +321,7 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
     },
     { accessorKey: 'code', header: t('wms.backend.config.warehouses.columns.code', 'Code'), enableSorting: true },
     { accessorKey: 'city', header: t('wms.backend.config.warehouses.columns.city', 'City'), cell: ({ row }) => row.original.city || '—' },
-    { accessorKey: 'country', header: t('wms.backend.config.warehouses.columns.country', 'Country'), cell: ({ row }) => row.original.country || '—' },
+    { accessorKey: 'country', header: t('wms.backend.config.warehouses.columns.country', 'Country'), cell: ({ row }) => formatWarehouseCountryLabel(row.original.country, locale) },
     {
       accessorKey: 'is_primary',
       header: t('wms.backend.config.warehouses.columns.primary', 'Primary'),
@@ -350,34 +338,10 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
           ? t('wms.common.inactive', 'Inactive')
           : t('wms.common.active', 'Active'),
     },
-  ], [t])
-
-  const initialValues = React.useMemo<WarehouseFormValues>(() => {
-    if (dialog?.mode === 'edit') {
-      return {
-        name: dialog.row.name || '',
-        code: dialog.row.code || '',
-        city: dialog.row.city || '',
-        country: dialog.row.country || '',
-        timezone: dialog.row.timezone || '',
-        isActive: dialog.row.is_active !== false,
-        isPrimary: dialog.row.is_primary === true,
-      }
-    }
-    return {
-      name: '',
-      code: '',
-      city: '',
-      country: '',
-      timezone: '',
-      isActive: true,
-      isPrimary: false,
-    }
-  }, [dialog])
+  ], [locale, t])
 
   const closeDialog = React.useCallback(() => {
     setDialog(null)
-    setSubmitting(false)
   }, [])
 
   const refresh = React.useCallback(async () => {
@@ -386,61 +350,20 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
     await queryClient.refetchQueries({ queryKey: ['wms-config', 'warehouses'], type: 'all' })
   }, [queryClient])
 
-  const handleSubmit = React.useCallback(async (values: WarehouseFormValues) => {
-    if (!dialog) return
-    const submitMode = dialog.mode
-    setSubmitting(true)
-    try {
-      const call = await runMutation({
-        operation: async () => {
-          const result = await apiCall<{ id?: string | null }>(
-            '/api/wms/warehouses',
-            {
-              method: submitMode === 'edit' ? 'PUT' : 'POST',
-              body: JSON.stringify(
-                submitMode === 'edit'
-                  ? { id: dialog.row.id, ...values }
-                  : values,
-              ),
-            },
-          )
-          if (!result.ok) {
-            await raiseCrudError(result.response, t('wms.backend.config.warehouses.errors.save', 'Failed to save warehouse.'))
-          }
-          return result
-        },
-        context: {},
-        mutationPayload: submitMode === 'edit' ? { id: dialog.row.id, ...values } : values,
-      })
-      flash(
-        submitMode === 'edit'
-          ? t('wms.backend.config.warehouses.flash.updated', 'Warehouse updated')
-          : t('wms.backend.config.warehouses.flash.created', 'Warehouse created'),
-        'success',
-      )
-
-      const createdId =
-        submitMode === 'create' &&
-        call?.result &&
-        typeof call.result === 'object' &&
-        typeof (call.result as { id?: unknown }).id === 'string'
-          ? (call.result as { id: string }).id.trim()
-          : null
-
-      closeDialog()
-
-      if (submitMode === 'create' && createdId) {
-        mergeCreatedWarehouseIntoWarehousesCaches(queryClient, createdId, values)
-        setSearch('')
-        setPage(1)
-      }
-
-      await refresh()
-    } catch (error) {
-      flashMutationError(error, t('wms.backend.config.warehouses.errors.save', 'Failed to save warehouse.'), t)
-      setSubmitting(false)
+  const handleWarehouseSaved = React.useCallback(async (info: {
+    mode: 'create' | 'edit'
+    id?: string
+    values: WarehouseFormValues
+    updatedAt?: string | null
+  }) => {
+    closeDialog()
+    if (info.mode === 'create' && info.id) {
+      mergeCreatedWarehouseIntoWarehousesCaches(queryClient, info.id, info.values, info.updatedAt)
+      setSearch('')
+      setPage(1)
     }
-  }, [closeDialog, dialog, queryClient, refresh, runMutation, t])
+    await refresh()
+  }, [closeDialog, queryClient, refresh])
 
   const handleDelete = React.useCallback(async (row: WarehouseRow) => {
     const confirmed = await confirm({
@@ -515,6 +438,7 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
             pageSize: 10,
             total: query.data?.total ?? 0,
             totalPages: query.data?.totalPages ?? 1,
+            totalIsCapped: query.data?.totalIsCapped === true,
             onPageChange: setPage,
           }}
           perspective={{ tableId: extensionPoints.hosts.warehousesTable.tableId }}
@@ -528,28 +452,13 @@ export function WarehouseSection({ viewAllHref }: ConfigSectionOptions = {}) {
         />
       </SectionCard>
 
-      <Dialog open={dialog !== null} onOpenChange={(next) => !next && closeDialog()}>
-        <DialogContent className="max-w-3xl">
-          <DialogHeader>
-            <DialogTitle>
-              {dialog?.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
-            isLoading={submitting}
-            twoColumn
-          />
-        </DialogContent>
-      </Dialog>
+      <WarehouseEditDialog
+        open={dialog !== null}
+        onOpenChange={(next) => { if (!next) closeDialog() }}
+        mode={dialog?.mode === 'edit' ? 'edit' : 'create'}
+        row={dialog?.mode === 'edit' ? dialog.row : null}
+        onSaved={handleWarehouseSaved}
+      />
       {ConfirmDialogElement}
     </>
   )
@@ -596,19 +505,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>[]>(() => [
     {
@@ -639,19 +583,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)
@@ -667,10 +614,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(
@@ -775,6 +726,7 @@ export function ZoneSection({ viewAllHref }: ConfigSectionOptions = {}) {
             pageSize: 10,
             total: query.data?.total ?? 0,
             totalPages: query.data?.totalPages ?? 1,
+            totalIsCapped: query.data?.totalIsCapped === true,
             onPageChange: setPage,
           }}
           perspective={{ tableId: extensionPoints.hosts.zonesTable.tableId }}
@@ -982,6 +934,7 @@ export function LocationSection({ viewAllHref }: ConfigSectionOptions = {}) {
             pageSize: 10,
             total: query.data?.total ?? 0,
             totalPages: query.data?.totalPages ?? 1,
+            totalIsCapped: query.data?.totalIsCapped === true,
             onPageChange: setPage,
           }}
           perspective={{ tableId: extensionPoints.hosts.locationsTable.tableId }}
@@ -1276,6 +1229,7 @@ export function InventoryProfilesSection() {
             pageSize: 10,
             total: query.data?.total ?? 0,
             totalPages: query.data?.totalPages ?? 1,
+            totalIsCapped: query.data?.totalIsCapped === true,
             onPageChange: setPage,
           }}
           perspective={{ tableId: extensionPoints.hosts.inventoryProfilesTable.tableId }}

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

@@ -58,6 +58,7 @@ type PagedResponse<T> = {
   items: T[]
   total: number
   totalPages: number
+  totalIsCapped?: boolean
 }
 
 type InventoryBalanceRow = {
@@ -357,6 +358,7 @@ function InventoryDataTableSection<T extends RowData>({
           pageSize: 20,
           total: query.data?.total ?? 0,
           totalPages: query.data?.totalPages ?? 1,
+          totalIsCapped: query.data?.totalIsCapped === true,
           onPageChange: setPage,
         }}
         perspective={{ tableId }}

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

@@ -41,6 +41,7 @@ type PagedResponse<T> = {
   items: T[]
   total: number
   totalPages: number
+  totalIsCapped?: boolean
 }
 
 function parseExpiryWindow(value: string | null): ExpiryWindow | null {
@@ -280,6 +281,7 @@ export default function WmsLotsListPage() {
                 pageSize: 25,
                 total: lotsQuery.data.total,
                 totalPages: lotsQuery.data.totalPages,
+                totalIsCapped: lotsQuery.data?.totalIsCapped === true,
                 onPageChange: setPage,
               }}
               perspective={{ tableId: extensionPoints.hosts.lotsTable.tableId }}

package/src/modules/wms/components/backend/inventoryMutationLoaders.ts

@@ -321,21 +321,25 @@ export async function loadAllLocations(
   filters: { type?: string; search?: string },
 ): Promise<LocationListRow[]> {
   const items: LocationListRow[] = []
+  const pageSize = 100
   let page = 1
-  let totalPages = 1
 
-  while (page <= totalPages && page <= 10) {
+  // Short-page termination: `totalPages` derives from `total`, which is a
+  // display value that can be capped (OM_LIST_COUNT_CAP) — never a loop bound.
+  for (;;) {
     const params = buildQuery({
       page,
-      pageSize: 100,
+      pageSize,
       warehouseId,
       type: filters.type,
       search: filters.search?.trim() || undefined,
     })
     const call = await apiCall<PagedResponse<LocationListRow>>(`/api/wms/locations?${params}`)
     if (!call.ok) break
-    items.push(...(call.result?.items ?? []))
-    totalPages = call.result?.totalPages ?? 1
+    const batch = call.result?.items ?? []
+    items.push(...batch)
+    if (batch.length < pageSize) break
+    if (page >= 10) break
     page += 1
   }
 
@@ -538,13 +542,15 @@ export async function fetchCycleCountScopeEstimate(input: {
   const binCount = scopedBinIds.size
 
   const variantIds = new Set<string>()
+  const pageSize = 100
   let page = 1
-  let totalPages = 1
 
-  while (page <= totalPages && page <= 10) {
+  // Short-page termination: `totalPages` derives from `total`, which is a
+  // display value that can be capped (OM_LIST_COUNT_CAP) — never a loop bound.
+  for (;;) {
     const params = buildQuery({
       page,
-      pageSize: 100,
+      pageSize,
       warehouseId,
     })
     const call = await apiCall<PagedResponse<{ catalog_variant_id?: string | null; location_id?: string | null; quantity_on_hand?: string | number | null }>>(
@@ -554,7 +560,8 @@ export async function fetchCycleCountScopeEstimate(input: {
       throw new ScopeEstimateError()
     }
 
-    for (const row of call.result?.items ?? []) {
+    const batch = call.result?.items ?? []
+    for (const row of batch) {
       const locationId = row.location_id?.trim()
       const variantId = row.catalog_variant_id?.trim()
       const onHand = Number(row.quantity_on_hand ?? 0)
@@ -563,7 +570,8 @@ export async function fetchCycleCountScopeEstimate(input: {
       variantIds.add(variantId)
     }
 
-    totalPages = call.result?.totalPages ?? 1
+    if (batch.length < pageSize) break
+    if (page >= 10) break
     page += 1
   }
 
@@ -808,17 +816,20 @@ export async function buildCycleCountScopeQueue(input: {
   }
 
   const items: ScopeQueueItem[] = []
+  const pageSize = 100
   let page = 1
-  let totalPages = 1
 
-  while (page <= totalPages && page <= 20) {
-    const params = buildQuery({ page, pageSize: 100, warehouseId })
+  // Short-page termination: `totalPages` derives from `total`, which is a
+  // display value that can be capped (OM_LIST_COUNT_CAP) — never a loop bound.
+  for (;;) {
+    const params = buildQuery({ page, pageSize, warehouseId })
     const call = await apiCall<PagedResponse<BalanceRow>>(
       `/api/wms/inventory/balances?${params}`,
     )
     if (!call.ok) throw new ScopeQueueError()
 
-    for (const row of call.result?.items ?? []) {
+    const batch = call.result?.items ?? []
+    for (const row of batch) {
       const locationId = row.location_id?.trim()
       const variantId = row.catalog_variant_id?.trim()
       const lotId = row.lot_id?.trim() || null
@@ -838,7 +849,8 @@ export async function buildCycleCountScopeQueue(input: {
       })
     }
 
-    totalPages = call.result?.totalPages ?? 1
+    if (batch.length < pageSize) break
+    if (page >= 20) break
     page += 1
   }
 
@@ -900,8 +912,10 @@ async function fetchLocationTotalOnHand(input: {
   if (!locationId) return 0
   let sum = 0
   let page = 1
-  let totalPages = 1
-  do {
+  // Short-page termination: this sum is user-visible, and `totalPages` derives
+  // from `total`, which is a display value that can be capped
+  // (OM_LIST_COUNT_CAP) — never a loop bound.
+  for (;;) {
     const params = buildQuery({
       page,
       pageSize: LOCATION_TOTAL_ON_HAND_PAGE_SIZE,
@@ -912,13 +926,15 @@ async function fetchLocationTotalOnHand(input: {
       `/api/wms/inventory/balances?${params}`,
     )
     if (!call.ok) break
-    for (const row of call.result?.items ?? []) {
+    const batch = call.result?.items ?? []
+    for (const row of batch) {
       const value = Number(row.quantity_on_hand ?? 0)
       if (Number.isFinite(value)) sum += value
     }
-    totalPages = call.result?.totalPages ?? 1
+    if (batch.length < LOCATION_TOTAL_ON_HAND_PAGE_SIZE) break
+    if (page >= LOCATION_TOTAL_ON_HAND_MAX_PAGES) break
     page += 1
-  } while (page <= totalPages && page <= LOCATION_TOTAL_ON_HAND_MAX_PAGES)
+  }
   return sum
 }
 

package/src/modules/wms/components/backend/warehouseFormOptions.ts

@@ -0,0 +1,72 @@
+import type { CrudFieldOption } from '@open-mercato/ui/backend/CrudForm'
+import { buildCountryOptions, resolveCountryName } from '@open-mercato/shared/lib/location/countries'
+
+const OPTION_LIMIT = 100
+
+function matchesQuery(haystack: string, query: string): boolean {
+  return haystack.toLowerCase().includes(query.toLowerCase())
+}
+
+export function countryOptionFromStored(value: string, locale?: string): CrudFieldOption {
+  const trimmed = value.trim()
+  const code = trimmed.toUpperCase()
+  const label = resolveCountryName(code, { locale })
+  if (label && label !== code) {
+    return { value: code, label }
+  }
+  return { value: trimmed, label: trimmed }
+}
+
+export function formatWarehouseCountryLabel(value: string | null | undefined, locale?: string): string {
+  const trimmed = value?.trim()
+  if (!trimmed) return '—'
+  return countryOptionFromStored(trimmed, locale).label
+}
+
+export function timezoneOptionFromStored(value: string): CrudFieldOption {
+  const trimmed = value.trim()
+  return { value: trimmed, label: trimmed }
+}
+
+export async function loadCountryOptions(query?: string, locale?: string): Promise<CrudFieldOption[]> {
+  const options = buildCountryOptions({ locale }).map((entry) => ({
+    value: entry.code,
+    label: entry.label,
+  }))
+  const term = query?.trim()
+  const filtered = term
+    ? options.filter((option) => matchesQuery(option.label, term) || matchesQuery(option.value, term))
+    : options
+  return filtered.slice(0, OPTION_LIMIT)
+}
+
+function resolveLocalTimeZone(): string | undefined {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || undefined
+  } catch {
+    return undefined
+  }
+}
+
+function listSupportedTimeZones(): string[] {
+  try {
+    const intlWithSupportedValues = Intl as typeof Intl & { supportedValuesOf?: (input: 'timeZone') => string[] }
+    if (typeof intlWithSupportedValues.supportedValuesOf !== 'function') return []
+    return intlWithSupportedValues.supportedValuesOf('timeZone').filter(Boolean)
+  } catch {
+    return []
+  }
+}
+
+export async function loadTimezoneOptions(query?: string): Promise<CrudFieldOption[]> {
+  const localZone = resolveLocalTimeZone()
+  const preferred = localZone && localZone !== 'UTC' ? ['UTC', localZone] : ['UTC']
+  const zones = new Set<string>([...preferred, ...listSupportedTimeZones()])
+  const rest = Array.from(zones).filter((tz) => !preferred.includes(tz))
+  const allTz = [...preferred, ...rest]
+  const term = query?.trim()
+  const filtered = term
+    ? allTz.filter((tz) => matchesQuery(tz, term))
+    : allTz
+  return filtered.slice(0, OPTION_LIMIT).map((tz) => ({ value: tz, label: tz }))
+}