@open-mercato/core 0.6.6-develop.6543.1.49fadb4c31 → 0.6.6

package/src/modules/customer_accounts/widgets/injection-table.ts

@@ -19,8 +19,10 @@ const companyUsersWidget = {
 export const injectionTable: ModuleInjectionTable = {
   'customers.person': [accountStatusWidget],
   'crud-form:customers.person': [accountStatusWidget],
+  'crud-form:customers:customer_person_profile:fields': [accountStatusWidget],
   'customers.company': [companyUsersWidget],
   'crud-form:customers.company': [companyUsersWidget],
+  'crud-form:customers:customer_company_profile:fields': [companyUsersWidget],
   // Step 4.10 — Portal AiChat injection example.
   // Mapped to the portal profile page's `pageAfter('profile')` spot;
   // third-party modules targeting other portal pages can copy this entry.

package/src/modules/customers/backend/customers/companies-v2/[id]/page.tsx

@@ -31,7 +31,6 @@ import type { TagsSectionController } from '@open-mercato/ui/backend/detail'
 import { coerceDisplayName } from '../../../../lib/displayName'
 import { CompanyDetailHeader } from '../../../../components/detail/CompanyDetailHeader'
 import { CompanyDetailTabs, resolveLegacyTab, type CompanyTabId } from '../../../../components/detail/CompanyDetailTabs'
-import { useDealsAccess } from '../../../../components/detail/useDealsAccess'
 import { CompanyKpiBar } from '../../../../components/detail/CompanyKpiBar'
 import { ScheduleActivityDialog, type ScheduleActivityEditData } from '../../../../components/detail/ScheduleActivityDialog'
 import { ChangelogTab } from '../../../../components/detail/ChangelogTab'
@@ -70,7 +69,6 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
   }, [searchParams])
   const [activeTab, setActiveTab] = React.useState<CompanyTabId>(initialTab)
   const [sectionAction, setSectionAction] = React.useState<SectionAction | null>(null)
-  const { canViewDeals, isReady: isDealsAccessReady } = useDealsAccess()
 
   // Form state
   const [isDirty, setIsDirty] = React.useState(false)
@@ -330,14 +328,6 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
     setSectionAction(null)
   }, [activeTab])
 
