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

package/src/modules/staff/backend/staff/team-roles/page.tsx

@@ -41,7 +41,6 @@ type TeamRolesResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type TeamsResponse = {
@@ -57,7 +56,6 @@ export default function StaffTeamRolesPage() {
   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 [search, setSearch] = React.useState('')
   const [isLoading, setIsLoading] = React.useState(true)
   const [reloadToken, setReloadToken] = React.useState(0)
@@ -205,7 +203,6 @@ export default function StaffTeamRolesPage() {
       setRows(buildTeamRoleRows(items.map(mapApiTeamRole), labels.groups.unassigned))
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
-      setTotalIsCapped(payload?.totalIsCapped === true)
     } catch (error) {
       logger.error('staff.team-roles.list', { err: error })
       flash(labels.errors.load, 'error')
@@ -332,7 +329,6 @@ export default function StaffTeamRolesPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
           }}
           rowActions={(row) => row.kind === 'role' ? (

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -60,7 +60,6 @@ type TeamMembersResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 export default function StaffTeamEditPage({ params }: { params?: { id?: string } }) {
@@ -77,7 +76,6 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
   const [memberRows, setMemberRows] = React.useState<TeamMemberRow[]>([])
   const [memberPage, setMemberPage] = React.useState(1)
   const [memberTotal, setMemberTotal] = React.useState(0)
-  const [memberTotalIsCapped, setMemberTotalIsCapped] = React.useState(false)
   const [memberTotalPages, setMemberTotalPages] = React.useState(1)
   const [memberSorting, setMemberSorting] = React.useState<SortingState>([{ id: 'displayName', desc: false }])
   const [memberSearch, setMemberSearch] = React.useState('')
@@ -265,7 +263,6 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
       const items = Array.isArray(payload.items) ? payload.items : []
       setMemberRows(items.map(mapApiTeamMember))
       setMemberTotal(typeof payload.total === 'number' ? payload.total : items.length)
-      setMemberTotalIsCapped(payload.totalIsCapped === true)
       setMemberTotalPages(
         typeof payload.totalPages === 'number'
           ? payload.totalPages
@@ -437,7 +434,6 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
                 pageSize: TEAM_MEMBERS_PAGE_SIZE,
                 total: memberTotal,
                 totalPages: memberTotalPages,
-                totalIsCapped: memberTotalIsCapped,
                 onPageChange: setMemberPage,
               }}
               rowActions={(row) => (

package/src/modules/staff/backend/staff/teams/page.tsx

@@ -41,7 +41,6 @@ type TeamsResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 export default function StaffTeamsPage() {
@@ -53,7 +52,6 @@ export default function StaffTeamsPage() {
   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: 'name', desc: false }])
   const [search, setSearch] = React.useState('')
   const [isLoading, setIsLoading] = React.useState(true)
@@ -178,7 +176,6 @@ export default function StaffTeamsPage() {
       setRows(items.map(mapApiTeam))
       setTotal(typeof payload.total === 'number' ? payload.total : items.length)
       setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : Math.max(1, Math.ceil(items.length / PAGE_SIZE)))
-      setTotalIsCapped(payload?.totalIsCapped === true)
     } catch (error) {
       logger.error('staff.teams.list', { err: error })
       flash(labels.errors.load, 'error')
@@ -264,7 +261,6 @@ export default function StaffTeamsPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
           }}
           rowActions={(row) => (

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

@@ -178,12 +178,6 @@ export default function MyTimesheetsPage() {
     blockedMessage: t('ui.forms.flash.saveBlocked', 'Save blocked by validation'),
   })
 
-  const gridInstanceId = React.useId()
-  const durationHintId = `${gridInstanceId}-duration-hint`
-  const buildDurationErrorId = React.useCallback(
-    (projectId: string, dateKey: string): string => `${gridInstanceId}-duration-error-${projectId}-${dateKey}`,
-    [gridInstanceId],
-  )
   const durationFormatHint = t(
     'staff.timesheets.my.duration.hint',
     'Enter hours (8 or 1.5), h:mm (1:30) or minutes (90m). Max 24h per day.',
@@ -925,7 +919,6 @@ export default function MyTimesheetsPage() {
                       const isDirty = dirty[project.id]?.[dateKey] !== undefined
                       const cellError = cellErrors[project.id]?.[dateKey]
                       const cellErrorMessage = cellError ? describeDurationError(cellError) : undefined
-                      const cellErrorId = cellErrorMessage ? buildDurationErrorId(project.id, dateKey) : undefined
                       return (
                         <td key={dateKey} className={`px-0.5 py-0.5 ${weekend ? 'bg-muted/40' : ''}`}>
                           {weekend ? (
@@ -950,13 +943,9 @@ export default function MyTimesheetsPage() {
                               placeholder={t('staff.timesheets.my.durationPlaceholder', '0')}
                               aria-invalid={cellError !== undefined}
                               aria-label={describeDurationCell(project.name, date)}
-                              aria-describedby={[durationHintId, cellErrorId].filter(Boolean).join(' ')}
                               title={cellErrorMessage ?? durationFormatHint}
                             />
                           )}
-                          {cellErrorMessage ? (
-                            <span id={cellErrorId} role="alert" className="sr-only">{cellErrorMessage}</span>
-                          ) : null}
                         </td>
                       )
                     })}
@@ -995,7 +984,7 @@ export default function MyTimesheetsPage() {
                 </tr>
               </tfoot>
             </table>
-            <p id={durationHintId} className="px-3 py-2 text-xs text-muted-foreground">{durationFormatHint}</p>
+            <p className="px-3 py-2 text-xs text-muted-foreground">{durationFormatHint}</p>
           </div>
         )}
         </div>

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

@@ -79,7 +79,6 @@ type ProjectsResponse = {
   items?: Array<Record<string, unknown>>
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
 }
 
 type KpisResponse = PmKpis | CollabKpis
@@ -187,7 +186,6 @@ 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>({})
@@ -406,7 +404,6 @@ 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')
@@ -743,7 +740,6 @@ export default function TimesheetProjectsPage() {
               pageSize: PAGE_SIZE,
               total,
               totalPages,
-              totalIsCapped,
               onPageChange: setPage,
             }}
             rowActions={(row) => (

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

@@ -1058,11 +1058,6 @@ 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: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
+      return NextResponse.json({ error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
     }
     logger.error('[warranty_claims] Failed to resolve assignee display names', { error })
-    return NextResponse.json({ error: translate('warranty_claims.errors.load_failed', 'Failed to load warranty claim data.') }, { status: 500 })
+    return NextResponse.json({ error: 'warranty_claims.errors.load_failed' }, { 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 {
-  isScopedAttachmentUploadError,
+  ScopedAttachmentUploadError,
   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 (isScopedAttachmentUploadError(error)) {
+    if (error instanceof ScopedAttachmentUploadError) {
       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,13 +153,12 @@ 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: translate('warranty_claims.errors.unauthorized', 'Unauthorized') }, { status: 401 })
+    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.unauthorized' }, { status: 401 })
   }
   if (!auth.customerEntityId) {
-    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.customerAccountNotLinked', 'Customer account is not linked to a customer record') }, { status: 403 })
+    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.customerAccountNotLinked' }, { status: 403 })
   }
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
@@ -265,7 +264,6 @@ 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>()
@@ -275,7 +273,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: translate('warranty_claims.errors.orderNotOwned', 'Order not found.') }, { status: 404 })
+      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.orderNotOwned' }, { status: 404 })
     }
   }
 
@@ -284,9 +282,10 @@ 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: translate('warranty_claims.errors.orderLineMismatch', 'Order line does not belong to the selected order') }, { status: 404 })
+      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.orderLineMismatch' }, { 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 },
@@ -338,8 +337,7 @@ export async function GET(req: Request) {
     serialNumber: url.searchParams.get('serialNumber') ?? undefined,
   })
   if (!query.success) {
-    const { translate } = await resolveTranslations()
-    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
+    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
   }
   const { page, pageSize, search, status, stateGroup, serialNumber } = query.data
   const where = buildPortalOwnedClaimWhere(context)
