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

package/src/modules/devices/api/deviceList.ts

@@ -30,149 +30,25 @@ export const deviceListFields: string[] = [
   'updated_at',
 ]
 
-// The admin list enables exports, and the factory's default export derives its columns by spreading
-// each item — which would emit both spellings of every aliased key. Pin the canonical camelCase set
-// so the export stays single-spelled and does not change shape when the aliases are dropped.
-export const deviceExportColumnFields: string[] = [
-  'id',
-  'tenantId',
-  'organizationId',
-  'userId',
-  'deviceId',
-  'platform',
-  'clientAppVersion',
-  'osVersion',
-  'locale',
-  'pushProvider',
-  'pushTokenUpdatedAt',
-  'lastSeenAt',
-  'createdAt',
-  'updatedAt',
-]
-
 export const deviceListSortFieldMap: Record<string, string> = {
   lastSeenAt: 'last_seen_at',
   createdAt: 'created_at',
   updatedAt: 'updated_at',
 }
 
-// The query engine projects the raw column names listed in `deviceListFields`. Every other module
-// serializes its list items in camelCase (`sales/orders` → `orderNumber`, `warranty_claims` →
-// `claimNumber`), so the list routes run this transform to expose the platform convention (#5513).
-// The snake_case keys stay alongside as deprecated aliases for one minor version, per the
-// deprecation protocol in BACKWARD_COMPATIBILITY.md § 7 (API Route URLs — response fields).
-export function transformDeviceListItem(item: unknown): unknown {
-  const record = toRecord(item)
-  if (!Object.keys(record).length) return item
-  const camel = {
-    id: readString(record, 'id', 'id'),
-    tenantId: readString(record, 'tenant_id', 'tenantId'),
-    organizationId: readString(record, 'organization_id', 'organizationId'),
-    userId: readString(record, 'user_id', 'userId'),
-    deviceId: readString(record, 'device_id', 'deviceId'),
-    platform: readString(record, 'platform', 'platform'),
-    clientAppVersion: readString(record, 'client_app_version', 'clientAppVersion'),
-    osVersion: readString(record, 'os_version', 'osVersion'),
-    locale: readString(record, 'locale', 'locale'),
-    pushProvider: readString(record, 'push_provider', 'pushProvider'),
-    pushTokenUpdatedAt: toIso(record.push_token_updated_at ?? record.pushTokenUpdatedAt),
-    lastSeenAt: toIso(record.last_seen_at ?? record.lastSeenAt),
-    createdAt: toIso(record.created_at ?? record.createdAt),
-    updatedAt: toIso(record.updated_at ?? record.updatedAt),
-  }
-  // Spread the raw record first so anything the projection carries beyond the declared field set
-  // (custom-field keys, future columns) survives; the aliases then restate the snake_case keys with
-  // the same normalized values as their camelCase counterparts.
-  return { ...record, ...camel, ...toDeprecatedSnakeCaseAliases(camel) }
-}
-
-/**
- * @deprecated Snake_case device response keys are superseded by the camelCase keys and are removed in
- * the next minor release. Read `deviceId`, `userId`, `lastSeenAt`, … instead. See UPGRADE_NOTES.md.
- */
-export function toDeprecatedSnakeCaseAliases(item: DeviceResponseItem): Record<string, unknown> {
-  const aliases: Record<string, unknown> = {
-    tenant_id: item.tenantId,
-    organization_id: item.organizationId,
-    user_id: item.userId,
-    device_id: item.deviceId,
-    client_app_version: item.clientAppVersion,
-    os_version: item.osVersion,
-    push_provider: item.pushProvider,
-    push_token_updated_at: item.pushTokenUpdatedAt,
-    last_seen_at: item.lastSeenAt,
-    created_at: item.createdAt,
-    updated_at: item.updatedAt,
-  }
-  // The detail response never carried tenant/org, so an absent camelCase source must not grow a new
-  // key here — only keys the caller actually supplied get an alias.
-  for (const key of Object.keys(aliases)) {
-    if (aliases[key] === undefined) delete aliases[key]
-  }
-  return aliases
-}
-
-export type DeviceResponseItem = {
-  tenantId?: string | null
-  organizationId?: string | null
-  userId: string | null
-  deviceId: string | null
-  clientAppVersion: string | null
-  osVersion: string | null
-  pushProvider: string | null
-  pushTokenUpdatedAt?: string | null
-  lastSeenAt?: string | null
-  createdAt?: string | null
-  updatedAt: string | null
-}
-
-function toRecord(value: unknown): Record<string, unknown> {
-  return value && typeof value === 'object' && !Array.isArray(value) ? (value as Record<string, unknown>) : {}
-}
-
-function readString(record: Record<string, unknown>, snakeKey: string, camelKey: string): string | null {
-  const value = record[snakeKey] ?? record[camelKey]
-  return typeof value === 'string' ? value : null
-}
-
-export function toIso(value: unknown): string | null {
-  if (value instanceof Date) return Number.isNaN(value.getTime()) ? null : value.toISOString()
-  if (typeof value === 'string') {
-    const date = new Date(value)
-    return Number.isNaN(date.getTime()) ? value : date.toISOString()
-  }
-  return null
-}
-
-// In-code contract markers. The shared zodToJsonSchema converter does not currently emit per-property
-// descriptions for object schemas, so the rendered deprecation notice lives on the endpoint description
-// (`DEPRECATED_SNAKE_CASE_NOTICE` in ./openapi); these become visible for free if that changes.
-const deprecatedAlias = (of: string) => `Deprecated alias for \`${of}\`; removed in the next minor release.`
-
 export const deviceListItemSchema = z.object({
   id: z.string().uuid(),
-  tenantId: z.string().uuid(),
-  organizationId: z.string().uuid().nullable().optional(),
-  userId: z.string().uuid(),
-  deviceId: z.string(),
+  tenant_id: z.string().uuid(),
+  organization_id: z.string().uuid().nullable().optional(),
+  user_id: z.string().uuid(),
+  device_id: z.string(),
   platform: z.enum(['ios', 'android', 'web']),
-  clientAppVersion: z.string().nullable().optional(),
-  osVersion: z.string().nullable().optional(),
+  client_app_version: z.string().nullable().optional(),
+  os_version: z.string().nullable().optional(),
   locale: z.string().nullable().optional(),
-  pushProvider: z.string().nullable().optional(),
-  pushTokenUpdatedAt: z.string().nullable().optional(),
-  lastSeenAt: z.string().nullable().optional(),
-  createdAt: z.string().nullable().optional(),
-  updatedAt: z.string().nullable().optional(),
-  tenant_id: z.string().uuid().describe(deprecatedAlias('tenantId')),
-  organization_id: z.string().uuid().nullable().optional().describe(deprecatedAlias('organizationId')),
-  user_id: z.string().uuid().describe(deprecatedAlias('userId')),
-  device_id: z.string().describe(deprecatedAlias('deviceId')),
-  client_app_version: z.string().nullable().optional().describe(deprecatedAlias('clientAppVersion')),
-  os_version: z.string().nullable().optional().describe(deprecatedAlias('osVersion')),
-  push_provider: z.string().nullable().optional().describe(deprecatedAlias('pushProvider')),
-  push_token_updated_at: z.string().nullable().optional().describe(deprecatedAlias('pushTokenUpdatedAt')),
-  last_seen_at: z.string().nullable().optional().describe(deprecatedAlias('lastSeenAt')),
-  created_at: z.string().nullable().optional().describe(deprecatedAlias('createdAt')),
-  updated_at: z.string().nullable().optional().describe(deprecatedAlias('updatedAt')),
+  push_provider: z.string().nullable().optional(),
+  push_token_updated_at: z.string().nullable().optional(),
+  last_seen_at: z.string().nullable().optional(),
+  created_at: z.string().nullable().optional(),
+  updated_at: z.string().nullable().optional(),
 })

