@open-mercato/core 0.7.0 → 0.7.1-develop.7103.1.41ff100d93

package/src/modules/staff/backend/staff/timesheets/projects/page.tsx

@@ -79,6 +79,7 @@ type ProjectsResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
+  totalIsCapped?: boolean
 }
 
 type KpisResponse = PmKpis | CollabKpis
@@ -186,6 +187,7 @@ export default function TimesheetProjectsPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [sorting, setSorting] = React.useState<SortingState>([{ id: 'updatedAt', desc: true }])
   const [search, setSearch] = React.useState('')
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
@@ -404,6 +406,7 @@ export default function TimesheetProjectsPage() {
           ? payload.totalPages
           : Math.max(1, Math.ceil(items.length / PAGE_SIZE)),
       )
+      setTotalIsCapped(payload.totalIsCapped === true)
     } catch (error) {
       logger.error('staff.timesheets.projects.list', { err: error })
       flash(labels.errors.load, 'error')
@@ -740,6 +743,7 @@ export default function TimesheetProjectsPage() {
               pageSize: PAGE_SIZE,
               total,
               totalPages,
+              totalIsCapped,
               onPageChange: setPage,
             }}
             rowActions={(row) => (

package/src/modules/sync_excel/lib/adapters/customers.ts

@@ -1058,6 +1058,11 @@ export const syncExcelCustomersAdapter: DataSyncAdapter = {
         const items: ImportItem[] = []
 
         for (let index = 0; index < batchRows.length; index += 1) {
+          // Above the yield, so an abandoned page is never yielded and its cursor never committed —
+          // the rows applied so far are re-applied on resume, which the replay-safety contract on
+          // `streamImport` already requires. Each row goes through the command bus, so a large page
+          // is exactly the case where the operator would otherwise wait out the whole batch.
+          if (input.signal?.aborted) return
           items.push(await processRow({
             row: batchRows[index],
             rowNumber: batch.rowStart + index + 1,

package/src/modules/warranty_claims/api/assignees/route.ts

@@ -40,12 +40,12 @@ export function parseRequestedIds(raw: string): string[] {
 }
 
 export async function GET(req: Request) {
+  const { translate } = await resolveTranslations()
   try {
     const url = new URL(req.url)
     const parsedQuery = querySchema.parse(Object.fromEntries(url.searchParams))
     const container = await createRequestContainer()
     const auth = await getAuthFromRequest(req)
-    const { translate } = await resolveTranslations()
     if (!auth || !auth.tenantId) {
       throw new CrudHttpError(401, { error: translate('warranty_claims.errors.unauthorized', 'Unauthorized') })
     }
@@ -75,10 +75,10 @@ export async function GET(req: Request) {
       return NextResponse.json(error.body, { status: error.status })
     }
     if (error instanceof z.ZodError) {
-      return NextResponse.json({ error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
+      return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }
     logger.error('[warranty_claims] Failed to resolve assignee display names', { error })
-    return NextResponse.json({ error: 'warranty_claims.errors.load_failed' }, { status: 500 })
+    return NextResponse.json({ error: translate('warranty_claims.errors.load_failed', 'Failed to load warranty claim data.') }, { status: 500 })
   }
 }
 

package/src/modules/warranty_claims/api/portal/attachments/route.ts

@@ -19,7 +19,7 @@ import { readAttachmentMetadata } from '@open-mercato/core/modules/attachments/l
 import { clearAttachmentThumbnailCache } from '@open-mercato/core/modules/attachments/lib/thumbnailCache'
 import { isMultipartRequestWithinUploadLimit } from '@open-mercato/core/modules/attachments/lib/upload-limits'
 import {
-  ScopedAttachmentUploadError,
+  isScopedAttachmentUploadError,
   type ScopedAttachmentUploadErrorCode,
 } from '@open-mercato/core/modules/attachments/lib/scoped-upload-service'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -413,7 +413,7 @@ async function handleUpload(req: Request, replacement: boolean): Promise<Respons
       tags: [CUSTOMER_VISIBLE_ATTACHMENT_TAG],
     })
   } catch (error) {
-    if (error instanceof ScopedAttachmentUploadError) {
+    if (isScopedAttachmentUploadError(error)) {
       const { t } = await resolveTranslations()
       const [key, fallback] = ATTACHMENT_ERROR_TRANSLATIONS[error.code]
         ?? ['warranty_claims.portal.detail.attachmentError', 'Attachment upload failed.']

package/src/modules/warranty_claims/api/portal/claims/route.ts

@@ -153,12 +153,13 @@ function serializePortalClaim(claim: WarrantyClaim, lines: WarrantyClaimLine[])
 }
 
 async function resolvePortalContext(req: Request): Promise<PortalContext | Response> {
+  const { translate } = await resolveTranslations()
   const auth = await getCustomerAuthFromRequest(req)
   if (!auth) {
-    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.unauthorized' }, { status: 401 })
+    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.unauthorized', 'Unauthorized') }, { status: 401 })
   }
   if (!auth.customerEntityId) {
-    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.customerAccountNotLinked' }, { status: 403 })
+    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.customerAccountNotLinked', 'Customer account is not linked to a customer record') }, { status: 403 })
   }
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
@@ -264,6 +265,7 @@ async function validatePortalOrderOwnership(
   context: PortalContext,
   input: PortalIntakeInput,
 ): Promise<OrderValidationResult | Response> {
+  const { translate } = await resolveTranslations()
   const orderLineIds = Array.from(new Set(input.lines.flatMap((line) => line.orderLineId ? [line.orderLineId] : [])))
   const orderLinesById = await loadOwnedOrderLines(context, orderLineIds)
   const orderIds = new Set<string>()
@@ -273,7 +275,7 @@ async function validatePortalOrderOwnership(
   let resolvedOrder = input.orderId ? (ordersById.get(input.orderId) ?? null) : null
   if (input.orderId) {
     if (!resolvedOrder) {
-      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.orderNotOwned' }, { status: 404 })
+      return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.orderNotOwned', 'Order not found.') }, { status: 404 })
     }
   }
 
@@ -282,10 +284,9 @@ async function validatePortalOrderOwnership(
     const resolvedLine = orderLinesById.get(line.orderLineId)
     const lineOrder = resolvedLine ? ordersById.get(resolvedLine.orderId) : null
     if (!resolvedLine || !lineOrder) {
-      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.orderLineMismatch' }, { status: 404 })
+      return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.orderLineMismatch', 'Order line does not belong to the selected order') }, { status: 404 })
     }
     if (resolvedOrder && lineOrder.id !== resolvedOrder.id) {
-      const { translate } = await resolveTranslations()
       return NextResponse.json(
         { ok: false, error: translate('warranty_claims.errors.orderLineMismatch', 'Order line does not belong to the selected order') },
         { status: 400 },
@@ -337,7 +338,8 @@ export async function GET(req: Request) {
     serialNumber: url.searchParams.get('serialNumber') ?? undefined,
   })
   if (!query.success) {
-    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
+    const { translate } = await resolveTranslations()
+    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
   }
   const { page, pageSize, search, status, stateGroup, serialNumber } = query.data
   const where = buildPortalOwnedClaimWhere(context)
@@ -415,15 +417,16 @@ export async function POST(req: Request) {
   const contextOrResponse = await resolvePortalContext(req)
   if (contextOrResponse instanceof Response) return contextOrResponse
   const context = contextOrResponse
+  const { translate } = await resolveTranslations()
   let body: unknown
   try {
     body = await req.json()
   } catch {
-    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
+    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
   }
   const parsed = portalIntakeInputSchema.safeParse(body)
   if (!parsed.success) {
-    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
+    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
   }
   const ownership = await validatePortalOrderOwnership(context, parsed.data)
   if (ownership instanceof Response) return ownership
@@ -487,7 +490,7 @@ export async function POST(req: Request) {
     )
     const claimId = createResult.result?.claimId
     if (typeof claimId !== 'string') {
-      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.save_failed' }, { status: 500 })
+      return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.save_failed', 'Failed to save warranty claim.') }, { status: 500 })
     }
     try {
       await commandBus.execute<{ id: string; actorCustomerId: string }, { claimId: string }>(

package/src/modules/warranty_claims/backend/page.tsx

@@ -71,6 +71,7 @@ type ClaimsResponse = {
   items?: ClaimRow[]
   total?: number
   totalPages?: number
+  totalIsCapped?: boolean
   page?: number
   pageSize?: number
   error?: string
@@ -421,6 +422,7 @@ export default function WarrantyClaimsPage() {
   const [page, setPage] = React.useState(initialUrlState.page)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [tabCounts, setTabCounts] = React.useState<ClaimsTabCounts>({})
   const [search, setSearch] = React.useState(initialUrlState.search)
   const [filterValues, setFilterValues] = React.useState<FilterValues>(initialUrlState.filterValues)
@@ -508,6 +510,7 @@ export default function WarrantyClaimsPage() {
         setRows(items.map(normalizeClaimRow).filter((row): row is ClaimRow => row !== null))
         setTotal(typeof call.result?.total === 'number' ? call.result.total : items.length)
         setTotalPages(typeof call.result?.totalPages === 'number' ? call.result.totalPages : 1)
+        setTotalIsCapped(call.result?.totalIsCapped === true)
       } catch (error) {
         if (!cancelled) {
           const message = error instanceof Error ? error.message : t('warranty_claims.list.error.load')
@@ -1255,6 +1258,7 @@ export default function WarrantyClaimsPage() {
               pageSize: PAGE_SIZE,
               total,
               totalPages,
+              totalIsCapped,
               onPageChange: setPage,
             }}
           />

package/src/modules/warranty_claims/backend/warranty_claims/registrations/page.tsx

@@ -31,6 +31,7 @@ type RegistrationsResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
+  totalIsCapped?: boolean
   error?: string
 }
 
@@ -141,6 +142,7 @@ export default function WarrantyClaimRegistrationsPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [tabCounts, setTabCounts] = React.useState<Partial<Record<RegistrationSegment, number>>>({})
   const [search, setSearch] = React.useState('')
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
@@ -218,6 +220,7 @@ export default function WarrantyClaimRegistrationsPage() {
         setRows(items.map(normalizeRegistration).filter((row): row is RegistrationRecord => row !== null))
         setTotal(typeof call.result?.total === 'number' ? call.result.total : items.length)
         setTotalPages(typeof call.result?.totalPages === 'number' ? call.result.totalPages : 1)
+        setTotalIsCapped(call.result?.totalIsCapped === true)
       } catch (error) {
         if (!cancelled) {
           const message = error instanceof Error
@@ -544,6 +547,7 @@ export default function WarrantyClaimRegistrationsPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
+            totalIsCapped,
             onPageChange: setPage,
           }}
           />

package/src/modules/warranty_claims/backend/warranty_claims/troubleshooting-guides/page.tsx

@@ -40,6 +40,7 @@ type TroubleshootingGuidesResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
+  totalIsCapped?: boolean
   error?: string
 }
 
@@ -70,6 +71,7 @@ export default function WarrantyTroubleshootingGuidesPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [tabCounts, setTabCounts] = React.useState<Partial<Record<GuideSegment, number>>>({})
   const [search, setSearch] = React.useState('')
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
@@ -155,6 +157,7 @@ export default function WarrantyTroubleshootingGuidesPage() {
         setRows(items.map(normalizeTroubleshootingGuide).filter((row): row is TroubleshootingGuideRecord => row !== null))
         setTotal(typeof call.result?.total === 'number' ? call.result.total : items.length)
         setTotalPages(typeof call.result?.totalPages === 'number' ? call.result.totalPages : 1)
+        setTotalIsCapped(call.result?.totalIsCapped === true)
       } catch (error) {
         if (!cancelled) {
           const message = error instanceof Error
@@ -466,6 +469,7 @@ export default function WarrantyTroubleshootingGuidesPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
+            totalIsCapped,
             onPageChange: setPage,
           }}
           />

package/src/modules/warranty_claims/backend/warranty_claims/vendor-policies/page.tsx

@@ -33,6 +33,7 @@ type VendorPoliciesResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
+  totalIsCapped?: boolean
   error?: string
 }
 
@@ -78,6 +79,7 @@ export default function WarrantyVendorPoliciesPage() {
   const [page, setPage] = React.useState(1)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [tabCounts, setTabCounts] = React.useState<Partial<Record<VendorPolicySegment, number>>>({})
   const [search, setSearch] = React.useState('')
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
@@ -163,6 +165,7 @@ export default function WarrantyVendorPoliciesPage() {
         setRows(items.map(normalizeVendorPolicy).filter((row): row is VendorPolicyRecord => row !== null))
         setTotal(typeof call.result?.total === 'number' ? call.result.total : items.length)
         setTotalPages(typeof call.result?.totalPages === 'number' ? call.result.totalPages : 1)
+        setTotalIsCapped(call.result?.totalIsCapped === true)
       } catch (error) {
         if (!cancelled) {
           const message = error instanceof Error
@@ -495,6 +498,7 @@ export default function WarrantyVendorPoliciesPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
+            totalIsCapped,
             onPageChange: setPage,
           }}
           />

package/src/modules/warranty_claims/frontend/[orgSlug]/portal/claims/page.tsx

@@ -39,6 +39,7 @@ type PortalClaimsResponse = {
   page: number
   pageSize: number
   totalPages: number
+  totalIsCapped?: boolean
 }
 
 function formatDate(value: string | null, fallback: string, locale: string): string {
@@ -63,6 +64,7 @@ export default function WarrantyClaimsPortalListPage({ params }: Props) {
   const [pageSize, setPageSize] = React.useState(20)
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
+  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [search, setSearch] = React.useState('')
@@ -102,6 +104,7 @@ export default function WarrantyClaimsPortalListPage({ params }: Props) {
         setRows(res.result.items)
         setTotal(res.result.total)
         setTotalPages(res.result.totalPages)
+        setTotalIsCapped(res.result.totalIsCapped === true)
       })
       .catch(() => {
         if (!cancelled) {
@@ -271,6 +274,7 @@ export default function WarrantyClaimsPortalListPage({ params }: Props) {
           pageSize,
           total,
           totalPages,
+          totalIsCapped,
           onPageChange: setPage,
           onPageSizeChange: (nextPageSize) => {
             setPageSize(nextPageSize)

package/src/modules/wms/api/warehouseSearch.ts

@@ -0,0 +1,23 @@
+import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
+import { locales } from '@open-mercato/shared/lib/i18n/config'
+import { matchCountryCodes } from '@open-mercato/shared/lib/location/countries'
+
+/**
+ * Warehouse list search matches name/code/city plus both stored country values:
+ * ISO codes (`PL`) and legacy free-text (`Poland`). Localized labels shown in
+ * the table (`Poland` / `Polska`) must resolve back to the stored ISO code.
+ */
+export function buildWarehouseListSearchOr(term: string): Array<Record<string, unknown>> {
+  const like = `%${escapeLikePattern(term)}%`
+  const orFilters: Array<Record<string, unknown>> = [
+    { name: { $ilike: like } },
+    { code: { $ilike: like } },
+    { city: { $ilike: like } },
+    { country: { $ilike: like } },
+  ]
+  const matchedCountryCodes = matchCountryCodes(term, { locales })
+  if (matchedCountryCodes.length > 0) {
+    orFilters.push({ country: { $in: matchedCountryCodes } })
+  }
+  return orFilters
+}

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/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({