@open-mercato/core 0.6.6-develop.6519.1.bdc91fb755 → 0.6.6-develop.6520.1.55df6df792

package/src/modules/customers/components/calendar/useCalendarItems.ts

@@ -57,6 +57,7 @@ type ActivityTypeDictionaryEntry = {
   value?: unknown
   label?: unknown
   color?: unknown
+  icon?: unknown
 }
 
 export type UseCalendarItemsResult = {
@@ -66,6 +67,7 @@ export type UseCalendarItemsResult = {
   truncated: boolean
   typeLabels: Record<string, string>
   typeColors: Record<string, string | null>
+  typeIcons: Record<string, string | null>
   refetch: () => void
 }
 
@@ -76,6 +78,7 @@ export function useCalendarItems(range: CalendarRange): UseCalendarItemsResult {
   const [truncated, setTruncated] = React.useState(false)
   const [typeLabels, setTypeLabels] = React.useState<Record<string, string>>({})
   const [typeColors, setTypeColors] = React.useState<Record<string, string | null>>({})
+  const [typeIcons, setTypeIcons] = React.useState<Record<string, string | null>>({})
   const [reloadToken, setReloadToken] = React.useState(0)
 
   const fromTime = range.from.getTime()
@@ -93,18 +96,22 @@ export function useCalendarItems(range: CalendarRange): UseCalendarItemsResult {
       const entries = Array.isArray(call.result?.items) ? call.result.items : []
       const labels: Record<string, string> = {}
       const colors: Record<string, string | null> = {}
+      const icons: Record<string, string | null> = {}
       for (const entry of entries) {
         if (typeof entry?.value !== 'string' || entry.value.length === 0) continue
         labels[entry.value] = typeof entry.label === 'string' && entry.label.length > 0 ? entry.label : entry.value
         colors[entry.value] = typeof entry.color === 'string' && entry.color.length > 0 ? entry.color : null
+        icons[entry.value] = typeof entry.icon === 'string' && entry.icon.length > 0 ? entry.icon : null
       }
       setTypeLabels(labels)
       setTypeColors(colors)
+      setTypeIcons(icons)
     }
     loadActivityTypes().catch(() => {
       if (cancelled || controller.signal.aborted) return
       setTypeLabels({})
       setTypeColors({})
+      setTypeIcons({})
     })
     return () => {
       cancelled = true
@@ -158,5 +165,5 @@ export function useCalendarItems(range: CalendarRange): UseCalendarItemsResult {
     setReloadToken((token) => token + 1)
   }, [])
 
-  return { items, isLoading, error, truncated, typeLabels, typeColors, refetch }
+  return { items, isLoading, error, truncated, typeLabels, typeColors, typeIcons, refetch }
 }

package/src/modules/customers/data/validators.ts

@@ -428,7 +428,9 @@ const interactionParticipantSchema = z.object({
 
 const interactionLinkedEntitySchema = z.object({
   id: z.string().uuid(),
-  type: z.enum(['company', 'deal', 'offer']),
+  // 'resource' links calendar events to bookable resources (rooms, cars,
+  // equipment) from the optional resources module (#3552).
+  type: z.enum(['company', 'deal', 'offer', 'resource']),
   label: z.string().trim().max(500),
 })
 

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

@@ -237,6 +237,8 @@
   "customers.calendar.editor.participants": "Teilnehmer",
   "customers.calendar.editor.phoneLink": "Telefon / Link",
   "customers.calendar.editor.phoneLinkPlaceholder": "Telefonnummer oder Link hinzufügen…",
+  "customers.calendar.editor.phoneSuggestion.add": "Hinzufügen",
+  "customers.calendar.editor.phoneSuggestion.use": "Nummer von {name} verwenden",
   "customers.calendar.editor.priority.high": "Hoch",
   "customers.calendar.editor.priority.label": "Priorität",
   "customers.calendar.editor.priority.low": "Niedrig",
@@ -245,6 +247,7 @@
   "customers.calendar.editor.relatedToPlaceholder": "Personen oder Unternehmen suchen…",
   "customers.calendar.editor.removePerson": "{name} entfernen",
   "customers.calendar.editor.removeRelated": "Verknüpfung entfernen",
+  "customers.calendar.editor.removeResource": "{name} entfernen",
   "customers.calendar.editor.repeat.after": "Nach",
   "customers.calendar.editor.repeat.days.fri": "F",
   "customers.calendar.editor.repeat.days.mon": "M",
@@ -261,6 +264,12 @@
   "customers.calendar.editor.repeat.never": "Nie",
   "customers.calendar.editor.repeat.onDate": "Am Datum",
   "customers.calendar.editor.repeat.times": "Mal",
+  "customers.calendar.editor.resourceTypes.all": "Alle Typen",
+  "customers.calendar.editor.resourceTypes.filterLabel": "Ressourcentyp",
+  "customers.calendar.editor.resourceTypes.moreHint": "{shown} von {total} angezeigt — tippen zum Eingrenzen",
+  "customers.calendar.editor.resourceTypes.searchPlaceholder": "Typen suchen…",
+  "customers.calendar.editor.resources": "Ressourcen",
+  "customers.calendar.editor.resourcesPlaceholder": "Ressource hinzufügen…",
   "customers.calendar.editor.save": "Termin speichern",
   "customers.calendar.editor.saved": "Termin gespeichert",
   "customers.calendar.editor.saving": "Speichern…",
@@ -279,6 +288,7 @@
   "customers.calendar.editor.types.meeting": "Meeting",
   "customers.calendar.editor.types.note": "Notiz",
   "customers.calendar.editor.types.task": "Aufgabe",
+  "customers.calendar.editor.validation.assigneeRequired": "Weise diese Aufgabe einem Teammitglied zu",
   "customers.calendar.editor.validation.endsBeforeStarts": "Das Ende muss nach dem Beginn liegen",
   "customers.calendar.editor.validation.relatedToRequired": "Wähle eine Person oder ein Unternehmen aus, um diesen Termin zu verknüpfen",
   "customers.calendar.editor.validation.titleRequired": "Titel ist erforderlich",
@@ -331,9 +341,9 @@
   "customers.calendar.settings.cancel": "Abbrechen",
   "customers.calendar.settings.close": "Schließen",
   "customers.calendar.settings.conflictScope": "Konfliktbereich",
-  "customers.calendar.settings.conflictScopeAll": "Alle Termine der Organisation",
+  "customers.calendar.settings.conflictScopeAll": "Alle Termine",
   "customers.calendar.settings.conflictScopeHint": "Wählen Sie, wessen Überschneidungen der Kalender als Konflikte kennzeichnet.",
-  "customers.calendar.settings.conflictScopeMine": "Nur meine Termine",
+  "customers.calendar.settings.conflictScopeMine": "Meine Termine",
   "customers.calendar.settings.conflictWarnings": "Konfliktwarnungen",
   "customers.calendar.settings.eventCategories": "Ereigniskategorien",
   "customers.calendar.settings.eventCategoriesHint": "Eigene Gruppierungslabels (z. B. Teammeeting, Verkaufsanruf). Werden beim Erstellen eines Ereignisses angeboten.",

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

@@ -237,6 +237,8 @@
   "customers.calendar.editor.participants": "Participants",
   "customers.calendar.editor.phoneLink": "Phone / link",
   "customers.calendar.editor.phoneLinkPlaceholder": "Add a phone number or link…",
+  "customers.calendar.editor.phoneSuggestion.add": "Add",
+  "customers.calendar.editor.phoneSuggestion.use": "Use {name}’s number",
   "customers.calendar.editor.priority.high": "High",
   "customers.calendar.editor.priority.label": "Priority",
   "customers.calendar.editor.priority.low": "Low",
@@ -245,6 +247,7 @@
   "customers.calendar.editor.relatedToPlaceholder": "Search people or companies…",
   "customers.calendar.editor.removePerson": "Remove {name}",
   "customers.calendar.editor.removeRelated": "Clear related record",
+  "customers.calendar.editor.removeResource": "Remove {name}",
   "customers.calendar.editor.repeat.after": "After",
   "customers.calendar.editor.repeat.days.fri": "F",
   "customers.calendar.editor.repeat.days.mon": "M",
@@ -261,6 +264,12 @@
   "customers.calendar.editor.repeat.never": "Never",
   "customers.calendar.editor.repeat.onDate": "On date",
   "customers.calendar.editor.repeat.times": "times",
+  "customers.calendar.editor.resourceTypes.all": "All types",
+  "customers.calendar.editor.resourceTypes.filterLabel": "Resource type",
+  "customers.calendar.editor.resourceTypes.moreHint": "Showing {shown} of {total} — keep typing to narrow",
+  "customers.calendar.editor.resourceTypes.searchPlaceholder": "Search types…",
+  "customers.calendar.editor.resources": "Resources",
+  "customers.calendar.editor.resourcesPlaceholder": "Add a resource…",
   "customers.calendar.editor.save": "Save event",
   "customers.calendar.editor.saved": "Event saved",
   "customers.calendar.editor.saving": "Saving…",
@@ -279,6 +288,7 @@
   "customers.calendar.editor.types.meeting": "Meeting",
   "customers.calendar.editor.types.note": "Note",
   "customers.calendar.editor.types.task": "Task",
+  "customers.calendar.editor.validation.assigneeRequired": "Assign this task to a team member",
   "customers.calendar.editor.validation.endsBeforeStarts": "End must be after start",
   "customers.calendar.editor.validation.relatedToRequired": "Select a person or company to link this event",
   "customers.calendar.editor.validation.titleRequired": "Title is required",
@@ -331,9 +341,9 @@
   "customers.calendar.settings.cancel": "Cancel",
   "customers.calendar.settings.close": "Close",
   "customers.calendar.settings.conflictScope": "Conflict scope",
-  "customers.calendar.settings.conflictScopeAll": "All org meetings",
+  "customers.calendar.settings.conflictScopeAll": "All meetings",
   "customers.calendar.settings.conflictScopeHint": "Choose whose overlaps the calendar flags as conflicts.",
-  "customers.calendar.settings.conflictScopeMine": "My meetings only",
+  "customers.calendar.settings.conflictScopeMine": "My meetings",
   "customers.calendar.settings.conflictWarnings": "Conflict warnings",
   "customers.calendar.settings.eventCategories": "Event Categories",
   "customers.calendar.settings.eventCategoriesHint": "Your own grouping labels (e.g. Team Meeting, Sales Call). Offered when creating an event.",

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

@@ -237,6 +237,8 @@
   "customers.calendar.editor.participants": "Participantes",
   "customers.calendar.editor.phoneLink": "Teléfono / enlace",
   "customers.calendar.editor.phoneLinkPlaceholder": "Añadir un teléfono o enlace…",
+  "customers.calendar.editor.phoneSuggestion.add": "Añadir",
+  "customers.calendar.editor.phoneSuggestion.use": "Usar el número de {name}",
   "customers.calendar.editor.priority.high": "Alta",
   "customers.calendar.editor.priority.label": "Prioridad",
   "customers.calendar.editor.priority.low": "Baja",
@@ -245,6 +247,7 @@
   "customers.calendar.editor.relatedToPlaceholder": "Buscar personas o empresas…",
   "customers.calendar.editor.removePerson": "Quitar a {name}",
   "customers.calendar.editor.removeRelated": "Quitar el registro vinculado",
+  "customers.calendar.editor.removeResource": "Quitar {name}",
   "customers.calendar.editor.repeat.after": "Después de",
   "customers.calendar.editor.repeat.days.fri": "V",
   "customers.calendar.editor.repeat.days.mon": "L",
@@ -261,6 +264,12 @@
   "customers.calendar.editor.repeat.never": "Nunca",
   "customers.calendar.editor.repeat.onDate": "En fecha",
   "customers.calendar.editor.repeat.times": "veces",
+  "customers.calendar.editor.resourceTypes.all": "Todos los tipos",
+  "customers.calendar.editor.resourceTypes.filterLabel": "Tipo de recurso",
+  "customers.calendar.editor.resourceTypes.moreHint": "Mostrando {shown} de {total} — escribe para acotar",
+  "customers.calendar.editor.resourceTypes.searchPlaceholder": "Buscar tipos…",
+  "customers.calendar.editor.resources": "Recursos",
+  "customers.calendar.editor.resourcesPlaceholder": "Añadir un recurso…",
   "customers.calendar.editor.save": "Guardar evento",
   "customers.calendar.editor.saved": "Evento guardado",
   "customers.calendar.editor.saving": "Guardando…",
@@ -279,6 +288,7 @@
   "customers.calendar.editor.types.meeting": "Reunión",
   "customers.calendar.editor.types.note": "Nota",
   "customers.calendar.editor.types.task": "Tarea",
+  "customers.calendar.editor.validation.assigneeRequired": "Asigna esta tarea a un miembro del equipo",
   "customers.calendar.editor.validation.endsBeforeStarts": "El fin debe ser posterior al inicio",
   "customers.calendar.editor.validation.relatedToRequired": "Selecciona una persona o empresa para vincular este evento",
   "customers.calendar.editor.validation.titleRequired": "El título es obligatorio",
@@ -331,9 +341,9 @@
   "customers.calendar.settings.cancel": "Cancelar",
   "customers.calendar.settings.close": "Cerrar",
   "customers.calendar.settings.conflictScope": "Ámbito de conflictos",
-  "customers.calendar.settings.conflictScopeAll": "Todas las reuniones de la organización",
+  "customers.calendar.settings.conflictScopeAll": "Todas las reuniones",
   "customers.calendar.settings.conflictScopeHint": "Elige qué solapamientos marca el calendario como conflictos.",
-  "customers.calendar.settings.conflictScopeMine": "Solo mis reuniones",
+  "customers.calendar.settings.conflictScopeMine": "Mis reuniones",
   "customers.calendar.settings.conflictWarnings": "Avisos de conflicto",
   "customers.calendar.settings.eventCategories": "Categorías de eventos",
   "customers.calendar.settings.eventCategoriesHint": "Tus propias etiquetas de agrupación (p. ej., Reunión de equipo, Llamada de ventas). Se ofrecen al crear un evento.",

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

@@ -237,6 +237,8 @@
   "customers.calendar.editor.participants": "Uczestnicy",
   "customers.calendar.editor.phoneLink": "Telefon / link",
   "customers.calendar.editor.phoneLinkPlaceholder": "Dodaj numer telefonu lub link…",
+  "customers.calendar.editor.phoneSuggestion.add": "Dodaj",
+  "customers.calendar.editor.phoneSuggestion.use": "Użyj numeru: {name}",
   "customers.calendar.editor.priority.high": "Wysoki",
   "customers.calendar.editor.priority.label": "Priorytet",
   "customers.calendar.editor.priority.low": "Niski",
@@ -245,6 +247,7 @@
   "customers.calendar.editor.relatedToPlaceholder": "Szukaj osób lub firm…",
   "customers.calendar.editor.removePerson": "Usuń {name}",
   "customers.calendar.editor.removeRelated": "Usuń powiązanie",
+  "customers.calendar.editor.removeResource": "Usuń {name}",
   "customers.calendar.editor.repeat.after": "Po",
   "customers.calendar.editor.repeat.days.fri": "P",
   "customers.calendar.editor.repeat.days.mon": "P",
@@ -261,6 +264,12 @@
   "customers.calendar.editor.repeat.never": "Nigdy",
   "customers.calendar.editor.repeat.onDate": "W dniu",
   "customers.calendar.editor.repeat.times": "razy",
+  "customers.calendar.editor.resourceTypes.all": "Wszystkie typy",
+  "customers.calendar.editor.resourceTypes.filterLabel": "Typ zasobu",
+  "customers.calendar.editor.resourceTypes.moreHint": "Pokazano {shown} z {total} — wpisz, aby zawęzić",
+  "customers.calendar.editor.resourceTypes.searchPlaceholder": "Szukaj typów…",
+  "customers.calendar.editor.resources": "Zasoby",
+  "customers.calendar.editor.resourcesPlaceholder": "Dodaj zasób…",
   "customers.calendar.editor.save": "Zapisz wydarzenie",
   "customers.calendar.editor.saved": "Wydarzenie zapisane",
   "customers.calendar.editor.saving": "Zapisywanie…",
@@ -279,6 +288,7 @@
   "customers.calendar.editor.types.meeting": "Spotkanie",
   "customers.calendar.editor.types.note": "Notatka",
   "customers.calendar.editor.types.task": "Zadanie",
+  "customers.calendar.editor.validation.assigneeRequired": "Przypisz to zadanie do członka zespołu",
   "customers.calendar.editor.validation.endsBeforeStarts": "Zakończenie musi być po rozpoczęciu",
   "customers.calendar.editor.validation.relatedToRequired": "Wybierz osobę lub firmę, aby powiązać to wydarzenie",
   "customers.calendar.editor.validation.titleRequired": "Tytuł jest wymagany",
@@ -331,9 +341,9 @@
   "customers.calendar.settings.cancel": "Anuluj",
   "customers.calendar.settings.close": "Zamknij",
   "customers.calendar.settings.conflictScope": "Zakres konfliktów",
-  "customers.calendar.settings.conflictScopeAll": "Wszystkie spotkania organizacji",
+  "customers.calendar.settings.conflictScopeAll": "Wszystkie spotkania",
   "customers.calendar.settings.conflictScopeHint": "Wybierz, które nakładające się terminy kalendarz oznacza jako konflikty.",
-  "customers.calendar.settings.conflictScopeMine": "Tylko moje spotkania",
+  "customers.calendar.settings.conflictScopeMine": "Moje spotkania",
   "customers.calendar.settings.conflictWarnings": "Ostrzeżenia o konfliktach",
   "customers.calendar.settings.eventCategories": "Kategorie wydarzeń",
   "customers.calendar.settings.eventCategoriesHint": "Twoje własne etykiety grupujące (np. Spotkanie zespołu, Telefon sprzedażowy). Pojawiają się podczas tworzenia wydarzenia.",

package/src/modules/customers/lib/calendar/editorPayload.ts

@@ -45,46 +45,47 @@ export function editorKindOfInteractionType(interactionType: string): EditorKind
   return KIND_BY_INTERACTION_TYPE[interactionType] ?? 'meeting'
 }
 
-export type EditorCategoryOption = { value: string; label: string }
+export type EditorTypeOption = { value: string; label: string; icon: string | null }
+
+/** Fallback switcher icons matching the seeded dictionary appearance icons. */
+export const EDITOR_KIND_ICONS: Record<EditorKind, string> = {
+  meeting: 'lucide:users',
+  call: 'lucide:phone-call',
+  email: 'lucide:mail',
+  note: 'lucide:notebook',
+  event: 'lucide:calendar',
+  task: 'lucide:check-square',
+}
 
 /**
- * Builds the editor's Category quick-pick options from the tenant dictionary and
- * the user's calendar preferences:
- * - `surfacedTypes` (settings "Activity Types") filters which dictionary types are
- *   offered — a non-empty list keeps only matching labels; empty means "show all".
- * - `eventCategories` (settings "Event Categories") add custom quick-pick labels.
- * Dictionary entries keep their canonical key as the value (so category→tab/tint
- * mapping is preserved); custom labels use the label as the value.
+ * Builds the editor's type-switcher options from the tenant `activity-types`
+ * dictionary (#3552) so tenant-added types are first-class calendar event types,
+ * not just Category values. Field morphology per option resolves through
+ * `editorKindOfInteractionType` (custom types get the meeting-shaped default).
+ * Falls back to the built-in kinds when the dictionary is empty/unavailable,
+ * and always includes the currently selected value (e.g. a since-deleted type
+ * on an existing event). Icons come from the dictionary entry appearance with
+ * the seeded kind icons as fallback.
  */
-export function buildEditorCategoryOptions(params: {
+export function buildEditorTypeOptions(params: {
   typeLabels: Record<string, string>
-  surfacedTypes: string[]
-  eventCategories: string[]
+  typeIcons?: Record<string, string | null>
   selectedValue: string
-  selectedFallbackLabel: string
-}): EditorCategoryOption[] {
-  const { typeLabels, surfacedTypes, eventCategories, selectedValue, selectedFallbackLabel } = params
-  const dictionaryOptions: EditorCategoryOption[] = Object.entries(typeLabels).map(([value, label]) => ({ value, label }))
-  const surfacedSet = new Set(surfacedTypes)
-  const filtered =
-    surfacedTypes.length > 0
-      ? dictionaryOptions.filter((option) => surfacedSet.has(option.label))
-      : dictionaryOptions
-  const options = [...filtered]
-  const knownLabels = new Set(options.map((option) => option.label))
-  const knownValues = new Set(options.map((option) => option.value))
-  const customLabels: string[] = []
-  for (const label of [...eventCategories, ...surfacedTypes]) {
-    const trimmed = label.trim()
-    if (!trimmed || knownLabels.has(trimmed) || customLabels.includes(trimmed)) continue
-    customLabels.push(trimmed)
-  }
-  for (const label of customLabels) {
-    options.push({ value: label, label })
-    knownValues.add(label)
-  }
-  if (!knownValues.has(selectedValue)) {
-    options.unshift({ value: selectedValue, label: typeLabels[selectedValue] ?? selectedFallbackLabel })
+  kindLabels: Record<EditorKind, string>
+}): EditorTypeOption[] {
+  const { typeLabels, typeIcons, selectedValue, kindLabels } = params
+  const iconOf = (value: string): string | null =>
+    typeIcons?.[value] ?? EDITOR_KIND_ICONS[editorKindOfInteractionType(value)] ?? null
+  const dictionaryEntries = Object.entries(typeLabels)
+  const options: EditorTypeOption[] = dictionaryEntries.length
+    ? dictionaryEntries.map(([value, label]) => ({ value, label, icon: iconOf(value) }))
+    : EDITOR_KINDS.map((kind) => ({ value: kind, label: kindLabels[kind], icon: EDITOR_KIND_ICONS[kind] }))
+  if (!options.some((option) => option.value === selectedValue)) {
+    options.unshift({
+      value: selectedValue,
+      label: typeLabels[selectedValue] ?? kindLabels[editorKindOfInteractionType(selectedValue)] ?? selectedValue,
+      icon: iconOf(selectedValue),
+    })
   }
   return options
 }
@@ -117,6 +118,31 @@ export type EditorParticipant = {
   isCustomer: boolean
 }
 
+/** linkedEntities `type` marker for resource assignments (FK-id + label snapshot). */
+export const RESOURCE_LINK_TYPE = 'resource'
+
+export type EditorLinkedEntity = { id: string; type: string; label: string }
+
+export type EditorResource = { id: string; label: string }
+
+export function parseLinkedEntities(raw: unknown): {
+  resources: EditorResource[]
+  preservedLinkedEntities: EditorLinkedEntity[]
+} {
+  const resources: EditorResource[] = []
+  const preservedLinkedEntities: EditorLinkedEntity[] = []
+  if (!Array.isArray(raw)) return { resources, preservedLinkedEntities }
+  for (const entry of raw) {
+    if (!entry || typeof entry !== 'object') continue
+    const { id, type, label } = entry as Record<string, unknown>
+    if (typeof id !== 'string' || !id.length || typeof type !== 'string' || !type.length) continue
+    const safeLabel = typeof label === 'string' ? label : ''
+    if (type === RESOURCE_LINK_TYPE) resources.push({ id, label: safeLabel || id })
+    else preservedLinkedEntities.push({ id, type, label: safeLabel })
+  }
+  return { resources, preservedLinkedEntities }
+}
+
 export type EditorFormState = {
   kind: EditorKind
   title: string
@@ -136,6 +162,8 @@ export type EditorFormState = {
   category: string | null
   location: string
   participants: EditorParticipant[]
+  resources: EditorResource[]
+  preservedLinkedEntities: EditorLinkedEntity[]
   assigneeUserId: string | null
   assigneeName: string | null
   priority: EditorPriority
@@ -225,6 +253,8 @@ export function createDefaultFormState(
     category: null,
     location: '',
     participants: [],
+    resources: [],
+    preservedLinkedEntities: [],
     assigneeUserId: null,
     assigneeName: null,
     priority: 'medium',
@@ -260,7 +290,22 @@ export function computeDurationMinutes(state: EditorFormState): number | null {
   return minutes > 0 ? minutes : null
 }
 
-export type BuildPayloadOptions = { mode: 'create' | 'edit'; id?: string }
+export type BuildPayloadOptions = {
+  mode: 'create' | 'edit'
+  id?: string
+  /**
+   * When the resources module is loaded the payload owns `linkedEntities`
+   * (preserved non-resource links + current resource assignments). When it is
+   * not, the key is omitted entirely so edits never clobber links written by
+   * other surfaces.
+   */
+  resourcesEnabled?: boolean
+  /**
+   * When the staff module is absent the Assignee field is hidden, so the
+   * payload omits `ownerUserId` (edit keeps the stored owner untouched).
+   */
+  staffEnabled?: boolean
+}
 
 export function buildInteractionPayload(state: EditorFormState, options: BuildPayloadOptions): Record<string, unknown> {
   const config = KIND_CONFIG[state.kind]
@@ -296,8 +341,17 @@ export function buildInteractionPayload(state: EditorFormState, options: BuildPa
           }))
         : null,
   }
-  if (config.people === 'assignee') payload.ownerUserId = state.assigneeUserId ?? null
+  if (config.people === 'assignee' && (options.staffEnabled ?? true)) {
+    payload.ownerUserId = state.assigneeUserId ?? null
+  }
   if (config.hasPriority) payload.priority = PRIORITY_NUMBER[state.priority]
+  if (options.resourcesEnabled) {
+    const linkedEntities: EditorLinkedEntity[] = [
+      ...state.preservedLinkedEntities,
+      ...state.resources.map((resource) => ({ id: resource.id, type: RESOURCE_LINK_TYPE, label: resource.label })),
+    ]
+    payload.linkedEntities = linkedEntities.length > 0 ? linkedEntities : null
+  }
   return payload
 }
 
@@ -364,6 +418,7 @@ function parseParticipants(item: CalendarItem): EditorParticipant[] {
 export function parseItemToFormState(item: CalendarItem): EditorFormState {
   const kind = editorKindOfInteractionType(item.interactionType)
   const raw = item.raw as Record<string, unknown>
+  const { resources, preservedLinkedEntities } = parseLinkedEntities(raw.linkedEntities)
   return {
     kind,
     title: item.title,
@@ -379,6 +434,8 @@ export function parseItemToFormState(item: CalendarItem): EditorFormState {
     category: item.interactionType,
     location: item.location ?? '',
     participants: parseParticipants(item),
+    resources,
+    preservedLinkedEntities,
     assigneeUserId: item.ownerUserId,
     assigneeName: null,
     priority: priorityFromNumber(readUnknownNumber(raw.priority)),

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

@@ -475,7 +475,7 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
           setOrderDirty(true)
         }}
         orderNotice={orderDirty ? { dirty: true, saving: orderSaving, message: 'Reordered — will auto-save on blur' } : undefined}
-        addButtonLabel="Add Field"
+        addButtonLabel={t('entities.customFields.editor.addField', 'Add Field')}
         translate={t}
         listRef={listRef}
         listProps={{

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

@@ -1,6 +1,126 @@
 {
   "entities.customFields.addFirst": "Erstes hinzufügen",
   "entities.customFields.defaultFieldset": "Standard",
+  "entities.customFields.editor.active": "Aktiv",
+  "entities.customFields.editor.add": "Hinzufügen",
+  "entities.customFields.editor.addField": "Feld hinzufügen",
+  "entities.customFields.editor.addFirstFieldset": "Erste Feldgruppe hinzufügen",
+  "entities.customFields.editor.addOption": "Option hinzufügen",
+  "entities.customFields.editor.addOptionDescription": "Geben Sie den gespeicherten Wert und optional eine für Benutzer sichtbare Beschriftung an.",
+  "entities.customFields.editor.addRule": "Regel hinzufügen",
+  "entities.customFields.editor.assignToFieldset": "Feldgruppe zuweisen",
+  "entities.customFields.editor.cancel": "Abbrechen",
+  "entities.customFields.editor.code": "Code",
+  "entities.customFields.editor.createGroup": "Gruppe erstellen",
+  "entities.customFields.editor.defaultOption": "Standard",
+  "entities.customFields.editor.delete": "Löschen",
+  "entities.customFields.editor.deleteFieldsetText": "Die zugehörigen Felder werden zu „Nicht zugewiesen“ verschoben.",
+  "entities.customFields.editor.deleteFieldsetTitle": "Feldgruppe „{code}“ löschen?",
+  "entities.customFields.editor.deleteGroupAria": "{code} löschen",
+  "entities.customFields.editor.description": "Beschreibung",
+  "entities.customFields.editor.dragToReorder": "Zum Neuanordnen ziehen",
+  "entities.customFields.editor.editGroup": "Gruppe bearbeiten",
+  "entities.customFields.editor.editGroupAria": "{code} bearbeiten",
+  "entities.customFields.editor.editGroupDescription": "Aktualisieren Sie die ausgewählte Gruppe dieser Feldgruppe.",
+  "entities.customFields.editor.editGroups": "Gruppen bearbeiten",
+  "entities.customFields.editor.editor": "Editor",
+  "entities.customFields.editor.editorHtmlRichText": "HTML-Rich-Text",
+  "entities.customFields.editor.editorMarkdown": "Markdown (UIW)",
+  "entities.customFields.editor.editorSimpleMarkdown": "Einfaches Markdown",
+  "entities.customFields.editor.existingGroups": "Vorhandene Gruppen",
+  "entities.customFields.editor.group": "Gruppe",
+  "entities.customFields.editor.groupCode": "Gruppencode",
+  "entities.customFields.editor.groupCodePlaceholder": "z. B. einkaufsgremium",
+  "entities.customFields.editor.groupCodeRequired": "Der Gruppencode ist erforderlich.",
+  "entities.customFields.editor.groupHintPlaceholder": "Sichtbar für Merchandiser",
+  "entities.customFields.editor.groupLabelPlaceholder": "Einkaufsgremium",
+  "entities.customFields.editor.hint": "Hinweis",
+  "entities.customFields.editor.icon": "Symbol",
+  "entities.customFields.editor.iconOption.bookOpen": "Aufgeschlagenes Buch",
+  "entities.customFields.editor.iconOption.bookmark": "Lesezeichen",
+  "entities.customFields.editor.iconOption.briefcase": "Aktentasche",
+  "entities.customFields.editor.iconOption.building": "Gebäude",
+  "entities.customFields.editor.iconOption.camera": "Kamera",
+  "entities.customFields.editor.iconOption.car": "Auto",
+  "entities.customFields.editor.iconOption.clock": "Uhr",
+  "entities.customFields.editor.iconOption.cloud": "Wolke",
+  "entities.customFields.editor.iconOption.coins": "Münzen",
+  "entities.customFields.editor.iconOption.compass": "Kompass",
+  "entities.customFields.editor.iconOption.creditCard": "Kreditkarte",
+  "entities.customFields.editor.iconOption.database": "Datenbank",
+  "entities.customFields.editor.iconOption.flame": "Flamme",
+  "entities.customFields.editor.iconOption.gift": "Geschenk",
+  "entities.customFields.editor.iconOption.globe": "Globus",
+  "entities.customFields.editor.iconOption.grid": "Raster",
+  "entities.customFields.editor.iconOption.heart": "Herz",
+  "entities.customFields.editor.iconOption.key": "Schlüssel",
+  "entities.customFields.editor.iconOption.layers": "Ebenen",
+  "entities.customFields.editor.iconOption.map": "Karte",
+  "entities.customFields.editor.iconOption.package": "Paket",
+  "entities.customFields.editor.iconOption.palette": "Palette",
+  "entities.customFields.editor.iconOption.shield": "Schild",
+  "entities.customFields.editor.iconOption.shirt": "Hemd",
+  "entities.customFields.editor.iconOption.shoppingBag": "Einkaufstasche",
+  "entities.customFields.editor.iconOption.shoppingCart": "Einkaufswagen",
+  "entities.customFields.editor.iconOption.sparkles": "Funkeln",
+  "entities.customFields.editor.iconOption.star": "Stern",
+  "entities.customFields.editor.iconOption.store": "Geschäft",
+  "entities.customFields.editor.iconOption.tag": "Etikett",
+  "entities.customFields.editor.iconOption.truck": "Lkw",
+  "entities.customFields.editor.iconOption.users": "Benutzer",
+  "entities.customFields.editor.iconOption.zap": "Blitz",
+  "entities.customFields.editor.key": "Schlüssel",
+  "entities.customFields.editor.kind": "Typ",
+  "entities.customFields.editor.kindOption.attachment": "Anhang",
+  "entities.customFields.editor.kindOption.boolean": "Boolescher Wert",
+  "entities.customFields.editor.kindOption.currency": "Währung",
+  "entities.customFields.editor.kindOption.date": "Datum",
+  "entities.customFields.editor.kindOption.datetime": "Datum und Uhrzeit",
+  "entities.customFields.editor.kindOption.dictionary": "Wörterbuch",
+  "entities.customFields.editor.kindOption.float": "Dezimalzahl",
+  "entities.customFields.editor.kindOption.integer": "Ganzzahl",
+  "entities.customFields.editor.kindOption.multiline": "Mehrzeiliger Text",
+  "entities.customFields.editor.kindOption.relation": "Relation",
+  "entities.customFields.editor.kindOption.select": "Auswahlliste",
+  "entities.customFields.editor.kindOption.text": "Text",
+  "entities.customFields.editor.label": "Beschriftung",
+  "entities.customFields.editor.listboxSearchable": "Liste (durchsuchbar)",
+  "entities.customFields.editor.multiSelectInputStyle": "Stil des Mehrfachauswahlfelds",
+  "entities.customFields.editor.multiple": "Mehrere Werte",
+  "entities.customFields.editor.newFieldsetLabel": "Neue Feldgruppe",
+  "entities.customFields.editor.newGroup": "Neue Gruppe",
+  "entities.customFields.editor.newGroupDescription": "Fügen Sie eine wiederverwendbare Gruppe für diese Feldgruppe hinzu.",
+  "entities.customFields.editor.noFieldsets": "Noch keine Feldgruppen definiert. Mit Feldgruppen lassen sich benutzerdefinierte Felder für verschiedene Varianten derselben Entität gruppieren (z. B. Mode- vs. Sportprodukte).",
+  "entities.customFields.editor.noGroup": "Keine Gruppe",
+  "entities.customFields.editor.noOptionsDefined": "Keine Optionen definiert.",
+  "entities.customFields.editor.noValidationRules": "Keine Validierungsregeln definiert.",
+  "entities.customFields.editor.optionLabelPlaceholder": "Für Benutzer sichtbare Beschriftung (optional)",
+  "entities.customFields.editor.options": "Optionen",
+  "entities.customFields.editor.optionsSource": "Optionsquelle",
+  "entities.customFields.editor.optionsUrl": "Options-URL",
+  "entities.customFields.editor.relatedEntityId": "ID der verknüpften Entität",
+  "entities.customFields.editor.removeField": "Feld entfernen",
+  "entities.customFields.editor.removeOption": "Option entfernen",
+  "entities.customFields.editor.removeRule": "Regel entfernen",
+  "entities.customFields.editor.reorderedSavingSoon": "Neu angeordnet — wird gleich gespeichert",
+  "entities.customFields.editor.restoreDeletedFields": "Gelöschte Felder wiederherstellen:",
+  "entities.customFields.editor.ruleErrorMessagePlaceholder": "Fehlermeldung",
+  "entities.customFields.editor.ruleNumberPlaceholder": "Zahl",
+  "entities.customFields.editor.rulePatternPlaceholder": "Muster (z. B. ^[a-z]+$)",
+  "entities.customFields.editor.ruleRequiredMessage": "Dieses Feld ist erforderlich",
+  "entities.customFields.editor.saveGroup": "Gruppe speichern",
+  "entities.customFields.editor.savingOrder": "Reihenfolge wird gespeichert…",
+  "entities.customFields.editor.singleFieldsetPerEntity": "Eine Feldgruppe pro Entität",
+  "entities.customFields.editor.singleFieldsetToggleHint": "(fügen Sie mindestens zwei Feldgruppen hinzu, um umzuschalten)",
+  "entities.customFields.editor.supportedKindsNote": "Unterstützte Typen: Text, mehrzeiliger Text, Ganzzahl, Dezimalzahl, boolescher Wert, Auswahlliste (mit Optionen/optionsUrl), Währung (feste Währungsliste), Relation (mit verknüpfter Entität und Options-URL).",
+  "entities.customFields.editor.translateField": "Feld übersetzen",
+  "entities.customFields.editor.unassigned": "Nicht zugewiesen",
+  "entities.customFields.editor.unassignedFields": "Nicht zugewiesene Felder",
+  "entities.customFields.editor.unitsOptional": "Einheiten (optional)",
+  "entities.customFields.editor.unitsPlaceholder": "kg, cm usw.",
+  "entities.customFields.editor.validationRules": "Validierungsregeln",
+  "entities.customFields.editor.value": "Wert",
+  "entities.customFields.editor.valueRequired": "Der Wert ist erforderlich",
   "entities.customFields.empty": "Noch keine benutzerdefinierten Attribute definiert.",
   "entities.customFields.emptyFieldset": "Für diese Feldgruppe sind keine Felder definiert.",
   "entities.customFields.errors.deleteFailed": "Feld konnte nicht gelöscht werden.",