@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 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

@@ -9,17 +9,16 @@ import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { LoadingMessage, ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { useDeviceUserLabels } from '../useDeviceUserLabels'
 
 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 = {
@@ -36,6 +35,7 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [notFound, setNotFound] = React.useState(false)
+  const [userLabel, setUserLabel] = React.useState<string | null>(null)
 
   React.useEffect(() => {
     let cancelled = false
@@ -63,10 +63,24 @@ export default function DeviceAdminEditPage({ params }: { params?: { id?: string
   }, [id, t])
 
   // Resolve the owner's display name for a link to their profile. Devices admins may not hold
-  // auth.users.list, so this falls back to the raw id (rendered without a link) instead of redirecting.
-  const ownerIds = React.useMemo(() => [device?.userId], [device?.userId])
-  const userLabels = useDeviceUserLabels(ownerIds)
-  const userLabel = device?.userId ? userLabels[device.userId] ?? null : null
+  // auth.users.list, so fall back to the raw id (rendered without a link) instead of redirecting.
+  React.useEffect(() => {
+    const userId = device?.user_id
+    if (!userId) return
+    let cancelled = false
+    void (async () => {
+      const call = await apiCall<{ items?: { id: string; name?: string | null; email?: string | null }[] }>(
+        `/api/auth/users?id=${encodeURIComponent(userId)}`,
+        { headers: { 'x-om-forbidden-redirect': '0' } },
+        { fallback: null },
+      ).catch(() => null)
+      if (cancelled || !call || !call.ok) return
+      const found = call.result?.items?.find((u) => u.id === userId)
+      const label = found?.name?.trim() || found?.email?.trim() || null
+      if (label) setUserLabel(label)
+    })()
+    return () => { cancelled = true }
+  }, [device?.user_id])
 
   const fields = React.useMemo<CrudField[]>(() => [
     { id: 'clientAppVersion', label: t('devices.form.appVersion'), type: 'text' },
@@ -108,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>
@@ -117,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/create/page.tsx

@@ -6,7 +6,6 @@ import { CrudForm, type CrudField, type CrudFormGroup } from '@open-mercato/ui/b
 import { createCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { loadDeviceUserOptions } from '../userOptions'
 
 type FormValues = {
   userId: string
@@ -28,22 +27,7 @@ export default function DeviceAdminCreatePage() {
   const t = useT()
 
   const fields = React.useMemo<CrudField[]>(() => [
-    {
-      id: 'userId',
-      label: t('devices.form.userId'),
-      type: 'combobox',
-      required: true,
-      description: t('devices.form.userIdHint'),
-      placeholder: t('devices.form.userIdPlaceholder'),
-      loadOptions: loadDeviceUserOptions,
-      // The owner must resolve to a real directory entry: `ComboboxInput` reverts anything that is
-      // not a known option on blur, so free text and an id belonging to nobody never reach submit.
-      // (A raw id that IS a known option still resolves — `findOptionForInput` matches on value, and
-      // `CrudForm` keeps the unfiltered first page as suggestions — which is a real user either way.)
-      // `devices.admin` declares `dependsOn: ['auth.users.list']` in `acl.ts`, so a role that can
-      // reach this form can also search the directory that fills the picker.
-      allowCustomValues: false,
-    },
+    { id: 'userId', label: t('devices.form.userId'), type: 'text', required: true, description: t('devices.form.userIdHint') },
     { id: 'deviceId', label: t('devices.form.deviceId'), type: 'text', required: true },
     {
       id: 'platform',

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

@@ -12,20 +12,18 @@ import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/u
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
-import { loadDeviceUserOptions, type DeviceUserOption } from './userOptions'
-import { useDeviceUserLabels } from './useDeviceUserLabels'
 
 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 = {
@@ -34,7 +32,6 @@ type ResponsePayload = {
   page?: number
   pageSize?: number
   totalPages: number
-  totalIsCapped?: boolean
 }
 
 function formatDate(value: string | null, t: (key: string) => string) {
@@ -53,44 +50,49 @@ 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()
   const t = useT()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [filterValues, setFilterValues] = React.useState<FilterValues>({})
-  const [userOptions, setUserOptions] = React.useState<DeviceUserOption[]>([])
+  const [userOptions, setUserOptions] = React.useState<{ value: string; label: string; description?: string | null }[]>([])
 
-  const mergeUserOptions = React.useCallback((next: DeviceUserOption[]) => {
-    if (next.length === 0) return
+  // Devices admins may not hold auth.users.list; degrade gracefully (no options) instead of redirecting.
+  const loadUserOptions = React.useCallback(async (query?: string) => {
+    const params = new URLSearchParams()
+    params.set('page', '1')
+    params.set('pageSize', '20')
+    if (query && query.trim().length > 0) params.set('search', query.trim())
+    const call = await apiCall<{ items?: { id: string; name?: string | null; email?: string | null }[] }>(
+      `/api/auth/users?${params.toString()}`,
+      { headers: { 'x-om-forbidden-redirect': '0' } },
+      { fallback: null },
+    ).catch(() => null)
+    if (!call || !call.ok) return []
+    const next = (call.result?.items ?? []).flatMap((item) => {
+      if (!item || typeof item.id !== 'string' || !item.id.trim()) return []
+      const name = typeof item.name === 'string' && item.name.trim() ? item.name.trim() : null
+      const email = typeof item.email === 'string' && item.email.trim() ? item.email.trim() : null
+      const label = name ?? email ?? item.id
+      return [{ value: item.id, label, description: email && email !== label ? email : null }]
+    })
     setUserOptions((prev) => {
       const map = new Map(prev.map((opt) => [opt.value, opt]))
       for (const opt of next) map.set(opt.value, opt)
       return Array.from(map.values())
     })
-  }, [])
-
-  // Devices admins may not hold auth.users.list; the helper degrades to no options instead of
-  // redirecting the whole page to /login.
-  const loadUserOptions = React.useCallback(async (query?: string) => {
-    const next = await loadDeviceUserOptions(query)
-    mergeUserOptions(next)
     return next
-  }, [mergeUserOptions])
+  }, [])
 
   React.useEffect(() => { void loadUserOptions() }, [loadUserOptions, scopeVersion])
 
+  // Reuse the picker cache to label the User column; rows whose owner isn't cached still link by id.
   const userLabelById = React.useMemo(
     () => new Map(userOptions.map((opt) => [opt.value, opt.label])),
     [userOptions],
   )
 
-  // The picker only ever caches the users it happened to prefetch, so resolve the owners of the rows
-  // actually on this page. Without it most rows render a bare UUID.
-  const rowUserIds = React.useMemo(() => rows.map((row) => row.userId), [rows])
-  const resolvedUserLabels = useDeviceUserLabels(rowUserIds)
-
   const filters = React.useMemo<FilterDef[]>(() => [
     {
       id: 'platform',
@@ -136,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) {
@@ -180,17 +181,17 @@ 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 label = resolvedUserLabels[userId] ?? userLabelById.get(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.
           <Link
@@ -204,26 +205,26 @@ 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, resolvedUserLabels])
+  ], [t, userLabelById])
 
   return (
     <Page>
@@ -248,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/devices/i18n/de.json

@@ -23,9 +23,8 @@
   "devices.form.pushTokenHint": "Optional. Sicher gespeichert und nie wieder angezeigt.",
   "devices.form.success.created": "Gerät registriert",
   "devices.form.success.updated": "Gerät aktualisiert",
-  "devices.form.userId": "Benutzer",
-  "devices.form.userIdHint": "Namen oder E-Mail eingeben und den Besitzer aus der Liste auswählen.",
-  "devices.form.userIdPlaceholder": "Benutzer suchen",
+  "devices.form.userId": "Benutzer-ID",
+  "devices.form.userIdHint": "UUID des Benutzers, dem dieses Gerät gehört.",
   "devices.list.actions.deactivate": "Deaktivieren",
   "devices.list.actions.edit": "Bearbeiten",
   "devices.list.actions.register": "Gerät registrieren",

package/src/modules/devices/i18n/en.json

@@ -23,9 +23,8 @@
   "devices.form.pushTokenHint": "Optional. Stored securely and never shown again.",
   "devices.form.success.created": "Device registered",
   "devices.form.success.updated": "Device updated",
-  "devices.form.userId": "User",
-  "devices.form.userIdHint": "Start typing a name or email, then pick the owner from the list.",
-  "devices.form.userIdPlaceholder": "Search users",
+  "devices.form.userId": "User ID",
+  "devices.form.userIdHint": "UUID of the user who owns this device.",
   "devices.list.actions.deactivate": "Deactivate",
   "devices.list.actions.edit": "Edit",
   "devices.list.actions.register": "Register device",

package/src/modules/devices/i18n/es.json

@@ -23,9 +23,8 @@
   "devices.form.pushTokenHint": "Opcional. Se almacena de forma segura y no se vuelve a mostrar.",
   "devices.form.success.created": "Dispositivo registrado",
   "devices.form.success.updated": "Dispositivo actualizado",
-  "devices.form.userId": "Usuario",
-  "devices.form.userIdHint": "Empieza a escribir un nombre o correo electrónico y elige el propietario de la lista.",
-  "devices.form.userIdPlaceholder": "Buscar usuarios",
+  "devices.form.userId": "ID de usuario",
+  "devices.form.userIdHint": "UUID del usuario propietario de este dispositivo.",
   "devices.list.actions.deactivate": "Desactivar",
   "devices.list.actions.edit": "Editar",
   "devices.list.actions.register": "Registrar dispositivo",

package/src/modules/devices/i18n/ko.json

@@ -23,9 +23,8 @@
   "devices.form.pushTokenHint": "선택 사항입니다. 안전하게 저장되며 다시 표시되지 않습니다.",
   "devices.form.success.created": "기기가 등록되었습니다",
   "devices.form.success.updated": "기기가 수정되었습니다",
-  "devices.form.userId": "사용자",
-  "devices.form.userIdHint": "이름 또는 이메일을 입력한 다음 목록에서 소유자를 선택하세요.",
-  "devices.form.userIdPlaceholder": "사용자 검색",
+  "devices.form.userId": "사용자 ID",
+  "devices.form.userIdHint": "이 기기를 소유한 사용자의 UUID입니다.",
   "devices.list.actions.deactivate": "비활성화",
   "devices.list.actions.edit": "수정",
   "devices.list.actions.register": "기기 등록",

package/src/modules/devices/i18n/pl.json

@@ -23,9 +23,8 @@
   "devices.form.pushTokenHint": "Opcjonalne. Token jest przechowywany bezpiecznie i nigdy więcej niewyświetlany.",
   "devices.form.success.created": "Urządzenie zarejestrowane",
   "devices.form.success.updated": "Urządzenie zaktualizowane",
-  "devices.form.userId": "Użytkownik",
-  "devices.form.userIdHint": "Zacznij wpisywać nazwę lub e-mail, a następnie wybierz właściciela z listy.",
-  "devices.form.userIdPlaceholder": "Szukaj użytkowników",
+  "devices.form.userId": "ID użytkownika",
+  "devices.form.userIdHint": "UUID użytkownika, do którego należy to urządzenie.",
   "devices.list.actions.deactivate": "Dezaktywuj",
   "devices.list.actions.edit": "Edytuj",
   "devices.list.actions.register": "Zarejestruj urządzenie",

package/src/modules/devices/setup.ts

@@ -2,12 +2,8 @@ import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'
 
 export const setup: ModuleSetupConfig = {
   defaultRoleFeatures: {
-    // `auth.users.list` is granted alongside `devices.admin` rather than left to the auth module's
-    // own `admin: ['auth.*']`, so the dependency declared in `acl.ts` holds even where that grant
-    // was narrowed. Without it the owner picker has nothing to offer and the register form cannot
-    // be completed. Existing tenants pick this up via `yarn mercato auth sync-role-acls`.
-    superadmin: ['devices.*', 'auth.users.list'],
-    admin: ['devices.*', 'auth.users.list'],
+    superadmin: ['devices.*'],
+    admin: ['devices.*'],
     employee: ['devices.view', 'devices.manage'],
   },
 }

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>