@open-mercato/ui 0.6.6-develop.6227.1.2695efff30 → 0.6.6-develop.6229.1.ebe6706732

package/dist/backend/utils/customFieldForms.js

@@ -97,6 +97,38 @@ function buildFormFieldFromCustomFieldDef(def, opts) {
         } : {},
         ...def.multi && def.input === "listbox" ? { listbox: true } : {}
       };
+    case "dictionary": {
+      if (!def.multi) {
+        const input = FieldRegistry.getInput(def.kind);
+        if (input) {
+          return {
+            id,
+            label,
+            type: "custom",
+            ...baseProps,
+            component: (props) => input({ ...props, def })
+          };
+        }
+        return { id, label, type: "text", ...baseProps };
+      }
+      const optionsUrl = def.optionsUrl || (def.dictionaryId ? `/api/dictionaries/${def.dictionaryId}/entries` : void 0);
+      return {
+        id,
+        label,
+        type: "select",
+        description: def.description,
+        required,
+        options: [],
+        multiple: true,
+        listbox: true,
+        ...optionsUrl ? {
+          loadOptions: async (query) => {
+            const url = buildOptionsUrl(optionsUrl, query);
+            return loadRemoteOptions(url);
+          }
+        } : {}
+      };
+    }
     default: {
       if (def.kind === "text" && def.multi) {
         const base = { id, label, type: "tags", ...baseProps };

package/dist/backend/utils/customFieldForms.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/backend/utils/customFieldForms.ts"],
-  "sourcesContent": ["import type { CrudField } from '../CrudForm'\nimport type {\n  CustomFieldDefDto,\n  CustomFieldDefinitionsPayload,\n} from './customFieldDefs'\nimport {\n  filterCustomFieldDefs,\n  fetchCustomFieldDefs,\n  fetchCustomFieldDefinitionsPayload,\n} from './customFieldDefs'\nimport { FieldRegistry, loadGeneratedFieldRegistrations } from '../fields/registry'\nimport { apiCall } from './apiCall'\nimport { normalizeCustomFieldOptions } from '@open-mercato/shared/modules/entities/options'\nimport { CURRENCY_OPTIONS_URL } from '@open-mercato/shared/modules/entities/kinds'\n\nlet registryReady: Promise<void> | null = null\n\nasync function ensureFieldRegistryReady() {\n  if (!registryReady) {\n    registryReady = loadGeneratedFieldRegistrations().catch((err) => {\n      registryReady = null\n      throw err\n    })\n  }\n  await registryReady\n}\n\nfunction buildOptionsUrl(base: string, query?: string): string {\n  if (!query) return base\n  try {\n    const isAbsolute = /^([a-z][a-z\\d+\\-.]*:)?\\/\\//i.test(base)\n    const origin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost'\n    const url = isAbsolute ? new URL(base) : new URL(base, origin)\n    if (!url.searchParams.has('query')) url.searchParams.append('query', query)\n    if (!url.searchParams.has('q')) url.searchParams.append('q', query)\n    if (isAbsolute) return url.toString()\n    return `${url.pathname}${url.search}`\n  } catch {\n    const sep = base.includes('?') ? '&' : '?'\n    if (base.includes('query=')) return `${base}${sep}q=${encodeURIComponent(query)}`\n    return `${base}${sep}query=${encodeURIComponent(query)}`\n  }\n}\n\ntype OptionsResponse = { items?: unknown[] }\n\nasync function loadRemoteOptions(url: string): Promise<Array<{ value: string; label: string }>> {\n  try {\n    const call = await apiCall<OptionsResponse>(url, undefined, { fallback: { items: [] } })\n    if (!call.ok) return []\n    const payload = call.result ?? { items: [] }\n    const items = Array.isArray(payload?.items) ? payload.items : []\n    return items.map((it: any) => ({\n      value: String(it?.value ?? it),\n      label: String(it?.label ?? it?.value ?? it),\n    }))\n  } catch {\n    return []\n  }\n}\n\nexport function buildFormFieldFromCustomFieldDef(\n  def: CustomFieldDefDto,\n  opts?: { bareIds?: boolean }\n): CrudField | null {\n  const id = opts?.bareIds ? def.key : `cf_${def.key}`\n  const label = def.label || def.key\n  const required = Array.isArray((def as any).validation)\n    ? ((def as any).validation as any[]).some((rule) => rule && rule.rule === 'required')\n    : false\n  const baseProps = {\n    description: def.description,\n    required,\n    ...(def.defaultValue !== undefined && def.defaultValue !== null ? { defaultValue: def.defaultValue } : {}),\n  }\n\n  switch (def.kind) {\n    case 'boolean':\n      return { id, label, type: 'checkbox', ...baseProps }\n    case 'integer':\n    case 'float':\n      return { id, label, type: 'number', ...baseProps }\n    case 'date':\n      return { id, label, type: 'datepicker', ...baseProps }\n    case 'datetime':\n      return { id, label, type: 'datetime', ...baseProps }\n    case 'multiline': {\n      let editor: 'simple' | 'uiw' | 'html' = 'html'\n      if (def.editor === 'simpleMarkdown') editor = 'simple'\n      else if (def.editor === 'htmlRichText') editor = 'html'\n      return { id, label, type: 'richtext', ...baseProps, editor }\n    }\n    case 'select':\n    case 'currency':\n    case 'relation':\n      return {\n        id,\n        label,\n        type: 'select',\n        ...baseProps,\n        options: normalizeCustomFieldOptions(def.options || []).map((option) => ({\n          value: option.value,\n          label: option.label,\n        })),\n        multiple: !!def.multi,\n        ...(def.kind === 'currency'\n          ? {\n              loadOptions: async (query?: string) => {\n                const url = buildOptionsUrl(CURRENCY_OPTIONS_URL, query)\n                return loadRemoteOptions(url)\n              },\n            }\n          : def.optionsUrl\n          ? {\n              loadOptions: async (query?: string) => {\n                const url = buildOptionsUrl(def.optionsUrl!, query)\n                return loadRemoteOptions(url)\n              },\n            }\n          : {}),\n        ...(def.multi && def.input === 'listbox' ? ({ listbox: true } as any) : {}),\n      }\n    default: {\n      if (def.kind === 'text' && def.multi) {\n        const base: any = { id, label, type: 'tags', ...baseProps }\n        const resolvedOptions = normalizeCustomFieldOptions(def.options || [])\n        if (resolvedOptions.length > 0) {\n          base.options = resolvedOptions.map((option) => ({ value: option.value, label: option.label }))\n        }\n        if (def.optionsUrl) {\n          base.loadOptions = async (query?: string) => {\n            const url = buildOptionsUrl(def.optionsUrl!, query)\n            return loadRemoteOptions(url)\n          }\n        }\n        return base\n      }\n      if (def.kind === 'text' && typeof def.editor === 'string' && def.editor) {\n        let editor: 'simple' | 'uiw' | 'html' = 'html'\n        if (def.editor === 'simpleMarkdown') editor = 'simple'\n        else if (def.editor === 'htmlRichText') editor = 'html'\n        return { id, label, type: 'richtext', ...baseProps, editor }\n      }\n      const input = FieldRegistry.getInput(def.kind)\n      if (input) {\n        return {\n          id,\n          label,\n          type: 'custom',\n          ...baseProps,\n          component: (props) => input({ ...props, def }),\n        }\n      }\n      return { id, label, type: 'text', ...baseProps }\n    }\n  }\n}\n\nexport function buildFormFieldsFromCustomFields(\n  defs: CustomFieldDefDto[],\n  opts?: { bareIds?: boolean }\n): CrudField[] {\n  const fields: CrudField[] = []\n  const visible = filterCustomFieldDefs(defs, 'form')\n  const seenKeys = new Set<string>()\n  for (const def of visible) {\n    const keyLower = String(def.key).toLowerCase()\n    if (seenKeys.has(keyLower)) continue\n    seenKeys.add(keyLower)\n    const field = buildFormFieldFromCustomFieldDef(def, opts)\n    if (field) fields.push(field)\n  }\n  return fields\n}\n\nexport async function fetchCustomFieldFormStructure(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<{ fields: CrudField[]; definitions: CustomFieldDefDto[]; metadata: CustomFieldDefinitionsPayload }> {\n  await ensureFieldRegistryReady()\n  const metadata = await fetchCustomFieldDefinitionsPayload(entityIds, fetchImpl)\n  const definitions = Array.isArray(metadata.items) ? metadata.items : []\n  const fields = buildFormFieldsFromCustomFields(definitions, options)\n  return { fields, definitions, metadata }\n}\n\nexport async function fetchCustomFieldFormFields(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<CrudField[]> {\n  const { fields } = await fetchCustomFieldFormStructure(entityIds, fetchImpl, options)\n  return fields\n}\n\nexport async function fetchCustomFieldFormFieldsWithDefinitions(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<{ fields: CrudField[]; definitions: CustomFieldDefDto[]; metadata: CustomFieldDefinitionsPayload }> {\n  return fetchCustomFieldFormStructure(entityIds, fetchImpl, options)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { CrudField } from '../CrudForm'\nimport type {\n  CustomFieldDefDto,\n  CustomFieldDefinitionsPayload,\n} from './customFieldDefs'\nimport {\n  filterCustomFieldDefs,\n  fetchCustomFieldDefs,\n  fetchCustomFieldDefinitionsPayload,\n} from './customFieldDefs'\nimport { FieldRegistry, loadGeneratedFieldRegistrations } from '../fields/registry'\nimport { apiCall } from './apiCall'\nimport { normalizeCustomFieldOptions } from '@open-mercato/shared/modules/entities/options'\nimport { CURRENCY_OPTIONS_URL } from '@open-mercato/shared/modules/entities/kinds'\n\nlet registryReady: Promise<void> | null = null\n\nasync function ensureFieldRegistryReady() {\n  if (!registryReady) {\n    registryReady = loadGeneratedFieldRegistrations().catch((err) => {\n      registryReady = null\n      throw err\n    })\n  }\n  await registryReady\n}\n\nfunction buildOptionsUrl(base: string, query?: string): string {\n  if (!query) return base\n  try {\n    const isAbsolute = /^([a-z][a-z\\d+\\-.]*:)?\\/\\//i.test(base)\n    const origin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost'\n    const url = isAbsolute ? new URL(base) : new URL(base, origin)\n    if (!url.searchParams.has('query')) url.searchParams.append('query', query)\n    if (!url.searchParams.has('q')) url.searchParams.append('q', query)\n    if (isAbsolute) return url.toString()\n    return `${url.pathname}${url.search}`\n  } catch {\n    const sep = base.includes('?') ? '&' : '?'\n    if (base.includes('query=')) return `${base}${sep}q=${encodeURIComponent(query)}`\n    return `${base}${sep}query=${encodeURIComponent(query)}`\n  }\n}\n\ntype OptionsResponse = { items?: unknown[] }\n\nasync function loadRemoteOptions(url: string): Promise<Array<{ value: string; label: string }>> {\n  try {\n    const call = await apiCall<OptionsResponse>(url, undefined, { fallback: { items: [] } })\n    if (!call.ok) return []\n    const payload = call.result ?? { items: [] }\n    const items = Array.isArray(payload?.items) ? payload.items : []\n    return items.map((it: any) => ({\n      value: String(it?.value ?? it),\n      label: String(it?.label ?? it?.value ?? it),\n    }))\n  } catch {\n    return []\n  }\n}\n\nexport function buildFormFieldFromCustomFieldDef(\n  def: CustomFieldDefDto,\n  opts?: { bareIds?: boolean }\n): CrudField | null {\n  const id = opts?.bareIds ? def.key : `cf_${def.key}`\n  const label = def.label || def.key\n  const required = Array.isArray((def as any).validation)\n    ? ((def as any).validation as any[]).some((rule) => rule && rule.rule === 'required')\n    : false\n  const baseProps = {\n    description: def.description,\n    required,\n    ...(def.defaultValue !== undefined && def.defaultValue !== null ? { defaultValue: def.defaultValue } : {}),\n  }\n\n  switch (def.kind) {\n    case 'boolean':\n      return { id, label, type: 'checkbox', ...baseProps }\n    case 'integer':\n    case 'float':\n      return { id, label, type: 'number', ...baseProps }\n    case 'date':\n      return { id, label, type: 'datepicker', ...baseProps }\n    case 'datetime':\n      return { id, label, type: 'datetime', ...baseProps }\n    case 'multiline': {\n      let editor: 'simple' | 'uiw' | 'html' = 'html'\n      if (def.editor === 'simpleMarkdown') editor = 'simple'\n      else if (def.editor === 'htmlRichText') editor = 'html'\n      return { id, label, type: 'richtext', ...baseProps, editor }\n    }\n    case 'select':\n    case 'currency':\n    case 'relation':\n      return {\n        id,\n        label,\n        type: 'select',\n        ...baseProps,\n        options: normalizeCustomFieldOptions(def.options || []).map((option) => ({\n          value: option.value,\n          label: option.label,\n        })),\n        multiple: !!def.multi,\n        ...(def.kind === 'currency'\n          ? {\n              loadOptions: async (query?: string) => {\n                const url = buildOptionsUrl(CURRENCY_OPTIONS_URL, query)\n                return loadRemoteOptions(url)\n              },\n            }\n          : def.optionsUrl\n          ? {\n              loadOptions: async (query?: string) => {\n                const url = buildOptionsUrl(def.optionsUrl!, query)\n                return loadRemoteOptions(url)\n              },\n            }\n          : {}),\n        ...(def.multi && def.input === 'listbox' ? ({ listbox: true } as any) : {}),\n      }\n    case 'dictionary': {\n      if (!def.multi) {\n        const input = FieldRegistry.getInput(def.kind)\n        if (input) {\n          return {\n            id,\n            label,\n            type: 'custom',\n            ...baseProps,\n            component: (props) => input({ ...props, def }),\n          }\n        }\n        return { id, label, type: 'text', ...baseProps }\n      }\n      const optionsUrl = def.optionsUrl || (def.dictionaryId ? `/api/dictionaries/${def.dictionaryId}/entries` : undefined)\n      return {\n        id,\n        label,\n        type: 'select',\n        description: def.description,\n        required,\n        options: [],\n        multiple: true,\n        listbox: true,\n        ...(optionsUrl\n          ? {\n              loadOptions: async (query?: string) => {\n                const url = buildOptionsUrl(optionsUrl, query)\n                return loadRemoteOptions(url)\n              },\n            }\n          : {}),\n      }\n    }\n    default: {\n      if (def.kind === 'text' && def.multi) {\n        const base: any = { id, label, type: 'tags', ...baseProps }\n        const resolvedOptions = normalizeCustomFieldOptions(def.options || [])\n        if (resolvedOptions.length > 0) {\n          base.options = resolvedOptions.map((option) => ({ value: option.value, label: option.label }))\n        }\n        if (def.optionsUrl) {\n          base.loadOptions = async (query?: string) => {\n            const url = buildOptionsUrl(def.optionsUrl!, query)\n            return loadRemoteOptions(url)\n          }\n        }\n        return base\n      }\n      if (def.kind === 'text' && typeof def.editor === 'string' && def.editor) {\n        let editor: 'simple' | 'uiw' | 'html' = 'html'\n        if (def.editor === 'simpleMarkdown') editor = 'simple'\n        else if (def.editor === 'htmlRichText') editor = 'html'\n        return { id, label, type: 'richtext', ...baseProps, editor }\n      }\n      const input = FieldRegistry.getInput(def.kind)\n      if (input) {\n        return {\n          id,\n          label,\n          type: 'custom',\n          ...baseProps,\n          component: (props) => input({ ...props, def }),\n        }\n      }\n      return { id, label, type: 'text', ...baseProps }\n    }\n  }\n}\n\nexport function buildFormFieldsFromCustomFields(\n  defs: CustomFieldDefDto[],\n  opts?: { bareIds?: boolean }\n): CrudField[] {\n  const fields: CrudField[] = []\n  const visible = filterCustomFieldDefs(defs, 'form')\n  const seenKeys = new Set<string>()\n  for (const def of visible) {\n    const keyLower = String(def.key).toLowerCase()\n    if (seenKeys.has(keyLower)) continue\n    seenKeys.add(keyLower)\n    const field = buildFormFieldFromCustomFieldDef(def, opts)\n    if (field) fields.push(field)\n  }\n  return fields\n}\n\nexport async function fetchCustomFieldFormStructure(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<{ fields: CrudField[]; definitions: CustomFieldDefDto[]; metadata: CustomFieldDefinitionsPayload }> {\n  await ensureFieldRegistryReady()\n  const metadata = await fetchCustomFieldDefinitionsPayload(entityIds, fetchImpl)\n  const definitions = Array.isArray(metadata.items) ? metadata.items : []\n  const fields = buildFormFieldsFromCustomFields(definitions, options)\n  return { fields, definitions, metadata }\n}\n\nexport async function fetchCustomFieldFormFields(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<CrudField[]> {\n  const { fields } = await fetchCustomFieldFormStructure(entityIds, fetchImpl, options)\n  return fields\n}\n\nexport async function fetchCustomFieldFormFieldsWithDefinitions(\n  entityIds: string | string[],\n  fetchImpl?: typeof fetch,\n  options?: { bareIds?: boolean },\n): Promise<{ fields: CrudField[]; definitions: CustomFieldDefDto[]; metadata: CustomFieldDefinitionsPayload }> {\n  return fetchCustomFieldFormStructure(entityIds, fetchImpl, options)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ui",
-  "version": "0.6.6-develop.6227.1.2695efff30",
+  "version": "0.6.6-develop.6229.1.ebe6706732",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -155,13 +155,13 @@
     "remark-gfm": "^4.0.1"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6227.1.2695efff30",
+    "@open-mercato/shared": "0.6.6-develop.6229.1.ebe6706732",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
     "react-is": ">=18.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6227.1.2695efff30",
+    "@open-mercato/shared": "0.6.6-develop.6229.1.ebe6706732",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/backend/CrudForm.tsx

@@ -2689,6 +2689,12 @@ export function CrudForm<TValues extends Record<string, unknown>>({
     for (const injectedId of injectedFieldIdSet) {
       delete coreValues[injectedId]
     }
+    if (customEntity) {
+      const allowedKeys = new Set(cfDefinitions.map((definition) => definition.key).filter(Boolean))
+      for (const key of Object.keys(coreValues)) {
+        if (!allowedKeys.has(key)) delete coreValues[key]
+      }
+    }
 
     let parsedValues: TValues
     if (schema) {
@@ -2722,6 +2728,12 @@ export function CrudForm<TValues extends Record<string, unknown>>({
           for (const injectedId of injectedFieldIdSet) {
             delete projectedCoreValues[injectedId]
           }
+          if (customEntity) {
+            const allowedKeys = new Set(cfDefinitions.map((definition) => definition.key).filter(Boolean))
+            for (const key of Object.keys(projectedCoreValues)) {
+              if (!allowedKeys.has(key)) delete projectedCoreValues[key]
+            }
+          }
           coreSubmitValues = schema
             ? schema.parse(collapseDotPathFields(projectedCoreValues, dotPathBaseFieldIds))
             : (projectedCoreValues as TValues)

package/src/backend/__tests__/CrudForm.custom-fields.test.tsx

@@ -275,6 +275,73 @@ describe('CrudForm custom field loading', () => {
     expect(container.querySelector('[data-crud-field-id="cf_renewal_quarter"]')?.textContent).toContain('Q3')
   })
 
+  it('submits custom entity values without loaded record metadata', async () => {
+    const handleSubmit = jest.fn().mockResolvedValue(undefined)
+
+    buildFormFieldFromCustomFieldDefMock.mockImplementation((definition: any) => ({
+      id: definition.key,
+      label: definition.label ?? definition.key,
+      type: 'select',
+      multiple: true,
+      listbox: true,
+      options: [
+        { value: 'north', label: 'North' },
+        { value: 'south', label: 'South' },
+      ],
+    }))
+    fetchCustomFieldFormStructureMock.mockResolvedValue({
+      fields: [],
+      definitions: [
+        {
+          entityId: 'user:qa_entity',
+          key: 'regions',
+          label: 'Regions',
+          kind: 'dictionary',
+          multi: true,
+        },
+      ],
+      metadata: {
+        items: [],
+        fieldsetsByEntity: {},
+        entitySettings: {},
+      },
+    })
+
+    renderWithProviders(
+      <CrudForm
+        title="Form"
+        entityId="user:qa_entity"
+        fields={[]}
+        customEntity
+        initialValues={{
+          id: '123e4567-e89b-12d3-a456-426614174000',
+          regions: ['north', 'south'],
+          updatedAt: '2026-06-19T10:00:00.000Z',
+          createdAt: '2026-06-19T09:00:00.000Z',
+        }}
+        onSubmit={handleSubmit}
+      />,
+      {
+        dict: {
+          'ui.forms.actions.save': 'Save',
+        },
+      },
+    )
+
+    await waitFor(() => {
+      expect(screen.getByText('North')).toBeInTheDocument()
+    })
+
+    await act(async () => {
+      fireEvent.click(screen.getAllByRole('button', { name: 'Save' })[0]!)
+    })
+
+    await waitFor(() => {
+      expect(handleSubmit).toHaveBeenCalledTimes(1)
+    })
+    expect(handleSubmit).toHaveBeenCalledWith({ regions: ['north', 'south'] }, expect.any(Object))
+  })
+
   it('opens the field manager without submitting the parent form', async () => {
     const handleSubmit = jest.fn().mockResolvedValue(undefined)
 

package/src/backend/__tests__/custom-field-filters.test.ts

@@ -24,6 +24,13 @@ describe('buildFilterDefsFromCustomFields', () => {
         ],
         multi: true,
       },
+      {
+        key: 'regions',
+        kind: 'dictionary',
+        filterable: true,
+        optionsUrl: '/api/dictionaries/dictionary-1/entries',
+        multi: true,
+      },
       { key: 'notes', kind: 'multiline', filterable: true },
       { key: 'hidden', kind: 'text', filterable: false },
     ]
@@ -44,6 +51,11 @@ describe('buildFilterDefsFromCustomFields', () => {
     if (labels.type !== 'select') throw new Error('expected select')
     expect(labels.multiple).toBe(true)
     expect((labels.options || []).map((o) => o.value)).toEqual(['bug','feature'])
+    const regions = out.find(f => f.id === 'cf_regionsIn')!
+    expect(regions.type).toBe('select')
+    if (regions.type !== 'select') throw new Error('expected select')
+    expect(regions.multiple).toBe(true)
+    expect(typeof regions.loadOptions).toBe('function')
     // text-like (multiline) => text
     expect(out.find(f => f.id === 'cf_notes')!.type).toBe('text')
     // non-filterable omitted

package/src/backend/__tests__/custom-field-forms.test.ts

@@ -1,7 +1,12 @@
 import { buildFormFieldsFromCustomFields } from '../utils/customFieldForms'
 import type { CustomFieldDefDto } from '../utils/customFieldFilters'
+import { FieldRegistry } from '../fields/registry'
 
 describe('buildFormFieldsFromCustomFields', () => {
+  beforeAll(() => {
+    FieldRegistry.register('dictionary', { input: () => null })
+  })
+
   it('maps kinds to CrudField and filters by formEditable', () => {
     const defs: CustomFieldDefDto[] = [
       { key: 'blocked', kind: 'boolean', filterable: true, formEditable: true },
@@ -31,6 +36,23 @@ describe('buildFormFieldsFromCustomFields', () => {
       { key: 'notes', kind: 'multiline', filterable: false, formEditable: true },
       // text with editor hint should render richtext
       { key: 'desc', kind: 'text', filterable: false, formEditable: true, editor: 'htmlRichText' },
+      {
+        key: 'region',
+        kind: 'dictionary',
+        dictionaryId: 'dictionary-1',
+        optionsUrl: '/api/dictionaries/dictionary-1/entries',
+        filterable: true,
+        formEditable: true,
+      },
+      {
+        key: 'regions',
+        kind: 'dictionary',
+        dictionaryId: 'dictionary-1',
+        optionsUrl: '/api/dictionaries/dictionary-1/entries',
+        multi: true,
+        filterable: true,
+        formEditable: true,
+      },
       { key: 'hidden', kind: 'text', filterable: true, formEditable: false },
     ]
 
@@ -49,6 +71,13 @@ describe('buildFormFieldsFromCustomFields', () => {
     if (byId['cf_desc']?.type === 'richtext') {
       expect(byId['cf_desc'].editor).toBe('html')
     }
+    expect(byId['cf_region']?.type).toBe('custom')
+    expect(byId['cf_regions']?.type).toBe('select')
+    if (byId['cf_regions']?.type === 'select') {
+      expect(byId['cf_regions'].multiple).toBe(true)
+      expect(byId['cf_regions'].listbox).toBe(true)
+      expect(typeof byId['cf_regions'].loadOptions).toBe('function')
+    }
     expect(byId['cf_hidden']).toBeUndefined()
   })
 })

package/src/backend/utils/customFieldForms.ts

@@ -120,6 +120,40 @@ export function buildFormFieldFromCustomFieldDef(
           : {}),
         ...(def.multi && def.input === 'listbox' ? ({ listbox: true } as any) : {}),
       }
+    case 'dictionary': {
+      if (!def.multi) {
+        const input = FieldRegistry.getInput(def.kind)
+        if (input) {
+          return {
+            id,
+            label,
+            type: 'custom',
+            ...baseProps,
+            component: (props) => input({ ...props, def }),
+          }
+        }
+        return { id, label, type: 'text', ...baseProps }
+      }
+      const optionsUrl = def.optionsUrl || (def.dictionaryId ? `/api/dictionaries/${def.dictionaryId}/entries` : undefined)
+      return {
+        id,
+        label,
+        type: 'select',
+        description: def.description,
+        required,
+        options: [],
+        multiple: true,
+        listbox: true,
+        ...(optionsUrl
+          ? {
+              loadOptions: async (query?: string) => {
+                const url = buildOptionsUrl(optionsUrl, query)
+                return loadRemoteOptions(url)
+              },
+            }
+          : {}),
+      }
+    }
     default: {
       if (def.kind === 'text' && def.multi) {
         const base: any = { id, label, type: 'tags', ...baseProps }