@@ -417,16 +415,15 @@ 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: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
+    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
   }
   const parsed = portalIntakeInputSchema.safeParse(body)
   if (!parsed.success) {
-    return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
+    return NextResponse.json({ ok: false, error: 'warranty_claims.errors.invalidInput' }, { status: 400 })
   }
   const ownership = await validatePortalOrderOwnership(context, parsed.data)
   if (ownership instanceof Response) return ownership
@@ -490,7 +487,7 @@ export async function POST(req: Request) {
     )
     const claimId = createResult.result?.claimId
     if (typeof claimId !== 'string') {
-      return NextResponse.json({ ok: false, error: translate('warranty_claims.errors.save_failed', 'Failed to save warranty claim.') }, { status: 500 })
+      return NextResponse.json({ ok: false, error: 'warranty_claims.errors.save_failed' }, { status: 500 })
     }
     try {
       await commandBus.execute<{ id: string; actorCustomerId: string }, { claimId: string }>(

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

@@ -71,7 +71,6 @@ type ClaimsResponse = {
   items?: ClaimRow[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
   page?: number
   pageSize?: number
   error?: string
@@ -422,7 +421,6 @@ 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)
@@ -510,7 +508,6 @@ 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')
@@ -1258,7 +1255,6 @@ export default function WarrantyClaimsPage() {
               pageSize: PAGE_SIZE,
               total,
               totalPages,
-              totalIsCapped,
               onPageChange: setPage,
             }}
           />

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

@@ -31,7 +31,6 @@ type RegistrationsResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
   error?: string
 }
 
@@ -142,7 +141,6 @@ 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>({})
@@ -220,7 +218,6 @@ 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
@@ -547,7 +544,6 @@ 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,7 +40,6 @@ type TroubleshootingGuidesResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
   error?: string
 }
 