package/src/modules/devices/api/openapi.ts

@@ -12,18 +12,10 @@ export function createPagedListResponseSchema(itemSchema: ZodTypeAny) {
 
 // createCrudOpenApiFactory already falls back to the shared default create/ok response schemas
 // when omitted, so there is nothing module-specific to re-pass or re-export here.
-// The shared zodToJsonSchema converter does not emit per-property descriptions for object schemas, so
-// the `.describe()` markers on the deprecated keys in deviceList.ts never reach the document. State the
-// deprecation in the endpoint description, which does render (#5513).
-export const DEPRECATED_SNAKE_CASE_NOTICE =
-  'Response keys are camelCase. The snake_case keys (`user_id`, `device_id`, `last_seen_at`, …) are ' +
-  'deprecated aliases of their camelCase counterparts, retained for one minor version and removed in ' +
-  'the next; read `userId`, `deviceId`, `lastSeenAt`, … instead.'
-
 const buildDevicesCrudOpenApi = createCrudOpenApiFactory({
   defaultTag: 'Devices',
   makeListDescription: ({ pluralLower }) =>
-    `Returns the authenticated user's registered ${pluralLower} (admins may list across users). ${DEPRECATED_SNAKE_CASE_NOTICE}`,
+    `Returns the authenticated user's registered ${pluralLower} (admins may list across users).`,
 })
 
 export function createDevicesCrudOpenApi(options: CrudOpenApiOptions): OpenApiRouteDoc {

package/src/modules/devices/api/route.ts

@@ -20,13 +20,7 @@ import {
 } from '../data/validators'
 import { resolveDeviceActorUserId } from './auth'
 import { createDevicesCrudOpenApi, createPagedListResponseSchema } from './openapi'
-import {
-  deviceListSchema,
-  deviceListFields,
-  deviceListSortFieldMap,
-  deviceListItemSchema,
-  transformDeviceListItem,
-} from './deviceList'
+import { deviceListSchema, deviceListFields, deviceListSortFieldMap, deviceListItemSchema } from './deviceList'
 import { executeRegister, type DeviceMutationContext } from './deviceOps'
 
 const logger = createLogger('devices')
@@ -65,8 +59,6 @@ const crud = makeCrudRoute({
     // push_token is a secret and is never exposed via the list API.
     fields: deviceListFields,
     sortFieldMap: deviceListSortFieldMap,
-    // The query engine projects raw column names; expose them in camelCase like every other module.
-    transformItem: transformDeviceListItem,
     // Exports are off for the self-serve list. The factory enables them for every list that does not
     // declare `export` (resolveAvailableExportFormats falls back to csv/json/xml/markdown), and its
     // full-export branch replaces the filters with `{}` instead of calling `buildFilters`

package/src/modules/devices/backend/devices/[id]/page.tsx

@@ -12,13 +12,13 @@ import { useT } from '@open-mercato/shared/lib/i18n/context'
 
 type DeviceDetail = {
   id: string
-  userId: string
-  deviceId: string
+  user_id: string
+  device_id: string
   platform: string
-  clientAppVersion: string | null
-  osVersion: string | null
-  pushProvider: string | null
-  updatedAt: string | null
+  client_app_version: string | null
+  os_version: string | null
+  push_provider: string | null
+  updated_at: string | null
 }
 
 type FormValues = {
@@ -65,7 +65,7 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
   // Resolve the owner's display name for a link to their profile. Devices admins may not hold
   // auth.users.list, so fall back to the raw id (rendered without a link) instead of redirecting.
   React.useEffect(() => {
-    const userId = device?.userId
+    const userId = device?.user_id
     if (!userId) return
     let cancelled = false
     void (async () => {
@@ -80,7 +80,7 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
       if (label) setUserLabel(label)
     })()
     return () => { cancelled = true }
-  }, [device?.userId])
+  }, [device?.user_id])
 
   const fields = React.useMemo<CrudField[]>(() => [
     { id: 'clientAppVersion', label: t('devices.form.appVersion'), type: 'text' },
@@ -122,7 +122,7 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
             <dl className="grid grid-cols-1 gap-3 rounded-md border bg-muted p-4 text-sm sm:grid-cols-3">
               <div>
                 <dt className="text-xs font-medium text-muted-foreground">{t('devices.form.deviceId')}</dt>
-                <dd className="mt-1"><code className="text-xs">{device.deviceId}</code></dd>
+                <dd className="mt-1"><code className="text-xs">{device.device_id}</code></dd>
               </div>
               <div>
                 <dt className="text-xs font-medium text-muted-foreground">{t('devices.form.platform')}</dt>
@@ -131,20 +131,20 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
               <div>
                 <dt className="text-xs font-medium text-muted-foreground">{t('devices.form.userId')}</dt>
                 <dd className="mt-1">{userLabel ? (
-                  <Link href={`/backend/users/${encodeURIComponent(device.userId)}/edit`} className="text-primary hover:underline">{userLabel}</Link>
+                  <Link href={`/backend/users/${encodeURIComponent(device.user_id)}/edit`} className="text-primary hover:underline">{userLabel}</Link>
                 ) : (
-                  <code className="text-xs">{device.userId}</code>
+                  <code className="text-xs">{device.user_id}</code>
                 )}</dd>
               </div>
             </dl>
           )}
           fields={fields}
           groups={groups}
-          optimisticLockUpdatedAt={device.updatedAt}
+          optimisticLockUpdatedAt={device.updated_at}
           initialValues={{
-            clientAppVersion: device.clientAppVersion ?? '',
-            osVersion: device.osVersion ?? '',
-            pushProvider: device.pushProvider ?? '',
+            clientAppVersion: device.client_app_version ?? '',
+            osVersion: device.os_version ?? '',
+            pushProvider: device.push_provider ?? '',
           }}
           submitLabel={t('common.save')}
           cancelHref="/backend/devices"

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

@@ -15,15 +15,15 @@ import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar
 
 type Row = {
   id: string
-  userId: string
-  deviceId: string
+  user_id: string
+  device_id: string
   platform: string
-  clientAppVersion: string | null
-  osVersion: string | null
-  pushProvider: string | null
-  pushTokenUpdatedAt: string | null
-  lastSeenAt: string | null
-  createdAt: string | null
+  client_app_version: string | null
+  os_version: string | null
+  push_provider: string | null
+  push_token_updated_at: string | null
+  last_seen_at: string | null
+  created_at: string | null
 }
 
 type ResponsePayload = {
@@ -32,7 +32,6 @@ type ResponsePayload = {
   page?: number
   pageSize?: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDate(value: string | null, t: (key: string) => string) {
@@ -51,7 +50,6 @@ export default function DevicesAdminListPage() {
   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 [isLoading, setIsLoading] = React.useState(true)
   const [reloadToken, setReloadToken] = React.useState(0)
   const scopeVersion = useOrganizationScopeVersion()
@@ -140,7 +138,6 @@ export default function DevicesAdminListPage() {
           setRows(Array.isArray(payload.items) ? payload.items : [])
           setTotal(payload.total || 0)
           setTotalPages(payload.totalPages || 1)
-          setTotalIsCapped(payload?.totalIsCapped === true)
         }
       } catch (error) {
         if (!cancelled) {
@@ -184,16 +181,16 @@ export default function DevicesAdminListPage() {
 
   const columns = React.useMemo<ColumnDef<Row>[]>(() => [
     {
-      accessorKey: 'deviceId',
+      accessorKey: 'device_id',
       header: t('devices.list.columns.device'),
-      cell: ({ row }) => <code className="text-xs">{row.original.deviceId}</code>,
+      cell: ({ row }) => <code className="text-xs">{row.original.device_id}</code>,
     },
     { accessorKey: 'platform', header: t('devices.list.columns.platform') },
     {
-      accessorKey: 'userId',
+      accessorKey: 'user_id',
       header: t('devices.list.columns.user'),
       cell: ({ row }) => {
-        const userId = row.original.userId
+        const userId = row.original.user_id
         const label = userLabelById.get(userId)
         return (
           // Stop the click bubbling to the row, whose default action navigates to the device edit page.
@@ -208,24 +205,24 @@ export default function DevicesAdminListPage() {
       },
     },
     {
-      accessorKey: 'clientAppVersion',
+      accessorKey: 'client_app_version',
       header: t('devices.list.columns.appVersion'),
-      cell: ({ row }) => row.original.clientAppVersion || t('devices.list.noValue'),
+      cell: ({ row }) => row.original.client_app_version || t('devices.list.noValue'),
     },
     {
-      accessorKey: 'osVersion',
+      accessorKey: 'os_version',
       header: t('devices.list.columns.osVersion'),
-      cell: ({ row }) => row.original.osVersion || t('devices.list.noValue'),
+      cell: ({ row }) => row.original.os_version || t('devices.list.noValue'),
     },
     {
-      accessorKey: 'pushProvider',
+      accessorKey: 'push_provider',
       header: t('devices.list.columns.pushProvider'),
-      cell: ({ row }) => row.original.pushProvider || t('devices.list.noValue'),
+      cell: ({ row }) => row.original.push_provider || t('devices.list.noValue'),
     },
     {
-      accessorKey: 'lastSeenAt',
+      accessorKey: 'last_seen_at',
       header: t('devices.list.columns.lastSeen'),
-      cell: ({ row }) => formatDate(row.original.lastSeenAt, t),
+      cell: ({ row }) => formatDate(row.original.last_seen_at, t),
     },
   ], [t, userLabelById])
 
@@ -252,7 +249,7 @@ export default function DevicesAdminListPage() {
               { id: 'deactivate', label: t('devices.list.actions.deactivate'), destructive: true, onSelect: () => { void handleDeactivate(row) } },
             ]} />
           )}
-          pagination={{ page, pageSize: 50, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />
       </PageBody>

package/src/modules/directory/backend/directory/organizations/page.tsx

@@ -46,7 +46,6 @@ type OrganizationsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
   isSuperAdmin?: boolean
 }
 
@@ -180,7 +179,6 @@ export default function DirectoryOrganizationsPage() {
   }, [isSuperAdmin, t])
   const total = data?.total ?? 0
   const totalPages = data?.totalPages ?? 0
-  const totalIsCapped = data?.totalIsCapped === true
 
   const deleteMutationContextId = 'directory-organizations-list:single-delete'
   const { runMutation: runDeleteMutation, retryLastMutation: retryDeleteMutation } = useGuardedMutation<{
@@ -292,7 +290,7 @@ export default function DirectoryOrganizationsPage() {
               createLabel={t('directory.organizations.list.actions.create', 'Create')}
             />
           )}
-          pagination={{ page, pageSize: 50, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 50, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />
       </PageBody>

package/src/modules/directory/backend/directory/tenants/page.tsx

@@ -35,7 +35,6 @@ type TenantsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 
@@ -120,7 +119,6 @@ export default function DirectoryTenantsPage() {
   const rows = data?.items ?? []
   const total = data?.total ?? 0
   const totalPages = data?.totalPages ?? 0
-  const totalIsCapped = data?.totalIsCapped === true
 
   const deleteMutationContextId = 'directory-tenants-list:single-delete'
   const { runMutation: runDeleteMutation, retryLastMutation: retryDeleteMutation } = useGuardedMutation<{
@@ -215,7 +213,7 @@ export default function DirectoryTenantsPage() {
               createLabel={t('directory.tenants.list.actions.create', 'Create')}
             />
           )}
-          pagination={{ page, pageSize: 20, total, totalPages, totalIsCapped, onPageChange: setPage }}
+          pagination={{ page, pageSize: 20, total, totalPages, onPageChange: setPage }}
           isLoading={isLoading}
         />
       </PageBody>

package/src/modules/directory/di.ts

@@ -1,18 +1,6 @@
-import { asClass, asFunction } from 'awilix'
-import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AppContainer } from '@open-mercato/shared/lib/di/container'
-import { DefaultOrganizationScopeService } from './services/organizationScopeService'
-import { DefaultOrganizationHierarchyService } from './services/organizationHierarchyService'
-
-type OrganizationScopeRbac = ConstructorParameters<typeof DefaultOrganizationScopeService>[1]
 
 export function register(container: AppContainer) {
-  container.register({
-    organizationHierarchyService: asClass(DefaultOrganizationHierarchyService).scoped(),
-    organizationScopeService: asFunction((cradle: { em: EntityManager; rbacService: OrganizationScopeRbac }) =>
-      new DefaultOrganizationScopeService(cradle.em, cradle.rbacService, container),
-    )
-      .scoped()
-      .proxy(),
-  })
+  // Directory module has no services yet; placeholder for future overrides
 }
+

package/src/modules/directory/utils/organizationScope.ts

@@ -5,7 +5,6 @@ import { Organization } from '@open-mercato/core/modules/directory/data/entities
 import { isAllOrganizationsSelection } from '@open-mercato/core/modules/directory/constants'
 import type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
-import type { OrganizationScope } from '@open-mercato/shared/lib/auth/principal-service'
 import { getCurrentCacheTenant, runWithCacheTenant, type CacheStrategy } from '@open-mercato/cache'
 import { parseSelectedOrganizationCookie, parseSelectedTenantCookie } from './scopeCookies'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -14,7 +13,19 @@ const logger = createLogger('directory').child({ component: 'org-scope-cache' })
 
 export { parseSelectedOrganizationCookie, parseSelectedTenantCookie }
 
-export type { OrganizationScope }
+export type OrganizationScope = {
+  selectedId: string | null
+  filterIds: string[] | null
+  allowedIds: string[] | null
+  tenantId: string | null
+  // True when the caller explicitly selected a concrete organization (cookie /
+  // selectedId param) that could not be honored — it does not exist for the
+  // tenant or is not accessible. Reads degrade gracefully (filterIds/selectedId
+  // fall back to the caller's accessible orgs), but writes MUST fail loudly on
+  // this so a record never lands under an org the caller did not intend. Absent
+  // (undefined) means the selection — if any — was honored.
+  selectionRejected?: boolean
+}
 
 // Phase 4 — short-TTL cache for resolveOrganizationScopeForRequest.
 // OrganizationScope is a pure function of (userId, tenantId, selectedOrgId,
@@ -238,8 +249,8 @@ export async function resolveOrganizationScope({
   tenantId: tenantIdOverride,
 }: {
   em: EntityManager
-  rbac: Pick<RbacService, 'loadAcl'>
-  auth: AuthContext | null | undefined
+  rbac: RbacService
+  auth: AuthContext
   selectedId?: string | null
   tenantId?: string | null
 }): Promise<OrganizationScope> {

package/src/modules/entities/api/records.ts

@@ -148,7 +148,6 @@ const listRecordsResponseSchema = z.object({
   page: z.number(),
   pageSize: z.number(),
   totalPages: z.number(),
-  totalIsCapped: z.boolean().optional(),
 })
 
 export async function GET(req: Request) {
@@ -329,7 +328,6 @@ export async function GET(req: Request) {
       page: res.page || page,
       pageSize: effectivePageSize,
       totalPages: Math.ceil(total / (effectivePageSize || 1)),
-      ...(res.meta?.listCountCapWarning ? { totalIsCapped: true } : {}),
     }
 
     if (requestedExport) {

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -36,7 +36,6 @@ type RecordsResponse = {
   page: number
   pageSize: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function toCsvUrl(base: string, params: URLSearchParams) {
@@ -88,7 +87,6 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
   const [rawData, setRawData] = React.useState<any[]>([])
   const [total, setTotal] = React.useState(0)
   const [totalPages, setTotalPages] = React.useState(1)
-  const [totalIsCapped, setTotalIsCapped] = React.useState(false)
   const [loading, setLoading] = React.useState(false)
   const scopeVersion = useOrganizationScopeVersion()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
@@ -172,7 +170,6 @@ function RecordsPageInner({ params }: { params: { entityId?: string } }) {
           setRawData(j.items || [])
           setTotal(j.total)
           setTotalPages(j.totalPages)
-          setTotalIsCapped(j?.totalIsCapped === true)
         }
       } catch (e) {
         if (!cancelled) {
@@ -470,7 +467,7 @@ export RECORD_ID="<record uuid>"`}</code></pre>
             onSearchChange={(v) => { setSearch(v); setPage(1) }}
             onFiltersApply={(vals) => { setFilterValues(vals); setPage(1) }}
             onFiltersClear={() => { setFilterValues({}); setPage(1) }}
-            pagination={{ page, pageSize, total, totalPages, totalIsCapped, onPageChange: setPage }}
+            pagination={{ page, pageSize, total, totalPages, onPageChange: setPage }}
             isLoading={loading}
           />
         </RelationDisplaysProvider>

package/src/modules/eudr/api/plots/route.ts

@@ -159,10 +159,6 @@ const crud = makeCrudRoute({
       name: 'name',
       area_ha: 'area_ha',
       areaHa: 'area_ha',
-      origin_country: 'origin_country',
-      originCountry: 'origin_country',
-      plot_type: 'plot_type',
-      plotType: 'plot_type',
     },
     buildFilters,
     transformItem: transformPlotItem,

package/src/modules/eudr/backend/eudr/evidence-submissions/[id]/page.meta.ts

@@ -7,6 +7,8 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Evidence submissions', labelKey: 'eudr.nav.submissions', href: '/backend/eudr/evidence-submissions' },
+    { label: 'Edit evidence submission', labelKey: 'eudr.evidenceSubmissions.edit.title' },
   ],
 }

package/src/modules/eudr/backend/eudr/evidence-submissions/create/page.meta.ts

@@ -7,6 +7,7 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Evidence submissions', labelKey: 'eudr.nav.submissions', href: '/backend/eudr/evidence-submissions' },
     { label: 'Create', labelKey: 'eudr.evidenceSubmissions.create.title' },
   ],

package/src/modules/eudr/backend/eudr/evidence-submissions/page.meta.ts

@@ -8,5 +8,8 @@ export const metadata = {
   pagePriority: 10,
   pageOrder: 20,
   icon: 'files',
-  breadcrumb: [{ label: 'Evidence submissions', labelKey: 'eudr.nav.submissions' }],
+  breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
+    { label: 'Evidence submissions', labelKey: 'eudr.nav.submissions' },
+  ],
 }

package/src/modules/eudr/backend/eudr/evidence-submissions/page.tsx

@@ -54,7 +54,6 @@ type EvidenceSubmissionsResponse = {
   items: EvidenceSubmissionRow[]
   total: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDateTime(value: string | null | undefined, emptyLabel: string, locale: string): string {
@@ -93,7 +92,6 @@ export default function EudrEvidenceSubmissionsPage() {
   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 [search, setSearch] = React.useState('')
   const [sorting, setSorting] = React.useState<SortingState>([])
   const [filters, setFilters] = React.useState<FilterValues>({})
@@ -149,7 +147,6 @@ export default function EudrEvidenceSubmissionsPage() {
         setRows(Array.isArray(payload.items) ? payload.items : [])
         setTotal(typeof payload.total === 'number' ? payload.total : 0)
         setTotalPages(typeof payload.totalPages === 'number' ? payload.totalPages : 1)
-        setTotalIsCapped(payload?.totalIsCapped === true)
       } catch {
         if (!cancelled) flash(translate('eudr.evidenceSubmissions.list.loadError'), 'error')
       } finally {
@@ -364,7 +361,6 @@ export default function EudrEvidenceSubmissionsPage() {
             pageSize,
             total,
             totalPages,
-            totalIsCapped,
             onPageChange: setPage,
             pageSizeOptions: [20, 50, 100],
             onPageSizeChange: (nextPageSize) => {

package/src/modules/eudr/backend/eudr/page.meta.ts

@@ -1,12 +1,12 @@
 export const metadata = {
   requireAuth: true,
   requireFeatures: ['eudr.statements.view'],
-  pageTitle: 'Overview',
+  pageTitle: 'EUDR Overview',
   pageTitleKey: 'eudr.nav.overview',
   pageGroup: 'Compliance',
   pageGroupKey: 'eudr.nav.group',
   pagePriority: 10,
   pageOrder: 5,
   icon: 'gauge',
-  breadcrumb: [{ label: 'Overview', labelKey: 'eudr.nav.overview' }],
+  breadcrumb: [{ label: 'EUDR Overview', labelKey: 'eudr.nav.overview' }],
 }

package/src/modules/eudr/backend/eudr/plots/[id]/page.meta.ts

@@ -7,6 +7,8 @@ export const metadata = {
   pageGroupKey: 'eudr.nav.group',
   navHidden: true,
   breadcrumb: [
+    { label: 'EUDR', labelKey: 'eudr.nav.module', href: '/backend/eudr' },
     { label: 'Plots', labelKey: 'eudr.nav.plots', href: '/backend/eudr/plots' },
+    { label: 'Edit plot', labelKey: 'eudr.plots.edit.title' },
   ],
 }