@open-mercato/core 0.6.7-develop.6622.1.4d29ddaca4 → 0.6.7-develop.6628.1.f9e4ecf70f

package/src/modules/audit_logs/api/audit-logs/access/route.ts

@@ -109,18 +109,26 @@ export async function GET(req: Request) {
     actorUserId = actorQuery
   }
 
-  const list = await accessLogs.list({
-    tenantId: auth.tenantId ?? undefined,
-    organizationId: organizationId ?? undefined,
-    actorUserId,
-    resourceKind: resourceKind ?? undefined,
-    accessType: accessType ?? undefined,
-    page,
-    pageSize,
-    limit: url.searchParams.get('limit') ? parseNumber(url.searchParams.get('limit'), { min: 1, max: 200, fallback: pageSize }) : undefined,
-    before,
-    after,
-  })
+  let list: Awaited<ReturnType<AccessLogService['list']>>
+  try {
+    list = await accessLogs.list({
+      tenantId: auth.tenantId ?? undefined,
+      organizationId: organizationId ?? undefined,
+      actorUserId,
+      resourceKind: resourceKind ?? undefined,
+      accessType: accessType ?? undefined,
+      page,
+      pageSize,
+      limit: url.searchParams.get('limit') ? parseNumber(url.searchParams.get('limit'), { min: 1, max: 200, fallback: pageSize }) : undefined,
+      before,
+      after,
+    })
+  } catch (err) {
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 })
+    }
+    throw err
+  }
 
   const displayMaps = await loadAuditLogDisplayMaps(em, {
     userIds: list.items.map((entry) => entry.actorUserId).filter((value): value is string => !!value),

package/src/modules/audit_logs/api/audit-logs/actions/export/route.ts

@@ -158,23 +158,31 @@ export async function GET(req: Request) {
     }
   }
 
-  const entriesResult = await actionLogs.list({
-    tenantId: auth.tenantId ?? undefined,
-    organizationId: organizationId ?? undefined,
-    actorUserId,
-    actorUserIds,
-    resourceKind,
-    resourceId,
-    actionTypes,
-    fieldNames,
-    includeRelated,
-    undoableOnly,
-    sortField,
-    sortDir,
-    limit,
-    before,
-    after,
-  })
+  let entriesResult: Awaited<ReturnType<ActionLogService['list']>>
+  try {
+    entriesResult = await actionLogs.list({
+      tenantId: auth.tenantId ?? undefined,
+      organizationId: organizationId ?? undefined,
+      actorUserId,
+      actorUserIds,
+      resourceKind,
+      resourceId,
+      actionTypes,
+      fieldNames,
+      includeRelated,
+      undoableOnly,
+      sortField,
+      sortDir,
+      limit,
+      before,
+      after,
+    })
+  } catch (err) {
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 })
+    }
+    throw err
+  }
   const entries = entriesResult.items
 
   const displayMaps = await loadAuditLogDisplayMaps(em, {

package/src/modules/audit_logs/api/audit-logs/actions/route.ts

@@ -226,7 +226,15 @@ export async function GET(req: Request) {
   // includeTotal flag is retained for backward compatibility but page-based pagination
   // always returns total/totalPages from the list query's findAndCount.
   void includeTotal
-  const list = await actionLogs.list(listQuery)
+  let list: Awaited<ReturnType<ActionLogService['list']>>
+  try {
+    list = await actionLogs.list(listQuery)
+  } catch (err) {
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 })
+    }
+    throw err
+  }
 
   const displayMaps = await loadAuditLogDisplayMaps(em, {
     userIds: list.items.map((entry: any) => entry.actorUserId).filter((value: any): value is string => !!value),

package/src/modules/customers/api/dictionaries/[kind]/route.ts

@@ -22,6 +22,7 @@ import {
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE } from '../../../lib/dictionaries'
 
 const logger = createLogger('customers')
 
@@ -55,7 +56,10 @@ export async function GET(req: Request, ctx: { params?: { kind?: string } }) {
     })
     const { kind, mappedKind } = mapDictionaryKind(ctx.params?.kind)
     if (!organizationId) {
-      throw new CrudHttpError(400, { error: translate('customers.errors.organization_required', 'Organization context is required') })
+      throw new CrudHttpError(400, {
+        error: translate('customers.errors.organization_required', 'Organization context is required'),
+        code: CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE,
+      })
     }
     const settings = await loadCustomerSettings(em, { tenantId, organizationId })
     const sortMode = resolveDictionaryEntrySortMode(settings?.dictionarySortModes?.[kind])
@@ -292,6 +296,7 @@ const dictionaryListResponseSchema = z.object({
 
 const dictionaryErrorSchema = z.object({
   error: z.string(),
+  code: z.string().optional(),
 })
 
 export const openApi: OpenApiRouteDoc = {

package/src/modules/customers/components/formConfig.tsx

@@ -40,6 +40,7 @@ import type {
 } from '@open-mercato/ui/backend/CrudForm'
 import {
   DictionaryEntrySelect,
+  DictionaryOptionsUnavailableError,
   type DictionarySelectLabels,
 } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
 import { RolesSection } from './detail/RolesSection'
@@ -53,6 +54,7 @@ import {
 } from './detail/hooks/useCustomerDictionary'
 import {
   CUSTOMER_DICTIONARIES_MANAGE_HREF,
+  CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE,
   getCustomerDictionaryManageHref,
   type CustomerDictionaryKind,
 } from '../lib/dictionaries'
@@ -188,14 +190,30 @@ export function DictionarySelectField({
   )
 
   const fetchOptions = React.useCallback(async () => {
-    const data = await ensureCustomerDictionary(queryClient, kind, scopeVersion)
-    return data.entries.map((entry) => ({
-      value: entry.value,
-      label: entry.label,
-      color: entry.color ?? null,
-      icon: entry.icon ?? null,
-    }))
-  }, [kind, queryClient, scopeVersion])
+    try {
+      const data = await ensureCustomerDictionary(queryClient, kind, scopeVersion)
+      return data.entries.map((entry) => ({
+        value: entry.value,
+        label: entry.label,
+        color: entry.color ?? null,
+        icon: entry.icon ?? null,
+      }))
+    } catch (err) {
+      const responseError = err as { status?: unknown; code?: unknown } | null
+      if (
+        responseError?.status === 400 &&
+        responseError.code === CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE
+      ) {
+        const serverMessage = err instanceof Error ? err.message.trim() : ''
+        throw new DictionaryOptionsUnavailableError(
+          serverMessage.length
+            ? serverMessage
+            : translate('customers.errors.organization_required', 'Organization context is required'),
+        )
+      }
+      throw err
+    }
+  }, [kind, queryClient, scopeVersion, translate])
 
   const createOption = React.useCallback(
     async (input: { value: string; label?: string; color?: string | null; icon?: string | null }) => {

package/src/modules/customers/lib/dictionaries.ts

@@ -32,6 +32,7 @@ export type CustomerDictionaryDisplayEntry = DictionaryDisplayEntry
 export type CustomerDictionaryMap = DictionaryMap
 
 export const CUSTOMER_DICTIONARIES_MANAGE_HREF = '/backend/config/customers'
+export const CUSTOMER_DICTIONARY_ORGANIZATION_REQUIRED_CODE = 'customer_dictionary_organization_required'
 
 export function getCustomerDictionarySettingsSectionId(kind: CustomerDictionaryKind) {
   return `customer-dictionary-${kind}`

package/src/modules/dictionaries/components/DictionaryEntrySelect.tsx

@@ -31,6 +31,13 @@ import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('dictionaries').child({ component: 'DictionaryEntrySelect' })
 
+export class DictionaryOptionsUnavailableError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = 'DictionaryOptionsUnavailableError'
+  }
+}
+
 const DEFAULT_APPEARANCE_LABELS: AppearanceSelectorLabels = {
   colorLabel: 'Color',
   colorHelp: 'Pick a highlight color for this entry.',
@@ -117,6 +124,7 @@ export function DictionaryEntrySelect({
   sortOptions = 'label_asc',
   showActiveAppearance = true,
 }: DictionaryEntrySelectProps) {
+  const unavailableMessageId = React.useId()
   const pathname = usePathname()
   const searchParams = useSearchParams()
   const [options, setOptions] = React.useState<DictionaryOption[]>([])
@@ -126,17 +134,24 @@ export function DictionaryEntrySelect({
   const [newValue, setNewValue] = React.useState('')
   const [newLabel, setNewLabel] = React.useState('')
   const [formError, setFormError] = React.useState<string | null>(null)
+  const [unavailableMessage, setUnavailableMessage] = React.useState<string | null>(null)
   const appearance = useAppearanceState(null, null)
 
   const loadOptions = React.useCallback(async () => {
     setLoading(true)
+    setUnavailableMessage(null)
     try {
       const items = await fetchOptions()
       setOptions(sortOptions === 'none' ? items : items.slice().sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: 'base' })))
     } catch (err) {
-      logger.error('Failed to fetch options', { err })
-      flash(labels.errorLoad, 'error')
-      setOptions([])
+      if (err instanceof DictionaryOptionsUnavailableError) {
+        setUnavailableMessage(err.message)
+        setOptions([])
+      } else {
+        logger.error('Failed to fetch options', { err })
+        flash(labels.errorLoad, 'error')
+        setOptions([])
+      }
     } finally {
       setLoading(false)
     }
@@ -276,7 +291,7 @@ export function DictionaryEntrySelect({
     return '⌘/Ctrl + Enter'
   }, [labels.saveShortcutHint])
 
-  const disabled = disabledProp || loading || saving
+  const disabled = disabledProp || loading || saving || unavailableMessage !== null
   const manageLink = manageHref ?? '/backend/config/dictionaries'
   const returnTo = React.useMemo(() => {
     const query = searchParams?.toString() ?? ''
@@ -294,6 +309,11 @@ export function DictionaryEntrySelect({
 
   return (
     <div className="space-y-2">
+      {unavailableMessage ? (
+        <p id={unavailableMessageId} className="text-xs text-muted-foreground">
+          {unavailableMessage}
+        </p>
+      ) : null}
       <div className="flex items-center gap-2">
         <Select
           key={`dictionary-entry:${value ?? ''}:${optionsKey}`}
@@ -306,6 +326,7 @@ export function DictionaryEntrySelect({
         >
           <SelectTrigger
             id={id}
+            aria-describedby={unavailableMessage ? unavailableMessageId : undefined}
             className={selectClassName}
             title={activeOption?.label ?? undefined}
           >

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

@@ -18,7 +18,7 @@ import { loadGeneratedFieldRegistrations } from '@open-mercato/ui/backend/fields
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { createCrudFormError, raiseCrudError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { FieldDefinitionsEditor, type FieldDefinition, type FieldDefinitionError } from '@open-mercato/ui/backend/custom-fields/FieldDefinitionsEditor'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, type TranslateFn } from '@open-mercato/shared/lib/i18n/context'
 import {
   Dialog,
   DialogContent,
@@ -506,7 +506,15 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
   const definitionsGroup: CrudFormGroup = { id: 'definitions', title: t('entities.userEntities.edit.groups.definitions', 'Field Definitions'), column: 1, component: renderFieldDefinitions }
 
   const groups: CrudFormGroup[] = [
-    { id: 'settings', title: t('entities.userEntities.edit.groups.settings', 'Entity Settings'), column: 1, fields: entitySource === 'custom' ? ['label','description','defaultEditor','showInSidebar','accessRestricted'] : ['label','description','defaultEditor'] },
+    {
+      id: 'settings',
+      title: t('entities.userEntities.edit.groups.settings', 'Entity Settings'),
+      column: 1,
+      description: getEntitySettingsNotice(entitySource, t),
+      fields: entitySource === 'custom'
+        ? ['label', 'description', 'defaultEditor', 'showInSidebar', 'accessRestricted']
+        : ['label', 'description', 'defaultEditor'],
+    },
     definitionsGroup,
   ]
 
@@ -657,6 +665,15 @@ export function shouldRegisterEntityMetadata(entitySource: EntitySource): boolea
   return entitySource === 'custom'
 }
 
+const SYSTEM_ENTITY_SETTINGS_NOTICE_FALLBACK =
+  'This is a system entity defined in code. Its label and description are managed in code and cannot be edited here — only the field definitions below are editable.'
+
+export function getEntitySettingsNotice(entitySource: EntitySource, t: TranslateFn): string | undefined {
+  return shouldRegisterEntityMetadata(entitySource)
+    ? undefined
+    : t('entities.userEntities.form.systemEntityNotice', SYSTEM_ENTITY_SETTINGS_NOTICE_FALLBACK)
+}
+
 export function buildDefinitionsBatchPayload(options: {
   entityId: string
   defs: Array<Pick<Def, 'key' | 'kind' | 'configJson' | 'isActive'>>

package/src/modules/entities/i18n/de.json

@@ -237,6 +237,7 @@
   "entities.userEntities.form.loading": "Wird geladen…",
   "entities.userEntities.form.showInSidebar.label": "In der Seitenleiste anzeigen",
   "entities.userEntities.form.submit": "Erstellen",
+  "entities.userEntities.form.systemEntityNotice": "Dies ist eine im Code definierte Systementität. Ihr Label und ihre Beschreibung werden im Code verwaltet und können hier nicht bearbeitet werden — nur die Felddefinitionen unten sind bearbeitbar.",
   "entities.userEntities.form.title": "Entität erstellen",
   "entities.userEntities.records.errors.deleteFailed": "Datensatz konnte nicht gelöscht werden",
   "entities.userEntities.records.errors.entityIdRequired": "Entitätskennung ist erforderlich",

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

@@ -237,6 +237,7 @@
   "entities.userEntities.form.loading": "Loading…",
   "entities.userEntities.form.showInSidebar.label": "Show in sidebar",
   "entities.userEntities.form.submit": "Create",
+  "entities.userEntities.form.systemEntityNotice": "This is a system entity defined in code. Its label and description are managed in code and cannot be edited here — only the field definitions below are editable.",
   "entities.userEntities.form.title": "Create Entity",
   "entities.userEntities.records.errors.deleteFailed": "Failed to delete record",
   "entities.userEntities.records.errors.entityIdRequired": "Entity identifier is required",

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

@@ -237,6 +237,7 @@
   "entities.userEntities.form.loading": "Cargando…",
   "entities.userEntities.form.showInSidebar.label": "Mostrar en la barra lateral",
   "entities.userEntities.form.submit": "Crear",
+  "entities.userEntities.form.systemEntityNotice": "Esta es una entidad de sistema definida en el código. Su etiqueta y descripción se gestionan en el código y no se pueden editar aquí — solo las definiciones de campos siguientes son editables.",
   "entities.userEntities.form.title": "Crear entidad",
   "entities.userEntities.records.errors.deleteFailed": "No se pudo eliminar el registro",
   "entities.userEntities.records.errors.entityIdRequired": "Se requiere el identificador de la entidad",

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

@@ -237,6 +237,7 @@
   "entities.userEntities.form.loading": "Ładowanie…",
   "entities.userEntities.form.showInSidebar.label": "Pokaż w panelu bocznym",
   "entities.userEntities.form.submit": "Utwórz",
+  "entities.userEntities.form.systemEntityNotice": "To jest encja systemowa zdefiniowana w kodzie. Jej etykieta i opis są zarządzane w kodzie i nie można ich tutaj edytować — edytowalne są tylko definicje pól poniżej.",
   "entities.userEntities.form.title": "Utwórz encję",
   "entities.userEntities.records.errors.deleteFailed": "Nie udało się usunąć rekordu",
   "entities.userEntities.records.errors.entityIdRequired": "Wymagany jest identyfikator encji",