-  // A `?tab=deals` deep link must not strand users without `customers.deals.view`
-  // on a tab that no longer exists for them. Wait for the granted features to load
-  // so a permitted user is never bounced off the tab mid-fetch.
-  React.useEffect(() => {
-    if (!isDealsAccessReady || canViewDeals) return
-    setActiveTab((current) => (current === 'deals' ? 'people' : current))
-  }, [isDealsAccessReady, canViewDeals])
-
   // Deals scope
   const dealsScope = React.useMemo(
     () => (currentCompanyId ? ({ kind: 'company', entityId: currentCompanyId } as const) : null),
@@ -554,7 +544,7 @@ export default function CompanyDetailV2Page({ params }: { params?: { id?: string
                   />
                 )}
 
-                {activeTab === 'deals' && canViewDeals && (
+                {activeTab === 'deals' && (
                   <DealsSection
                     scope={dealsScope}
                     emptyLabel={t('customers.companies.detail.empty.deals', 'No deals linked to this company.')}

package/src/modules/customers/components/detail/CompanyDetailTabs.tsx

@@ -14,7 +14,6 @@ import {
   Plus,
 } from 'lucide-react'
 import type { SectionAction } from '@open-mercato/ui/backend/detail'
-import { useDealsAccess } from './useDealsAccess'
 
 export type CompanyTabId =
   | 'people'
@@ -88,7 +87,6 @@ export function CompanyDetailTabs({
   children,
 }: CompanyDetailTabsProps) {
   const t = useT()
-  const { canViewDeals } = useDealsAccess()
 
   const builtInTabs: TabDef[] = React.useMemo(
     () => [
@@ -98,16 +96,12 @@ export function CompanyDetailTabs({
         icon: <Users className="size-4" />,
         badge: <CountBadge count={peopleCount} />,
       },
-      ...(canViewDeals
-        ? [
-            {
-              id: 'deals' as CompanyTabId,
-              label: t('customers.companies.detail.tabs.deals', 'Deals'),
-              icon: <Handshake className="size-4" />,
-              badge: <CountBadge count={dealsCount} />,
-            },
-          ]
-        : []),
+      {
+        id: 'deals',
+        label: t('customers.companies.detail.tabs.deals', 'Deals'),
+        icon: <Handshake className="size-4" />,
+        badge: <CountBadge count={dealsCount} />,
+      },
       {
         id: 'activity-log',
         label: t('customers.companies.detail.tabs.activityLog', 'Activity log'),
@@ -127,7 +121,7 @@ export function CompanyDetailTabs({
         badge: <CountBadge count={filesCount} />,
       },
     ],
-    [t, canViewDeals, peopleCount, dealsCount, activitiesCount, filesCount],
+    [t, peopleCount, dealsCount, activitiesCount, filesCount],
   )
 
   const allTabs: TabDef[] = React.useMemo(

package/src/modules/dashboards/api/roles/widgets/route.ts

@@ -6,10 +6,7 @@ import { DashboardRoleWidgets } from '@open-mercato/core/modules/dashboards/data
 import { Role } from '@open-mercato/core/modules/auth/data/entities'
 import { roleWidgetSettingsSchema } from '@open-mercato/core/modules/dashboards/data/validators'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
-import {
-  resolveWidgetAssignmentReadScope,
-  resolveWidgetAssignmentTargetAccess,
-} from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
+import { resolveWidgetAssignmentReadScope } from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
 import { hasFeature } from '@open-mercato/shared/security/features'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -73,15 +70,7 @@ export async function GET(req: Request) {
   })
 
   const role = await em.findOne(Role, { id: roleId, deletedAt: null })
-  const access = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: role,
-  })
-  if (access === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (access === 'not-found') {
+  if (!role || (tenantId && role.tenantId !== tenantId)) {
     return NextResponse.json({ error: 'Role not found' }, { status: 404 })
   }
 
@@ -132,15 +121,7 @@ export async function PUT(req: Request) {
   const organizationId = auth.orgId ?? null
 
   const role = await em.findOne(Role, { id: parsed.data.roleId, deletedAt: null })
-  const access = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: role,
-  })
-  if (access === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (access === 'not-found') {
+  if (!role || (tenantId && role.tenantId !== tenantId)) {
     return NextResponse.json({ error: 'Role not found' }, { status: 404 })
   }
 

package/src/modules/dashboards/api/users/widgets/route.ts

@@ -7,10 +7,7 @@ import { User } from '@open-mercato/core/modules/auth/data/entities'
 import { userWidgetSettingsSchema } from '@open-mercato/core/modules/dashboards/data/validators'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
 import { resolveAllowedWidgetIds } from '@open-mercato/core/modules/dashboards/lib/access'
-import {
-  resolveWidgetAssignmentReadScope,
-  resolveWidgetAssignmentTargetAccess,
-} from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
+import { resolveWidgetAssignmentReadScope } from '@open-mercato/core/modules/dashboards/lib/widgetAssignmentScope'
 import { hasFeature } from '@open-mercato/shared/security/features'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -56,15 +53,7 @@ export async function GET(req: Request) {
   })
 
   const targetUserForRead = await em.findOne(User, { id: userId, deletedAt: null })
-  const readAccess = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: targetUserForRead,
-  })
-  if (readAccess === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (readAccess === 'not-found') {
+  if (!targetUserForRead || (tenantId && (targetUserForRead.tenantId ?? null) !== tenantId)) {
     return NextResponse.json({ error: 'User not found' }, { status: 404 })
   }
 
@@ -132,15 +121,7 @@ export async function PUT(req: Request) {
   const organizationId = auth.orgId ?? null
 
   const targetUser = await em.findOne(User, { id: parsed.data.userId, deletedAt: null })
-  const writeAccess = resolveWidgetAssignmentTargetAccess({
-    isSuperAdmin: !!acl.isSuperAdmin,
-    scopeTenantId: tenantId,
-    target: targetUser,
-  })
-  if (writeAccess === 'forbidden') {
-    return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-  }
-  if (writeAccess === 'not-found') {
+  if (!targetUser || (tenantId && (targetUser.tenantId ?? null) !== tenantId)) {
     return NextResponse.json({ error: 'User not found' }, { status: 404 })
   }
 

package/src/modules/dashboards/cli.ts

@@ -6,7 +6,6 @@ import { Role } from '@open-mercato/core/modules/auth/data/entities'
 import { loadAllWidgets } from '@open-mercato/core/modules/dashboards/lib/widgets'
 import { appendWidgetsToRoles, resolveAnalyticsWidgetIds } from '@open-mercato/core/modules/dashboards/lib/role-widgets'
 import { seedAnalyticsData } from './seed/analytics'
-import { parseCommaSeparatedList } from '@open-mercato/shared/lib/string'
 
 type Args = Record<string, string>
 
@@ -109,7 +108,10 @@ const seedDefaults: ModuleCli = {
       return
     }
 
-    const roleNames = parseCommaSeparatedList(roleCsv)
+    const roleNames = roleCsv
+      .split(',')
+      .map((name) => name.trim())
+      .filter(Boolean)
 
     if (!roleNames.length) {
       console.log('No roles provided, nothing to seed.')
@@ -123,7 +125,7 @@ const seedDefaults: ModuleCli = {
       tenantId,
       organizationId,
       roleNames,
-      widgetIds: widgetCsv ? parseCommaSeparatedList(widgetCsv) : undefined,
+      widgetIds: widgetCsv ? widgetCsv.split(',').map((id) => id.trim()).filter(Boolean) : undefined,
       logger: (message) => console.log(message),
     })
   },
@@ -141,7 +143,10 @@ const enableAnalyticsWidgets: ModuleCli = {
       return
     }
 
-    const roleNames = parseCommaSeparatedList(roleCsv)
+    const roleNames = roleCsv
+      .split(',')
+      .map((name) => name.trim())
+      .filter(Boolean)
 
     if (!roleNames.length) {
       console.log('No roles provided, nothing to update.')

package/src/modules/dashboards/lib/widgetAssignmentScope.ts

@@ -8,24 +8,6 @@ export type ResolvedAssignmentScope = {
   organizationId: string | null
 }
 
-export type WidgetAssignmentTarget = {
-  tenantId?: string | null
-}
-
-export type WidgetAssignmentTargetAccess = 'allowed' | 'forbidden' | 'not-found'
-
-export function resolveWidgetAssignmentTargetAccess(params: {
-  isSuperAdmin: boolean
-  scopeTenantId: string | null
-  target: WidgetAssignmentTarget | null | undefined
-}): WidgetAssignmentTargetAccess {
-  const { isSuperAdmin, scopeTenantId, target } = params
-  if (!isSuperAdmin && !scopeTenantId) return 'forbidden'
-  if (!target) return 'not-found'
-  if (scopeTenantId && (target.tenantId ?? null) !== scopeTenantId) return 'not-found'
-  return 'allowed'
-}
-
 export function resolveWidgetAssignmentReadScope(params: {
   auth: AuthScopeInput
   isSuperAdmin: boolean

package/src/modules/dictionaries/commands/entries.ts

@@ -4,13 +4,22 @@ import {
   dictionaryEntryCommandCreateSchema,
   dictionaryEntryCommandUpdateSchema,
 } from '@open-mercato/core/modules/dictionaries/data/validators'
-import {
-  ensureDictionaryEntryScope,
-  registerDictionaryEntryCommands,
-} from '@open-mercato/core/modules/dictionaries/commands/factory'
+import { registerDictionaryEntryCommands } from '@open-mercato/core/modules/dictionaries/commands/factory'
+import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 
+function ensureScope(ctx: CommandRuntimeContext, scope: { tenantId: string; organizationId: string }): void {
+  const tenantId = ctx.auth?.tenantId ?? null
+  if (tenantId && tenantId !== scope.tenantId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  if (organizationId && organizationId !== scope.organizationId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+}
+
 async function ensureDictionary(em: EntityManager, id: string): Promise<Dictionary> {
   const dictionary = await em.findOne(Dictionary, {
     id,
@@ -28,12 +37,12 @@ registerDictionaryEntryCommands({
   translationKeyPrefix: 'dictionaries.entries',
   createSchema: dictionaryEntryCommandCreateSchema,
   updateSchema: dictionaryEntryCommandUpdateSchema,
-  ensureScope: ensureDictionaryEntryScope,
+  ensureScope,
   duplicateError: 'An entry with this value already exists.',
   resolveDictionaryForCreate: async ({ em, ctx, parsed }) => {
     const dictionary = await ensureDictionary(em, parsed.dictionaryId)
     const scope = { tenantId: dictionary.tenantId, organizationId: dictionary.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     return { dictionary, scope }
   },
   resolveEntry: async ({ em, ctx, id }) => {
@@ -45,7 +54,7 @@ registerDictionaryEntryCommands({
       throw new CrudHttpError(404, { error: 'Dictionary not found' })
     }
     const scope = { tenantId: entry.tenantId, organizationId: entry.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     return { entry, dictionary: entry.dictionary, scope }
   },
   ensureDictionaryForUndo: async ({ em, snapshot }) => {

package/src/modules/dictionaries/commands/entry-operations.ts

@@ -6,8 +6,7 @@ import {
   type ReorderDictionaryEntriesCommandInput,
   type SetDefaultDictionaryEntryCommandInput,
 } from '@open-mercato/core/modules/dictionaries/data/validators'
-import { ensureDictionaryEntryScope } from '@open-mercato/core/modules/dictionaries/commands/factory'
-import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
+import { registerCommand, type CommandHandler, type CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { emitCrudSideEffects, emitCrudUndoSideEffects } from '@open-mercato/shared/lib/commands/helpers'
@@ -37,6 +36,17 @@ const dictionaryCrudEvents: CrudEventsConfig = {
   }),
 }
 
+function ensureScope(ctx: CommandRuntimeContext, scope: DictionaryScope): void {
+  const tenantId = ctx.auth?.tenantId ?? null
+  if (tenantId && tenantId !== scope.tenantId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+  const organizationId = ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? null
+  if (organizationId && organizationId !== scope.organizationId) {
+    throw new CrudHttpError(403, { error: 'Forbidden' })
+  }
+}
+
 async function requireDictionary(
   em: EntityManager,
   id: string,
@@ -74,7 +84,7 @@ const reorderDictionaryEntriesCommand: CommandHandler<
   async prepare(rawInput, ctx) {
     const parsed = reorderDictionaryEntriesCommandSchema.parse(rawInput)
     const scope: DictionaryScope = { tenantId: parsed.tenantId, organizationId: parsed.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const ids = parsed.entries.map((e) => e.id)
     const existing = await findWithDecryption(
@@ -98,7 +108,7 @@ const reorderDictionaryEntriesCommand: CommandHandler<
   async execute(rawInput, ctx) {
     const parsed = reorderDictionaryEntriesCommandSchema.parse(rawInput)
     const scope: DictionaryScope = { tenantId: parsed.tenantId, organizationId: parsed.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const dictionary = await requireDictionary(em, parsed.dictionaryId, scope)
@@ -191,7 +201,7 @@ const reorderDictionaryEntriesCommand: CommandHandler<
     const undo = extractUndoPayload<ReorderUndoPayload>(logEntry)
     const before = undo?.before ?? (logEntry?.snapshotBefore as ReorderSnapshot | null | undefined) ?? null
     if (!before) return
-    ensureDictionaryEntryScope(ctx, before.scope)
+    ensureScope(ctx, before.scope)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const ids = before.positions.map((p) => p.id)
@@ -255,7 +265,7 @@ const setDefaultDictionaryEntryCommand: CommandHandler<
   async prepare(rawInput, ctx) {
     const parsed = setDefaultDictionaryEntryCommandSchema.parse(rawInput)
     const scope: DictionaryScope = { tenantId: parsed.tenantId, organizationId: parsed.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const dictionary = await requireDictionary(em, parsed.dictionaryId, scope)
     const previousDefaults = await findWithDecryption(
@@ -281,7 +291,7 @@ const setDefaultDictionaryEntryCommand: CommandHandler<
   async execute(rawInput, ctx) {
     const parsed = setDefaultDictionaryEntryCommandSchema.parse(rawInput)
     const scope: DictionaryScope = { tenantId: parsed.tenantId, organizationId: parsed.organizationId }
-    ensureDictionaryEntryScope(ctx, scope)
+    ensureScope(ctx, scope)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const dictionary = await requireDictionary(em, parsed.dictionaryId, scope)
@@ -389,7 +399,7 @@ const setDefaultDictionaryEntryCommand: CommandHandler<
     const undo = extractUndoPayload<DefaultUndoPayload>(logEntry)
     const before = undo?.before ?? (logEntry?.snapshotBefore as DefaultSnapshot | null | undefined) ?? null
     if (!before) return
-    ensureDictionaryEntryScope(ctx, before.scope)
+    ensureScope(ctx, before.scope)
 
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const dictionary = await requireDictionary(em, before.dictionaryId, before.scope)

package/src/modules/dictionaries/commands/factory.ts

@@ -12,7 +12,6 @@ import {
 } from '@open-mercato/shared/lib/commands'
 import { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'
 import { buildChanges, requireId } from '@open-mercato/shared/lib/commands/helpers'
-import { ensureOrganizationScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { z } from 'zod'
@@ -23,11 +22,6 @@ type DictionaryScope = {
   organizationId: string
 }
 
-export function ensureDictionaryEntryScope(ctx: CommandRuntimeContext, scope: DictionaryScope): void {
-  ensureTenantScope(ctx, scope.tenantId)
-  ensureOrganizationScope(ctx, scope.organizationId)
-}
-
 export type DictionaryEntrySnapshot = {
   id: string
   dictionaryId: string
@@ -93,8 +87,8 @@ export type DictionaryEntryCommandConfig<TCreate, TUpdate> = {
   labels?: DictionaryEntryCommandLabels
 }
 
-export function toScopeEnsurer(fn: EnsureScopeFn | undefined): EnsureScopeFn {
-  return typeof fn === 'function' ? fn : ensureDictionaryEntryScope
+function toScopeEnsurer(fn: EnsureScopeFn | undefined): EnsureScopeFn {
+  return typeof fn === 'function' ? fn : () => {}
 }
 
 async function loadSnapshot(em: EntityManager, id: string): Promise<DictionaryEntrySnapshot | null> {

package/src/modules/dictionaries/fields/dictionary.tsx

@@ -90,12 +90,9 @@ function DictionaryFieldDefEditor({ def, onChange }: { def: { configJson?: Dicti
   const [error, setError] = React.useState<string | null>(null)
   const multiId = React.useId()
   const inlineCreateId = React.useId()
-  const inlineCreateHintId = React.useId()
-  const defaultValueHintId = React.useId()
   const selectedId = typeof def?.configJson?.dictionaryId === 'string' ? def?.configJson?.dictionaryId : ''
   const inlineCreate = def?.configJson?.dictionaryInlineCreate !== false
   const isMulti = def?.configJson?.multi === true
-  const inlineCreateDisabled = !selectedId || isMulti
   const errorLoadLabel = t('dictionaries.customFields.errorLoad', 'Failed to load dictionaries.')
 
   React.useEffect(() => {
@@ -184,65 +181,45 @@ function DictionaryFieldDefEditor({ def, onChange }: { def: { configJson?: Dicti
           </a>
         </div>
       ) : null}
-      <div className="space-y-2">
-        <div className="flex flex-col gap-2 sm:flex-row sm:flex-wrap sm:items-center sm:gap-x-4">
-          <div className="inline-flex items-center gap-2 text-xs">
-            <Checkbox
-              id={multiId}
-              checked={isMulti}
-              onCheckedChange={(checked) => {
-                const enabled = checked === true
-                onChange({ multi: enabled, defaultValue: enabled ? undefined : def?.configJson?.defaultValue })
-              }}
-              disabled={!selectedId}
-            />
-            <label
-              htmlFor={multiId}
-              className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
-            >
-              {t('dictionaries.customFields.allowMultiple', 'Allow selecting multiple entries')}
-            </label>
-          </div>
-          <div className="inline-flex items-center gap-2 text-xs">
-            <Checkbox
-              id={inlineCreateId}
-              checked={!isMulti && inlineCreate}
-              onCheckedChange={(checked) => onChange({ dictionaryInlineCreate: checked === true })}
-              disabled={inlineCreateDisabled}
-              aria-describedby={isMulti ? inlineCreateHintId : undefined}
-            />
-            <label
-              htmlFor={inlineCreateId}
-              className={!inlineCreateDisabled ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
-            >
-              {t('dictionaries.customFields.allowInlineCreate', 'Allow inline creation inside forms')}
-            </label>
-          </div>
-        </div>
-        {isMulti ? (
-          <p id={inlineCreateHintId} className="text-xs text-muted-foreground">
-            {t(
-              'dictionaries.customFields.inlineCreateSingleOnly',
-              'Inline creation is available for single-entry dictionary fields only.',
-            )}
-          </p>
-        ) : null}
+      <div className="inline-flex items-center gap-2 text-xs">
+        <Checkbox
+          id={multiId}
+          checked={isMulti}
+          onCheckedChange={(checked) => {
+            const enabled = checked === true
+            onChange({ multi: enabled, defaultValue: enabled ? undefined : def?.configJson?.defaultValue })
+          }}
+          disabled={!selectedId}
+        />
+        <label
+          htmlFor={multiId}
+          className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
+        >
+          {t('dictionaries.customFields.allowMultiple', 'Allow selecting multiple entries')}
+        </label>
       </div>
+      {!isMulti ? (
+        <div className="inline-flex items-center gap-2 text-xs">
+          <Checkbox
+            id={inlineCreateId}
+            checked={inlineCreate}
+            onCheckedChange={(checked) => onChange({ dictionaryInlineCreate: checked === true })}
+            disabled={!selectedId}
+          />
+          <label
+            htmlFor={inlineCreateId}
+            className={selectedId ? 'cursor-pointer select-none' : 'cursor-not-allowed opacity-60'}
+          >
+            {t('dictionaries.customFields.allowInlineCreate', 'Allow inline creation inside forms')}
+          </label>
+        </div>
+      ) : null}
       {selectedId && !isMulti ? (
         <DictionaryDefaultSelector
           dictionaryId={selectedId}
           defaultValue={typeof def?.configJson?.defaultValue === 'string' ? def.configJson.defaultValue : ''}
           onChange={(value) => onChange({ defaultValue: value || undefined })}
         />
-      ) : selectedId && isMulti ? (
-        <div className="inline-flex items-center gap-2 text-xs">
-          <p id={defaultValueHintId} className="text-xs text-muted-foreground">
-            {t(
-              'dictionaries.customFields.defaultValueMultiUnavailable',
-              'Default values are not available for multi-select dictionary fields.',
-            )}
-          </p>
-        </div>
       ) : null}
     </div>
   )

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

@@ -82,7 +82,6 @@
   "dictionaries.customFields.allowInlineCreate": "Inline-Erstellung in Formularen erlauben",
   "dictionaries.customFields.allowMultiple": "Mehrere Einträge auswählen erlauben",
   "dictionaries.customFields.defaultValue": "Standardwert",
-  "dictionaries.customFields.defaultValueMultiUnavailable": "Standardwerte sind für Wörterbuchfelder mit Mehrfachauswahl nicht verfügbar.",
   "dictionaries.customFields.defaultValueNone": "Kein Standardwert",
   "dictionaries.customFields.defaultValueStale": "Standardeintrag nicht gefunden — er wurde möglicherweise gelöscht oder umbenannt.",
   "dictionaries.customFields.dictionaryLabel": "Quelle des Wörterbuchs",
@@ -90,7 +89,6 @@
   "dictionaries.customFields.empty": "Noch keine Wörterbücher verfügbar. Erstellen Sie zuerst eines.",
   "dictionaries.customFields.errorLoad": "Wörterbücher konnten nicht geladen werden.",
   "dictionaries.customFields.inactive": "inaktiv",
-  "dictionaries.customFields.inlineCreateSingleOnly": "Inline-Erstellung ist nur für Wörterbuchfelder mit Einzelauswahl verfügbar.",
   "dictionaries.customFields.loading": "Wörterbücher werden geladen…",
   "dictionaries.customFields.manageLink": "Wörterbücher verwalten",
   "dictionaries.customFields.selectedHint": "Einträge aus diesem Wörterbuch füllen das Feld.",

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

@@ -82,7 +82,6 @@
   "dictionaries.customFields.allowInlineCreate": "Allow inline creation inside forms",
   "dictionaries.customFields.allowMultiple": "Allow selecting multiple entries",
   "dictionaries.customFields.defaultValue": "Default value",
-  "dictionaries.customFields.defaultValueMultiUnavailable": "Default values are not available for multi-select dictionary fields.",
   "dictionaries.customFields.defaultValueNone": "No default",
   "dictionaries.customFields.defaultValueStale": "Default entry not found — it may have been deleted or renamed.",
   "dictionaries.customFields.dictionaryLabel": "Dictionary source",
@@ -90,7 +89,6 @@
   "dictionaries.customFields.empty": "No dictionaries available yet. Create one first.",
   "dictionaries.customFields.errorLoad": "Failed to load dictionaries.",
   "dictionaries.customFields.inactive": "inactive",
-  "dictionaries.customFields.inlineCreateSingleOnly": "Inline creation is available for single-entry dictionary fields only.",
   "dictionaries.customFields.loading": "Loading dictionaries…",
   "dictionaries.customFields.manageLink": "Manage dictionaries",
   "dictionaries.customFields.selectedHint": "Entries from this dictionary populate the field.",

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

@@ -82,7 +82,6 @@
   "dictionaries.customFields.allowInlineCreate": "Permitir creación en línea dentro de los formularios",
   "dictionaries.customFields.allowMultiple": "Permitir seleccionar varias entradas",
   "dictionaries.customFields.defaultValue": "Valor predeterminado",
-  "dictionaries.customFields.defaultValueMultiUnavailable": "Los valores predeterminados no están disponibles para campos de diccionario con selección múltiple.",
   "dictionaries.customFields.defaultValueNone": "Sin valor predeterminado",
   "dictionaries.customFields.defaultValueStale": "No se encontró la entrada predeterminada; puede haber sido eliminada o renombrada.",
   "dictionaries.customFields.dictionaryLabel": "Fuente del diccionario",
@@ -90,7 +89,6 @@
   "dictionaries.customFields.empty": "Aún no hay diccionarios disponibles. Crea uno primero.",
   "dictionaries.customFields.errorLoad": "No se pudieron cargar los diccionarios.",
   "dictionaries.customFields.inactive": "inactivo",
-  "dictionaries.customFields.inlineCreateSingleOnly": "La creación en línea solo está disponible para campos de diccionario de una sola entrada.",
   "dictionaries.customFields.loading": "Cargando diccionarios…",
   "dictionaries.customFields.manageLink": "Administrar diccionarios",
   "dictionaries.customFields.selectedHint": "Las entradas de este diccionario rellenarán el campo.",

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

@@ -82,7 +82,6 @@
   "dictionaries.customFields.allowInlineCreate": "Zezwól na tworzenie w formularzach",
   "dictionaries.customFields.allowMultiple": "Zezwól na wybór wielu wpisów",
   "dictionaries.customFields.defaultValue": "Wartość domyślna",
-  "dictionaries.customFields.defaultValueMultiUnavailable": "Wartości domyślne nie są dostępne dla wielokrotnego wyboru wpisów słownika.",
   "dictionaries.customFields.defaultValueNone": "Brak wartości domyślnej",
   "dictionaries.customFields.defaultValueStale": "Nie znaleziono domyślnego wpisu — mógł zostać usunięty albo przemianowany.",
   "dictionaries.customFields.dictionaryLabel": "Źródło słownika",
@@ -90,7 +89,6 @@
   "dictionaries.customFields.empty": "Brak dostępnych słowników. Najpierw utwórz jeden.",
   "dictionaries.customFields.errorLoad": "Nie udało się wczytać słowników.",
   "dictionaries.customFields.inactive": "nieaktywne",
-  "dictionaries.customFields.inlineCreateSingleOnly": "Tworzenie wpisów w formularzu jest dostępne tylko dla pól z pojedynczym wyborem.",
   "dictionaries.customFields.loading": "Ładowanie słowników…",
   "dictionaries.customFields.manageLink": "Zarządzaj słownikami",
   "dictionaries.customFields.selectedHint": "Wpisy z tego słownika uzupełnią pole.",