@@ -71,7 +70,6 @@ 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>({})
@@ -157,7 +155,6 @@ 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
@@ -469,7 +466,6 @@ 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,7 +33,6 @@ type VendorPoliciesResponse = {
   items?: unknown[]
   total?: number
   totalPages?: number
-  totalIsCapped?: boolean
   error?: string
 }
 
@@ -79,7 +78,6 @@ 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>({})
@@ -165,7 +163,6 @@ 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
@@ -498,7 +495,6 @@ export default function WarrantyVendorPoliciesPage() {
             pageSize: PAGE_SIZE,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
           }}
           />

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

@@ -39,7 +39,6 @@ type PortalClaimsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDate(value: string | null, fallback: string, locale: string): string {
@@ -64,7 +63,6 @@ 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('')
@@ -104,7 +102,6 @@ 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) {
@@ -274,7 +271,6 @@ export default function WarrantyClaimsPortalListPage({ params }: Props) {
           pageSize,
           total,
           totalPages,
-          totalIsCapped,
           onPageChange: setPage,
           onPageSizeChange: (nextPageSize) => {
             setPageSize(nextPageSize)

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,9 +77,6 @@ const crud = makeCrudRoute({
       F.created_at,
       F.updated_at,
     ],
-    decorateCustomFields: {
-      entityIds: E.wms.warehouse,
-    },
     sortFieldMap: {
       name: F.name,
       code: F.code,
@@ -97,7 +94,13 @@ const crud = makeCrudRoute({
       if (isActive !== null) filters[F.is_active] = { $eq: isActive }
       const term = query.search?.trim()
       if (term) {
-        filters.$or = buildWarehouseListSearchOr(term)
+        const like = `%${escapeLikePattern(term)}%`
+        filters.$or = [
+          { [F.name]: { $ilike: like } },
+          { [F.code]: { $ilike: like } },
+          { [F.city]: { $ilike: like } },
+          { [F.country]: { $ilike: like } },
+        ]
       }
       return filters
     },
@@ -110,10 +113,7 @@ const crud = makeCrudRoute({
         const { translate } = await resolveTranslations()
         return parseScopedCommandInput(warehouseCreateSchema, raw ?? {}, ctx, translate)
       },
-      response: ({ result }) => ({
-        id: result?.warehouseId ?? null,
-        updatedAt: result?.updatedAt ?? null,
-      }),
+      response: ({ result }) => ({ id: result?.warehouseId ?? null }),
       status: 201,
     },
     update: {
@@ -166,10 +166,6 @@ 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,10 +79,6 @@ 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) => {
@@ -126,16 +122,6 @@ 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(),
@@ -148,8 +134,6 @@ 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({