@open-mercato/core 0.10.1-develop.7668.1.3aa8463bd8 → 0.10.1-develop.7670.1.7b5ad74924

package/dist/modules/customers/components/detail/schedule/useScheduleFormState.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { isDateRequired } from "./fieldConfig.js";
+import { isDateRequired, resolveScheduleActivityType } from "./fieldConfig.js";
 const PARTICIPANT_COLORS = [
   "bg-chart-emerald",
   "bg-chart-blue",
@@ -74,8 +74,9 @@ function useScheduleFormState({ open, editData }) {
   React.useEffect(() => {
     if (open) {
       if (editData) {
-        const resolvedType = editData.interactionType ?? "meeting";
-        setActivityType(resolvedType);
+        const rawType = editData.interactionType ?? "meeting";
+        const resolvedType = resolveScheduleActivityType(rawType);
+        setActivityType(rawType);
         setTitle(editData.title ?? "");
         const sourceTimestamp = editData.scheduledAt ?? editData.occurredAt ?? null;
         const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : null;
@@ -168,7 +169,7 @@ function useScheduleFormState({ open, editData }) {
     }
     if (lastReminderTypeRef.current === activityType) return;
     lastReminderTypeRef.current = activityType;
-    setReminderMinutes(DEFAULT_REMINDER_MINUTES[activityType]);
+    setReminderMinutes(DEFAULT_REMINDER_MINUTES[resolveScheduleActivityType(activityType)]);
   }, [activityType, isEditing, open]);
   const removeParticipant = React.useCallback((index) => {
     setParticipants((prev) => prev.filter((_, i) => i !== index));

package/dist/modules/customers/components/detail/schedule/useScheduleFormState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/customers/components/detail/schedule/useScheduleFormState.ts"],
-  "sourcesContent": ["import * as React from 'react'\nimport type { ActivityType } from './fieldConfig'\nimport { isDateRequired } from './fieldConfig'\n\nexport type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'\n\nexport type Participant = {\n  userId?: string\n  name: string\n  email?: string\n  color?: string\n  status?: RsvpStatus\n}\n\nexport type LinkedEntity = {\n  id: string\n  type: 'company' | 'deal' | 'offer'\n  label: string\n}\n\nexport type ScheduleActivityEditData = {\n  id: string\n  /** Record version for the OSS optimistic-lock header on edit (#2055). */\n  updatedAt?: string | null\n  /**\n   * The activity's own linked person/company id, captured at edit time. Callers\n   * that show activities from more than one entity (e.g. the deal detail page's\n   * multi-entity activity list) must set this so `ScheduleActivityDialog` keeps\n   * the edit payload's `entityId` pinned to the activity's actual record instead\n   * of whichever entity happens to be selected in the host page's picker (#6050).\n   */\n  entityId?: string | null\n  interactionType?: string\n  title?: string | null\n  body?: string | null\n  scheduledAt?: string | null\n  /**\n   * Historical timestamp for completed activities (status `done`). Required for\n   * the edit prefill to restore the original date/time instead of falling back\n   * to \"today\" (#1807).\n   */\n  occurredAt?: string | null\n  durationMinutes?: number | null\n  /** Interaction priority column (0-100, nullable) backing the task priority control (#5943). */\n  priority?: number | null\n  location?: string | null\n  allDay?: boolean | null\n  recurrenceRule?: string | null\n  recurrenceEnd?: string | null\n  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null\n  reminderMinutes?: number | null\n  visibility?: string | null\n  linkedEntities?: Array<{ id: string; type: string; label: string }> | null\n  guestPermissions?: { canInviteOthers?: boolean; canModify?: boolean; canSeeList?: boolean } | null\n}\n\nexport const PARTICIPANT_COLORS = [\n  'bg-chart-emerald',\n  'bg-chart-blue',\n  'bg-chart-orange',\n  'bg-chart-violet',\n  'bg-chart-pink',\n  'bg-chart-teal',\n]\n\n// Per-Figma defaults for the Reminder dropdown when the user picks an activity\n// type. Meeting/email keep the standard 15 min; tasks default to 1 day (1440 min)\n// because they're plan-ahead artefacts; calls default to 5 min as a stand-in for\n// the Figma \"After call ends\" treatment (which would need a non-numeric sentinel\n// in the API contract \u2014 tracked as a follow-up).\nconst DEFAULT_REMINDER_MINUTES: Record<ActivityType, number> = {\n  meeting: 15,\n  call: 5,\n  task: 1440,\n  email: 15,\n  note: 15,\n}\n\n// Create-mode date/time defaults. A fixed morning slot made every activity opened\n// later in the day start in the past, so the seed is always computed forward from\n// \"now\" (#5940): tasks are plan-ahead artefacts and default to the end of the\n// working day, everything else to the next half-hour slot.\nconst DEFAULT_SLOT_MINUTES = 30\nconst TASK_DEFAULT_HOUR = 17\nconst NEXT_DAY_START_HOUR = 9\n\nfunction padDatePart(value: number): string {\n  return String(value).padStart(2, '0')\n}\n\nfunction isSameLocalDay(left: Date, right: Date): boolean {\n  return (\n    left.getFullYear() === right.getFullYear() &&\n    left.getMonth() === right.getMonth() &&\n    left.getDate() === right.getDate()\n  )\n}\n\nfunction nextSlotAfter(now: Date): Date {\n  const next = new Date(now)\n  next.setSeconds(0, 0)\n  next.setMinutes(next.getMinutes() + (DEFAULT_SLOT_MINUTES - (next.getMinutes() % DEFAULT_SLOT_MINUTES)))\n  if (!isSameLocalDay(next, now)) {\n    next.setHours(NEXT_DAY_START_HOUR, 0, 0, 0)\n  }\n  return next\n}\n\n/**\n * Default start moment for a newly created activity of `type`, always strictly\n * after `now` so a brand-new record is never born overdue (#5940).\n */\nexport function resolveDefaultActivityStart(type: ActivityType, now: Date): Date {\n  if (type === 'task') {\n    const endOfWorkingDay = new Date(now)\n    endOfWorkingDay.setHours(TASK_DEFAULT_HOUR, 0, 0, 0)\n    if (endOfWorkingDay.getTime() > now.getTime()) return endOfWorkingDay\n  }\n  return nextSlotAfter(now)\n}\n\nfunction formatLocalDateInput(date: Date): string {\n  return `${date.getFullYear()}-${padDatePart(date.getMonth() + 1)}-${padDatePart(date.getDate())}`\n}\n\nfunction formatLocalTimeInput(date: Date): string {\n  return `${padDatePart(date.getHours())}:${padDatePart(date.getMinutes())}`\n}\n\ninterface UseScheduleFormStateParams {\n  open: boolean\n  editData: ScheduleActivityEditData | null | undefined\n}\n\nexport function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {\n  // An empty `id` is the menu-driven \"New X\" convention \u2014 a create with a preset\n  // type, not an edit. The save path already reads it this way (`isSaveEdit`), so\n  // the seeding below must agree or new records inherit edit-mode fallbacks (#5940).\n  const isEditing = Boolean(editData?.id)\n  const [initialStart] = React.useState(() => resolveDefaultActivityStart('meeting', new Date()))\n  const [activityType, setActivityType] = React.useState<ActivityType>('meeting')\n  const [title, setTitle] = React.useState('')\n  const [date, setDate] = React.useState(() => formatLocalDateInput(initialStart))\n  const [startTime, setStartTime] = React.useState(() => formatLocalTimeInput(initialStart))\n  const [duration, setDuration] = React.useState(30)\n  const [allDay, setAllDay] = React.useState(false)\n  const [description, setDescription] = React.useState('')\n  const [markdownEnabled, setMarkdownEnabled] = React.useState(true)\n  const [location, setLocation] = React.useState('')\n  const [reminderMinutes, setReminderMinutes] = React.useState(15)\n  const [visibility, setVisibility] = React.useState('team')\n  const [participants, setParticipants] = React.useState<Participant[]>([])\n  const [linkedEntities, setLinkedEntities] = React.useState<LinkedEntity[]>([])\n  const [recurrenceEnabled, setRecurrenceEnabled] = React.useState(false)\n  const [recurrenceDays, setRecurrenceDays] = React.useState<boolean[]>([true, false, true, false, false, false, false])\n  const [recurrenceEndType, setRecurrenceEndType] = React.useState<'never' | 'count' | 'date'>('never')\n  const [recurrenceCount, setRecurrenceCount] = React.useState(8)\n  const [recurrenceEndDate, setRecurrenceEndDate] = React.useState('')\n  const [conflict, setConflict] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const [guestPermissions, setGuestPermissions] = React.useState({ canInviteOthers: true, canModify: false, canSeeList: true })\n\n  React.useEffect(() => {\n    if (open) {\n      if (editData) {\n        // Edit mode: populate from existing interaction\n        const resolvedType = (editData.interactionType as ActivityType) ?? 'meeting'\n        setActivityType(resolvedType)\n        setTitle(editData.title ?? '')\n        // `scheduledAt` is the canonical term of anything that was ever planned, so it\n        // wins whenever it is set: the save path recomputes `scheduledAt` from these\n        // seeded date/time fields, and seeding from `occurredAt` first silently\n        // overwrote a completed task's due date on unrelated edits (#5939).\n        // `occurredAt` stays the fallback for purely historical entries (a logged call\n        // or note) that never had a `scheduledAt`, so editing those still restores\n        // their actual moment instead of falling back to \"today\" (#1807).\n        // Keep seed values in the user's local timezone, matching the cluster-E\n        // local-day convention.\n        const sourceTimestamp = editData.scheduledAt ?? editData.occurredAt ?? null\n        const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : null\n        const seedDateValid = seedDate !== null && !Number.isNaN(seedDate.getTime())\n        // A real edit of an undated task must stay undated: falling back to a\n        // computed default here would silently give a backlog item a due date on\n        // the next save (#5941). Menu-driven \"New Task\" (no id yet, so `isEditing`\n        // is false) still gets the create-mode default so #5940's forward-seeded\n        // default keeps working.\n        if (isEditing && !seedDateValid && !isDateRequired(resolvedType)) {\n          setDate('')\n          setStartTime('')\n        } else {\n          const dateForForm = seedDateValid ? (seedDate as Date) : resolveDefaultActivityStart(resolvedType, new Date())\n          setDate(formatLocalDateInput(dateForForm))\n          setStartTime(formatLocalTimeInput(dateForForm))\n        }\n        setDuration(editData.durationMinutes ?? 30)\n        setAllDay(editData.allDay ?? false)\n        setDescription(editData.body ?? '')\n        setLocation(editData.location ?? '')\n        // Use per-type default when the editData omits an explicit reminder\n        // (the menu-driven \"New X\" flow opens the dialog with `reminderMinutes: null`).\n        setReminderMinutes(editData.reminderMinutes ?? DEFAULT_REMINDER_MINUTES[resolvedType])\n        setVisibility(editData.visibility ?? 'team')\n        setParticipants(\n          Array.isArray(editData.participants)\n            ? editData.participants.map((p, i) => ({\n                userId: p.userId,\n                name: p.name ?? p.email ?? p.userId ?? '',\n                email: p.email,\n                color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],\n                status: (p.status ?? 'pending') as RsvpStatus,\n              }))\n            : [],\n        )\n        setLinkedEntities(\n          Array.isArray(editData.linkedEntities)\n            ? editData.linkedEntities.map((e) => ({ id: e.id, type: e.type as LinkedEntity['type'], label: e.label }))\n            : [],\n        )\n        if (editData.recurrenceRule) {\n          setRecurrenceEnabled(true)\n          // Parse RRULE to set days and end type\n          const rule = editData.recurrenceRule\n          const byDayMatch = rule.match(/BYDAY=([A-Z,]+)/)\n          if (byDayMatch) {\n            const dayNames = ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU']\n            const activeDays = byDayMatch[1].split(',')\n            setRecurrenceDays(dayNames.map((d) => activeDays.includes(d)))\n          }\n          const countMatch = rule.match(/COUNT=(\\d+)/)\n          const untilMatch = rule.match(/UNTIL=(\\d{8})/)\n          if (countMatch) {\n            setRecurrenceEndType('count')\n            setRecurrenceCount(Number(countMatch[1]))\n          } else if (untilMatch) {\n            setRecurrenceEndType('date')\n            const raw = untilMatch[1]\n            setRecurrenceEndDate(`${raw.slice(0, 4)}-${raw.slice(4, 6)}-${raw.slice(6, 8)}`)\n          } else {\n            setRecurrenceEndType('never')\n          }\n        } else {\n          setRecurrenceEnabled(false)\n        }\n        if (editData.guestPermissions) {\n          setGuestPermissions({\n            canInviteOthers: editData.guestPermissions.canInviteOthers ?? true,\n            canModify: editData.guestPermissions.canModify ?? false,\n            canSeeList: editData.guestPermissions.canSeeList ?? true,\n          })\n        }\n      } else {\n        // Create mode: reset all fields\n        const defaultStart = resolveDefaultActivityStart('meeting', new Date())\n        setActivityType('meeting')\n        setTitle('')\n        setDate(formatLocalDateInput(defaultStart))\n        setStartTime(formatLocalTimeInput(defaultStart))\n        setDuration(30)\n        setAllDay(false)\n        setDescription('')\n        setLocation('')\n        setReminderMinutes(DEFAULT_REMINDER_MINUTES.meeting)\n        setVisibility('team')\n        setParticipants([])\n        setLinkedEntities([])\n        setRecurrenceEnabled(false)\n      }\n      setConflict(null)\n    }\n    return () => {\n      // Safety net: restore body scroll if Radix Dialog fails to clean up\n      document.body.style.removeProperty('overflow')\n      document.body.style.removeProperty('pointer-events')\n    }\n  }, [open, editData, isEditing])\n\n  // Update the Reminder default when the activity type changes in create mode.\n  // Skipped in edit mode (the persisted value wins), and gated by `open` to\n  // avoid flipping the default in a closed-but-mounted dialog.\n  const lastReminderTypeRef = React.useRef<ActivityType>('meeting')\n  React.useEffect(() => {\n    if (!open || isEditing) {\n      lastReminderTypeRef.current = activityType\n      return\n    }\n    if (lastReminderTypeRef.current === activityType) return\n    lastReminderTypeRef.current = activityType\n    setReminderMinutes(DEFAULT_REMINDER_MINUTES[activityType])\n  }, [activityType, isEditing, open])\n\n  const removeParticipant = React.useCallback((index: number) => {\n    setParticipants((prev) => prev.filter((_, i) => i !== index))\n  }, [])\n\n  const toggleRecurrenceDay = React.useCallback((index: number) => {\n    setRecurrenceDays((prev) => {\n      const next = [...prev]\n      next[index] = !next[index]\n      return next\n    })\n  }, [])\n\n  return {\n    activityType,\n    setActivityType,\n    title,\n    setTitle,\n    date,\n    setDate,\n    startTime,\n    setStartTime,\n    duration,\n    setDuration,\n    allDay,\n    setAllDay,\n    description,\n    setDescription,\n    markdownEnabled,\n    setMarkdownEnabled,\n    location,\n    setLocation,\n    reminderMinutes,\n    setReminderMinutes,\n    visibility,\n    setVisibility,\n    participants,\n    setParticipants,\n    linkedEntities,\n    setLinkedEntities,\n    recurrenceEnabled,\n    setRecurrenceEnabled,\n    recurrenceDays,\n    setRecurrenceDays,\n    recurrenceEndType,\n    setRecurrenceEndType,\n    recurrenceCount,\n    setRecurrenceCount,\n    recurrenceEndDate,\n    setRecurrenceEndDate,\n    conflict,\n    setConflict,\n    saving,\n    setSaving,\n    guestPermissions,\n    setGuestPermissions,\n    removeParticipant,\n    toggleRecurrenceDay,\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import * as React from 'react'\nimport type { ActivityType } from './fieldConfig'\nimport { isDateRequired, resolveScheduleActivityType } from './fieldConfig'\n\nexport type RsvpStatus = 'pending' | 'accepted' | 'declined' | 'tentative'\n\nexport type Participant = {\n  userId?: string\n  name: string\n  email?: string\n  color?: string\n  status?: RsvpStatus\n}\n\nexport type LinkedEntity = {\n  id: string\n  type: 'company' | 'deal' | 'offer'\n  label: string\n}\n\nexport type ScheduleActivityEditData = {\n  id: string\n  /** Record version for the OSS optimistic-lock header on edit (#2055). */\n  updatedAt?: string | null\n  /**\n   * The activity's own linked person/company id, captured at edit time. Callers\n   * that show activities from more than one entity (e.g. the deal detail page's\n   * multi-entity activity list) must set this so `ScheduleActivityDialog` keeps\n   * the edit payload's `entityId` pinned to the activity's actual record instead\n   * of whichever entity happens to be selected in the host page's picker (#6050).\n   */\n  entityId?: string | null\n  interactionType?: string\n  title?: string | null\n  body?: string | null\n  scheduledAt?: string | null\n  /**\n   * Historical timestamp for completed activities (status `done`). Required for\n   * the edit prefill to restore the original date/time instead of falling back\n   * to \"today\" (#1807).\n   */\n  occurredAt?: string | null\n  durationMinutes?: number | null\n  /** Interaction priority column (0-100, nullable) backing the task priority control (#5943). */\n  priority?: number | null\n  location?: string | null\n  allDay?: boolean | null\n  recurrenceRule?: string | null\n  recurrenceEnd?: string | null\n  participants?: Array<{ userId?: string; name?: string; email?: string; status?: string }> | null\n  reminderMinutes?: number | null\n  visibility?: string | null\n  linkedEntities?: Array<{ id: string; type: string; label: string }> | null\n  guestPermissions?: { canInviteOthers?: boolean; canModify?: boolean; canSeeList?: boolean } | null\n}\n\nexport const PARTICIPANT_COLORS = [\n  'bg-chart-emerald',\n  'bg-chart-blue',\n  'bg-chart-orange',\n  'bg-chart-violet',\n  'bg-chart-pink',\n  'bg-chart-teal',\n]\n\n// Per-Figma defaults for the Reminder dropdown when the user picks an activity\n// type. Meeting/email keep the standard 15 min; tasks default to 1 day (1440 min)\n// because they're plan-ahead artefacts; calls default to 5 min as a stand-in for\n// the Figma \"After call ends\" treatment (which would need a non-numeric sentinel\n// in the API contract \u2014 tracked as a follow-up).\nconst DEFAULT_REMINDER_MINUTES: Record<ActivityType, number> = {\n  meeting: 15,\n  call: 5,\n  task: 1440,\n  email: 15,\n  note: 15,\n}\n\n// Create-mode date/time defaults. A fixed morning slot made every activity opened\n// later in the day start in the past, so the seed is always computed forward from\n// \"now\" (#5940): tasks are plan-ahead artefacts and default to the end of the\n// working day, everything else to the next half-hour slot.\nconst DEFAULT_SLOT_MINUTES = 30\nconst TASK_DEFAULT_HOUR = 17\nconst NEXT_DAY_START_HOUR = 9\n\nfunction padDatePart(value: number): string {\n  return String(value).padStart(2, '0')\n}\n\nfunction isSameLocalDay(left: Date, right: Date): boolean {\n  return (\n    left.getFullYear() === right.getFullYear() &&\n    left.getMonth() === right.getMonth() &&\n    left.getDate() === right.getDate()\n  )\n}\n\nfunction nextSlotAfter(now: Date): Date {\n  const next = new Date(now)\n  next.setSeconds(0, 0)\n  next.setMinutes(next.getMinutes() + (DEFAULT_SLOT_MINUTES - (next.getMinutes() % DEFAULT_SLOT_MINUTES)))\n  if (!isSameLocalDay(next, now)) {\n    next.setHours(NEXT_DAY_START_HOUR, 0, 0, 0)\n  }\n  return next\n}\n\n/**\n * Default start moment for a newly created activity of `type`, always strictly\n * after `now` so a brand-new record is never born overdue (#5940).\n */\nexport function resolveDefaultActivityStart(type: ActivityType, now: Date): Date {\n  if (type === 'task') {\n    const endOfWorkingDay = new Date(now)\n    endOfWorkingDay.setHours(TASK_DEFAULT_HOUR, 0, 0, 0)\n    if (endOfWorkingDay.getTime() > now.getTime()) return endOfWorkingDay\n  }\n  return nextSlotAfter(now)\n}\n\nfunction formatLocalDateInput(date: Date): string {\n  return `${date.getFullYear()}-${padDatePart(date.getMonth() + 1)}-${padDatePart(date.getDate())}`\n}\n\nfunction formatLocalTimeInput(date: Date): string {\n  return `${padDatePart(date.getHours())}:${padDatePart(date.getMinutes())}`\n}\n\ninterface UseScheduleFormStateParams {\n  open: boolean\n  editData: ScheduleActivityEditData | null | undefined\n}\n\nexport function useScheduleFormState({ open, editData }: UseScheduleFormStateParams) {\n  // An empty `id` is the menu-driven \"New X\" convention \u2014 a create with a preset\n  // type, not an edit. The save path already reads it this way (`isSaveEdit`), so\n  // the seeding below must agree or new records inherit edit-mode fallbacks (#5940).\n  const isEditing = Boolean(editData?.id)\n  const [initialStart] = React.useState(() => resolveDefaultActivityStart('meeting', new Date()))\n  // Holds the raw persisted/selected interaction type \u2014 may be a built-in Event, a\n  // custom dictionary key, or a historical key the type picker no longer offers\n  // (#7486). Lookups into the five-kind presentation maps (`FIELD_VISIBILITY`,\n  // `TYPE_CHROME`, `DEFAULT_REMINDER_MINUTES`) must resolve through\n  // `resolveScheduleActivityType` first; this state is saved back verbatim.\n  const [activityType, setActivityType] = React.useState<string>('meeting')\n  const [title, setTitle] = React.useState('')\n  const [date, setDate] = React.useState(() => formatLocalDateInput(initialStart))\n  const [startTime, setStartTime] = React.useState(() => formatLocalTimeInput(initialStart))\n  const [duration, setDuration] = React.useState(30)\n  const [allDay, setAllDay] = React.useState(false)\n  const [description, setDescription] = React.useState('')\n  const [markdownEnabled, setMarkdownEnabled] = React.useState(true)\n  const [location, setLocation] = React.useState('')\n  const [reminderMinutes, setReminderMinutes] = React.useState(15)\n  const [visibility, setVisibility] = React.useState('team')\n  const [participants, setParticipants] = React.useState<Participant[]>([])\n  const [linkedEntities, setLinkedEntities] = React.useState<LinkedEntity[]>([])\n  const [recurrenceEnabled, setRecurrenceEnabled] = React.useState(false)\n  const [recurrenceDays, setRecurrenceDays] = React.useState<boolean[]>([true, false, true, false, false, false, false])\n  const [recurrenceEndType, setRecurrenceEndType] = React.useState<'never' | 'count' | 'date'>('never')\n  const [recurrenceCount, setRecurrenceCount] = React.useState(8)\n  const [recurrenceEndDate, setRecurrenceEndDate] = React.useState('')\n  const [conflict, setConflict] = React.useState<string | null>(null)\n  const [saving, setSaving] = React.useState(false)\n  const [guestPermissions, setGuestPermissions] = React.useState({ canInviteOthers: true, canModify: false, canSeeList: true })\n\n  React.useEffect(() => {\n    if (open) {\n      if (editData) {\n        // Edit mode: populate from existing interaction\n        const rawType = editData.interactionType ?? 'meeting'\n        const resolvedType = resolveScheduleActivityType(rawType)\n        setActivityType(rawType)\n        setTitle(editData.title ?? '')\n        // `scheduledAt` is the canonical term of anything that was ever planned, so it\n        // wins whenever it is set: the save path recomputes `scheduledAt` from these\n        // seeded date/time fields, and seeding from `occurredAt` first silently\n        // overwrote a completed task's due date on unrelated edits (#5939).\n        // `occurredAt` stays the fallback for purely historical entries (a logged call\n        // or note) that never had a `scheduledAt`, so editing those still restores\n        // their actual moment instead of falling back to \"today\" (#1807).\n        // Keep seed values in the user's local timezone, matching the cluster-E\n        // local-day convention.\n        const sourceTimestamp = editData.scheduledAt ?? editData.occurredAt ?? null\n        const seedDate = sourceTimestamp ? new Date(sourceTimestamp) : null\n        const seedDateValid = seedDate !== null && !Number.isNaN(seedDate.getTime())\n        // A real edit of an undated task must stay undated: falling back to a\n        // computed default here would silently give a backlog item a due date on\n        // the next save (#5941). Menu-driven \"New Task\" (no id yet, so `isEditing`\n        // is false) still gets the create-mode default so #5940's forward-seeded\n        // default keeps working.\n        if (isEditing && !seedDateValid && !isDateRequired(resolvedType)) {\n          setDate('')\n          setStartTime('')\n        } else {\n          const dateForForm = seedDateValid ? (seedDate as Date) : resolveDefaultActivityStart(resolvedType, new Date())\n          setDate(formatLocalDateInput(dateForForm))\n          setStartTime(formatLocalTimeInput(dateForForm))\n        }\n        setDuration(editData.durationMinutes ?? 30)\n        setAllDay(editData.allDay ?? false)\n        setDescription(editData.body ?? '')\n        setLocation(editData.location ?? '')\n        // Use per-type default when the editData omits an explicit reminder\n        // (the menu-driven \"New X\" flow opens the dialog with `reminderMinutes: null`).\n        setReminderMinutes(editData.reminderMinutes ?? DEFAULT_REMINDER_MINUTES[resolvedType])\n        setVisibility(editData.visibility ?? 'team')\n        setParticipants(\n          Array.isArray(editData.participants)\n            ? editData.participants.map((p, i) => ({\n                userId: p.userId,\n                name: p.name ?? p.email ?? p.userId ?? '',\n                email: p.email,\n                color: PARTICIPANT_COLORS[i % PARTICIPANT_COLORS.length],\n                status: (p.status ?? 'pending') as RsvpStatus,\n              }))\n            : [],\n        )\n        setLinkedEntities(\n          Array.isArray(editData.linkedEntities)\n            ? editData.linkedEntities.map((e) => ({ id: e.id, type: e.type as LinkedEntity['type'], label: e.label }))\n            : [],\n        )\n        if (editData.recurrenceRule) {\n          setRecurrenceEnabled(true)\n          // Parse RRULE to set days and end type\n          const rule = editData.recurrenceRule\n          const byDayMatch = rule.match(/BYDAY=([A-Z,]+)/)\n          if (byDayMatch) {\n            const dayNames = ['MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU']\n            const activeDays = byDayMatch[1].split(',')\n            setRecurrenceDays(dayNames.map((d) => activeDays.includes(d)))\n          }\n          const countMatch = rule.match(/COUNT=(\\d+)/)\n          const untilMatch = rule.match(/UNTIL=(\\d{8})/)\n          if (countMatch) {\n            setRecurrenceEndType('count')\n            setRecurrenceCount(Number(countMatch[1]))\n          } else if (untilMatch) {\n            setRecurrenceEndType('date')\n            const raw = untilMatch[1]\n            setRecurrenceEndDate(`${raw.slice(0, 4)}-${raw.slice(4, 6)}-${raw.slice(6, 8)}`)\n          } else {\n            setRecurrenceEndType('never')\n          }\n        } else {\n          setRecurrenceEnabled(false)\n        }\n        if (editData.guestPermissions) {\n          setGuestPermissions({\n            canInviteOthers: editData.guestPermissions.canInviteOthers ?? true,\n            canModify: editData.guestPermissions.canModify ?? false,\n            canSeeList: editData.guestPermissions.canSeeList ?? true,\n          })\n        }\n      } else {\n        // Create mode: reset all fields\n        const defaultStart = resolveDefaultActivityStart('meeting', new Date())\n        setActivityType('meeting')\n        setTitle('')\n        setDate(formatLocalDateInput(defaultStart))\n        setStartTime(formatLocalTimeInput(defaultStart))\n        setDuration(30)\n        setAllDay(false)\n        setDescription('')\n        setLocation('')\n        setReminderMinutes(DEFAULT_REMINDER_MINUTES.meeting)\n        setVisibility('team')\n        setParticipants([])\n        setLinkedEntities([])\n        setRecurrenceEnabled(false)\n      }\n      setConflict(null)\n    }\n    return () => {\n      // Safety net: restore body scroll if Radix Dialog fails to clean up\n      document.body.style.removeProperty('overflow')\n      document.body.style.removeProperty('pointer-events')\n    }\n  }, [open, editData, isEditing])\n\n  // Update the Reminder default when the activity type changes in create mode.\n  // Skipped in edit mode (the persisted value wins), and gated by `open` to\n  // avoid flipping the default in a closed-but-mounted dialog.\n  const lastReminderTypeRef = React.useRef<string>('meeting')\n  React.useEffect(() => {\n    if (!open || isEditing) {\n      lastReminderTypeRef.current = activityType\n      return\n    }\n    if (lastReminderTypeRef.current === activityType) return\n    lastReminderTypeRef.current = activityType\n    setReminderMinutes(DEFAULT_REMINDER_MINUTES[resolveScheduleActivityType(activityType)])\n  }, [activityType, isEditing, open])\n\n  const removeParticipant = React.useCallback((index: number) => {\n    setParticipants((prev) => prev.filter((_, i) => i !== index))\n  }, [])\n\n  const toggleRecurrenceDay = React.useCallback((index: number) => {\n    setRecurrenceDays((prev) => {\n      const next = [...prev]\n      next[index] = !next[index]\n      return next\n    })\n  }, [])\n\n  return {\n    activityType,\n    setActivityType,\n    title,\n    setTitle,\n    date,\n    setDate,\n    startTime,\n    setStartTime,\n    duration,\n    setDuration,\n    allDay,\n    setAllDay,\n    description,\n    setDescription,\n    markdownEnabled,\n    setMarkdownEnabled,\n    location,\n    setLocation,\n    reminderMinutes,\n    setReminderMinutes,\n    visibility,\n    setVisibility,\n    participants,\n    setParticipants,\n    linkedEntities,\n    setLinkedEntities,\n    recurrenceEnabled,\n    setRecurrenceEnabled,\n    recurrenceDays,\n    setRecurrenceDays,\n    recurrenceEndType,\n    setRecurrenceEndType,\n    recurrenceCount,\n    setRecurrenceCount,\n    recurrenceEndDate,\n    setRecurrenceEndDate,\n    conflict,\n    setConflict,\n    saving,\n    setSaving,\n    guestPermissions,\n    setGuestPermissions,\n    removeParticipant,\n    toggleRecurrenceDay,\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.10.1-develop.7668.1.3aa8463bd8",
+  "version": "0.10.1-develop.7670.1.7b5ad74924",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -265,16 +265,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7668.1.3aa8463bd8",
-    "@open-mercato/shared": "0.10.1-develop.7668.1.3aa8463bd8",
-    "@open-mercato/ui": "0.10.1-develop.7668.1.3aa8463bd8",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7670.1.7b5ad74924",
+    "@open-mercato/shared": "0.10.1-develop.7670.1.7b5ad74924",
+    "@open-mercato/ui": "0.10.1-develop.7670.1.7b5ad74924",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7668.1.3aa8463bd8",
-    "@open-mercato/shared": "0.10.1-develop.7668.1.3aa8463bd8",
-    "@open-mercato/ui": "0.10.1-develop.7668.1.3aa8463bd8",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7670.1.7b5ad74924",
+    "@open-mercato/shared": "0.10.1-develop.7670.1.7b5ad74924",
+    "@open-mercato/ui": "0.10.1-develop.7670.1.7b5ad74924",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

package/src/modules/customers/commands/interactions.ts

@@ -48,7 +48,8 @@ import {
   INTERACTION_STATUS_COMPLETED,
   INTERACTION_STATUS_PLANNED,
 } from '../lib/interactionStatus'
-import { canChangeEmailVisibility } from '../lib/visibilityFilter'
+import { canChangeEmailVisibility, isEmailHiddenFrom } from '../lib/visibilityFilter'
+import { listGrantsForViewerOnPerson, listSharedChannelIds } from '../lib/conversationShares'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { loadCustomFieldDefinitionIndex } from '@open-mercato/shared/lib/crud/custom-fields'
 import type { OrganizationHierarchyService } from '@open-mercato/shared/lib/auth/principal-service'
@@ -139,9 +140,77 @@ const INTERACTION_UNDO_DATE_OPTIONS = {
   datePaths: ['before.interaction.scheduledAt', 'before.interaction.occurredAt', 'before.interaction.recurrenceEnd'],
 }
 
-async function loadInteractionSnapshot(em: EntityManager, id: string): Promise<InteractionSnapshot | null> {
+async function ensureInteractionMutationAccess(
+  ctx: CommandRuntimeContext,
+  em: EntityManager,
+  interaction: CustomerInteraction | (InteractionSnapshot['interaction'] & { channelId?: string | null }),
+): Promise<void> {
+  ensureTenantScope(ctx, interaction.tenantId)
+  ensureOrganizationScope(ctx, interaction.organizationId)
+  const currentUserId = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null
+  const personEntityId = 'entityId' in interaction
+    ? interaction.entityId
+    : typeof interaction.entity === 'string' ? interaction.entity : interaction.entity.id
+  const visibility = {
+    interactionType: interaction.interactionType,
+    visibility: interaction.visibility,
+    authorUserId: interaction.authorUserId,
+    currentUserId,
+    personEntityId,
+    channelId: interaction.channelId,
+  }
+  if (!isEmailHiddenFrom(visibility)) return
+  const scope = { tenantId: interaction.tenantId, organizationId: interaction.organizationId }
+  const sharedConversations = await listGrantsForViewerOnPerson(em, scope, currentUserId, personEntityId)
+  const sharedChannelIds = await listSharedChannelIds(em, scope, currentUserId)
+  if (isEmailHiddenFrom({ ...visibility, sharedConversations, sharedChannelIds })) {
+    const { translate } = await resolveTranslations()
+    throw notFound(translate('customers.errors.entity_not_found', 'Entity not found'))
+  }
+}
+
+async function ensureInteractionPrivacyChangeAccess(
+  ctx: CommandRuntimeContext,
+  interaction: CustomerInteraction,
+  next: { interactionType?: string; authorUserId?: string | null; visibility?: string | null },
+): Promise<void> {
+  if (interaction.interactionType !== 'email') return
+  const actorUserId = ctx.auth?.isApiKey ? null : ctx.auth?.sub ?? null
+  const changesOwnership = next.authorUserId !== undefined && (next.authorUserId ?? null) !== (interaction.authorUserId ?? null)
+  const changesType = next.interactionType !== undefined && next.interactionType !== interaction.interactionType
+  if (
+    ((changesOwnership || changesType) && (!actorUserId || actorUserId !== interaction.authorUserId)) ||
+    (next.visibility !== undefined && !canChangeEmailVisibility({
+      interactionType: interaction.interactionType,
+      currentVisibility: interaction.visibility,
+      nextVisibility: next.visibility,
+      authorUserId: interaction.authorUserId,
+      actorUserId,
+      userFeatures: undefined,
+    }))
+  ) {
+    const { translate } = await resolveTranslations()
+    throw notFound(translate('customers.errors.entity_not_found', 'Entity not found'))
+  }
+}
+
+async function ensureInteractionRestoreAccess(
+  ctx: CommandRuntimeContext,
+  em: EntityManager,
+  current: CustomerInteraction | null,
+  restored: InteractionSnapshot['interaction'],
+): Promise<void> {
+  if (current) {
+    await ensureInteractionMutationAccess(ctx, em, current)
+    await ensureInteractionPrivacyChangeAccess(ctx, current, { ...restored, visibility: restored.visibility ?? null })
+  }
+  await ensureInteractionMutationAccess(ctx, em, { ...restored, channelId: current?.channelId })
+}
+
+async function loadInteractionSnapshot(em: EntityManager, id: string, ctx?: CommandRuntimeContext): Promise<InteractionSnapshot | null> {
   const interaction = await findOneWithDecryption(em, CustomerInteraction, { id }, { populate: ['entity'] })
   if (!interaction) return null
+  if (ctx) await ensureInteractionMutationAccess(ctx, em, interaction)
   const custom = await loadCustomFieldSnapshot(em, {
     entityId: INTERACTION_ENTITY_ID,
     recordId: interaction.id,
@@ -619,6 +688,7 @@ const createInteractionCommand: CommandHandler<InteractionCreateInput, { interac
     const result = await runInTransaction(em, async (trx) => {
       const record = await findOneWithDecryption(trx, CustomerInteraction, { id: interactionId })
       if (!record) return null
+      await ensureInteractionMutationAccess(ctx, trx, record)
       const entityId = typeof record.entity === 'string' ? record.entity : record.entity.id
       trx.remove(record)
       await trx.flush()
@@ -648,6 +718,7 @@ const createInteractionCommand: CommandHandler<InteractionCreateInput, { interac
     const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
       const entity = await requireTimelineParentEntity(trx, after.interaction.entityId, { tenantId: after.interaction.tenantId, organizationId: after.interaction.organizationId })
       let interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: after.interaction.id })
+      await ensureInteractionRestoreAccess(ctx, trx, interaction, after.interaction)
       if (!interaction) {
         interaction = buildInteractionGraph(trx, {
           id: after.interaction.id,
@@ -760,7 +831,7 @@ const createInteractionCommand: CommandHandler<InteractionCreateInput, { interac
 async function prepareUpdateInteractionSnapshot(rawInput: InteractionUpdateInput, ctx: CommandRuntimeContext) {
   const { parsed } = parseWithCustomFields(interactionUpdateSchema, rawInput)
   const em = ctx.transactionalEm ?? (ctx.container.resolve('em') as EntityManager).fork()
-  const snapshot = await loadInteractionSnapshot(em, parsed.id)
+  const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx)
   return snapshot ? { before: snapshot } : {}
 }
 
@@ -779,6 +850,7 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
       }
       ensureTenantScope(ctx, interaction.tenantId)
       ensureOrganizationScope(ctx, interaction.organizationId)
+      await ensureInteractionMutationAccess(ctx, trx, interaction)
 
       // Concurrent-edit guard for command-driven callers (e.g. the legacy
       // /api/customers/todos route, which bypasses the makeCrudRoute lock guard):
@@ -792,6 +864,8 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
         request: ctx.request ?? null,
       })
 
+      await ensureInteractionPrivacyChangeAccess(ctx, interaction, parsed)
+
       const nextType = parsed.interactionType ?? interaction.interactionType
       const changingType = nextType !== interaction.interactionType
       const enforceSelectableType = requestsSelectableTypeEnforcement(rawInput)
@@ -870,35 +944,6 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
         : Object.fromEntries(Object.entries(custom).filter(([key]) =>
           !customKeys.defined.has(key.toLowerCase()) || customKeys.allowed.has(key.toLowerCase())))
 
-      // Email visibility is an access-controlled field: only the interaction's
-      // author may change a
-      // private email's visibility (mirrors the dedicated PATCH .../visibility
-      // route). Enforce it here — the single persistence path — so the generic
-      // update route (PUT /api/interactions) cannot bypass the gate. Evaluated
-      // against the row's pre-mutation author/type. 404 (not 403) keeps the
-      // existence-masking consistent with the dedicated route.
-      if (
-        parsed.visibility !== undefined &&
-        interaction.interactionType === 'email' &&
-        (parsed.visibility ?? null) !== (interaction.visibility ?? null)
-      ) {
-        const actorUserId = (ctx.auth as { sub?: string | null } | null)?.sub ?? null
-        if (
-          !canChangeEmailVisibility({
-            interactionType: interaction.interactionType,
-            currentVisibility: interaction.visibility,
-            nextVisibility: parsed.visibility,
-            authorUserId: interaction.authorUserId,
-            actorUserId,
-            // v1 strict owner-only: only the author may flip visibility; no admin
-            // bypass (canChangeEmailVisibility ignores caller features in v1).
-            userFeatures: undefined,
-          })
-        ) {
-          throw notFound('Email not found')
-        }
-      }
-
       // Re-link to a different person/company (#5938). Resolved before any scalar
       // mutation below so the lookup never lands between a mutation and `trx.flush()`
       // (packages/core/AGENTS.md → Entity Update Safety). `requireTimelineParentEntity`
@@ -1039,6 +1084,7 @@ const updateInteractionCommand: CommandHandler<InteractionUpdateInput, { interac
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const { interaction, projections } = await runInTransaction(em, async (trx) => {
       let interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id })
+      await ensureInteractionRestoreAccess(ctx, trx, interaction, before.interaction)
       const entity = await requireTimelineParentEntity(trx, before.interaction.entityId, { tenantId: before.interaction.tenantId, organizationId: before.interaction.organizationId })
 
       if (!interaction) {
@@ -1166,7 +1212,7 @@ const completeInteractionCommand: CommandHandler<InteractionCompleteInput, { int
   async prepare(rawInput, ctx) {
     const parsed = interactionCompleteSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadInteractionSnapshot(em, parsed.id)
+    const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx)
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -1180,6 +1226,7 @@ const completeInteractionCommand: CommandHandler<InteractionCompleteInput, { int
       }
       ensureTenantScope(ctx, interaction.tenantId)
       ensureOrganizationScope(ctx, interaction.organizationId)
+      await ensureInteractionMutationAccess(ctx, trx, interaction)
 
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: 'customers.interaction',
@@ -1260,6 +1307,7 @@ const completeInteractionCommand: CommandHandler<InteractionCompleteInput, { int
     const result = await runInTransaction(em, async (trx) => {
       const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id })
       if (!interaction) return null
+      await ensureInteractionMutationAccess(ctx, trx, interaction)
 
       interaction.status = before.interaction.status
       interaction.occurredAt = before.interaction.occurredAt
@@ -1306,7 +1354,7 @@ const cancelInteractionCommand: CommandHandler<InteractionCancelInput, { interac
   async prepare(rawInput, ctx) {
     const parsed = interactionCancelSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadInteractionSnapshot(em, parsed.id)
+    const snapshot = await loadInteractionSnapshot(em, parsed.id, ctx)
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -1320,6 +1368,7 @@ const cancelInteractionCommand: CommandHandler<InteractionCancelInput, { interac
       }
       ensureTenantScope(ctx, interaction.tenantId)
       ensureOrganizationScope(ctx, interaction.organizationId)
+      await ensureInteractionMutationAccess(ctx, trx, interaction)
 
       await enforceCommandOptimisticLockWithGuards(ctx.container, {
         resourceKind: 'customers.interaction',
@@ -1398,6 +1447,7 @@ const cancelInteractionCommand: CommandHandler<InteractionCancelInput, { interac
     const result = await runInTransaction(em, async (trx) => {
       const interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id })
       if (!interaction) return null
+      await ensureInteractionMutationAccess(ctx, trx, interaction)
 
       interaction.status = before.interaction.status
       await trx.flush()
@@ -1444,7 +1494,7 @@ const deleteInteractionCommand: CommandHandler<{ body?: Record<string, unknown>;
     async prepare(input, ctx) {
       const id = requireId(input, 'Interaction id required')
       const em = (ctx.container.resolve('em') as EntityManager).fork()
-      const snapshot = await loadInteractionSnapshot(em, id)
+      const snapshot = await loadInteractionSnapshot(em, id, ctx)
       return snapshot ? { before: snapshot } : {}
     },
     async execute(input, ctx) {
@@ -1458,6 +1508,7 @@ const deleteInteractionCommand: CommandHandler<{ body?: Record<string, unknown>;
         }
         ensureTenantScope(ctx, interaction.tenantId)
         ensureOrganizationScope(ctx, interaction.organizationId)
+        await ensureInteractionMutationAccess(ctx, trx, interaction)
 
         await enforceCommandOptimisticLockWithGuards(ctx.container, {
           resourceKind: 'customers.interaction',
@@ -1523,6 +1574,7 @@ const deleteInteractionCommand: CommandHandler<{ body?: Record<string, unknown>;
       const { interaction, nextInteractionId } = await runInTransaction(em, async (trx) => {
         const entity = await requireTimelineParentEntity(trx, before.interaction.entityId, { tenantId: before.interaction.tenantId, organizationId: before.interaction.organizationId })
         let interaction = await findOneWithDecryption(trx, CustomerInteraction, { id: before.interaction.id })
+        await ensureInteractionRestoreAccess(ctx, trx, interaction, before.interaction)
         if (!interaction) {
           interaction = trx.create(CustomerInteraction, {
             id: before.interaction.id,

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

@@ -24,6 +24,7 @@ import {
   isDateRequired,
   isTimeRequired,
   getFieldLabel,
+  resolveScheduleActivityType,
   DateTimeFields,
   ParticipantsField,
   LocationField,
@@ -141,10 +142,16 @@ export function ScheduleActivityDialog({
 }: ScheduleActivityDialogProps) {
   const t = useT()
   const state = useScheduleFormState({ open, editData: editData ?? null })
-  const visibleFields = FIELD_VISIBILITY[state.activityType]
+  // `state.activityType` is the raw persisted/selected key — may be a built-in
+  // Event, a custom dictionary key, or a historical key outside this dialog's
+  // five legacy kinds (#7486). `presentationType` resolves it to a safe key for
+  // every lookup into the five-kind maps below; the save payload keeps the raw
+  // value so an unsupported type is never silently rewritten.
+  const presentationType = resolveScheduleActivityType(state.activityType)
+  const visibleFields = FIELD_VISIBILITY[presentationType]
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const isEditing = Boolean(editData?.id)
-  const chrome = TYPE_CHROME[state.activityType]
+  const chrome = TYPE_CHROME[presentationType]
   const SaveIcon = chrome.saveIcon
   const [callDirection, setCallDirection] = React.useState<'outbound' | 'inbound'>('outbound')
   const [callOutcome, setCallOutcome] = React.useState<string | null>(null)
@@ -369,8 +376,8 @@ export function ScheduleActivityDialog({
   const trimmedCallPhone = callPhoneNumber.trim()
   // Only calendar-bound types must be scheduled; a task may stay an undated
   // backlog item, so blocking its save on an empty date was wrong (#5941).
-  const isDateMissing = isDateRequired(state.activityType) && !trimmedDate
-  const isTimeMissing = isTimeRequired(state.activityType) && !state.allDay && !trimmedStartTime
+  const isDateMissing = isDateRequired(presentationType) && !trimmedDate
+  const isTimeMissing = isTimeRequired(presentationType) && !state.allDay && !trimmedStartTime
   const isSubmitDisabled =
     state.saving ||
     !state.title.trim() ||
@@ -388,7 +395,7 @@ export function ScheduleActivityDialog({
       return
     }
     let phoneNumberForPayload: string | undefined
-    if (state.activityType === 'call' && trimmedCallPhone) {
+    if (presentationType === 'call' && trimmedCallPhone) {
       const phoneValidation = validatePhoneNumber(trimmedCallPhone)
       if (!phoneValidation.valid) {
         setCallPhoneError(callPhoneInvalidMessage)
@@ -417,7 +424,7 @@ export function ScheduleActivityDialog({
 
       const isSaveEdit = Boolean(editData?.id)
       const customValues: Record<string, unknown> = {}
-      if (state.activityType === 'call') {
+      if (presentationType === 'call') {
         customValues.callDirection = callDirection
         if (callOutcome) customValues.callOutcome = callOutcome
         if (phoneNumberForPayload) customValues.callPhoneNumber = phoneNumberForPayload
@@ -440,10 +447,10 @@ export function ScheduleActivityDialog({
         ...(isSaveEdit ? {} : { status: 'planned' }),
         date: trimmedDate || null,
         time: trimmedDate ? timeForPayload || null : null,
-        phoneNumber: state.activityType === 'call' ? phoneNumberForPayload : undefined,
+        phoneNumber: presentationType === 'call' ? phoneNumberForPayload : undefined,
         // Only tasks expose the priority control, so other types leave the column
         // untouched rather than clearing it on a type switch (#5943).
-        priority: state.activityType === 'task' ? buildTaskPriorityPayload(taskPriority, seededTaskPriority) : undefined,
+        priority: presentationType === 'task' ? buildTaskPriorityPayload(taskPriority, seededTaskPriority) : undefined,
         scheduledAt,
         durationMinutes: visibleFields.has('duration') && !state.allDay ? state.duration : null,
         location: visibleFields.has('location') ? (state.location.trim() || null) : null,
@@ -498,7 +505,7 @@ export function ScheduleActivityDialog({
       }
       const { message, fieldErrors } = mapCrudServerErrorToFormErrors(err)
       const phoneFieldError = fieldErrors?.phoneNumber
-      if (state.activityType === 'call' && phoneFieldError) {
+      if (presentationType === 'call' && phoneFieldError) {
         const translatedPhoneError = translateErrorMessage(phoneFieldError, callPhoneInvalidMessage)
         setCallPhoneError(translatedPhoneError)
         flash(translatedPhoneError, 'error')
@@ -511,7 +518,7 @@ export function ScheduleActivityDialog({
     } finally {
       state.setSaving(false)
     }
-  }, [callDirection, callOutcome, callPhoneInvalidMessage, callPhoneNumber, isDateMissing, isTimeMissing, state.activityType, state.allDay, state.date, state.description, dealId, state.duration, editData, entityId, state.guestPermissions, state.linkedEntities, state.location, onActivityCreated, onClose, state.participants, state.recurrenceCount, state.recurrenceDays, state.recurrenceEnabled, state.recurrenceEndDate, state.recurrenceEndType, state.reminderMinutes, runGuardedMutation, seededTaskPriority, state.startTime, t, taskPriority, state.title, translateErrorMessage, trimmedCallPhone, trimmedDate, trimmedStartTime, state.visibility, visibleFields]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [callDirection, callOutcome, callPhoneInvalidMessage, callPhoneNumber, isDateMissing, isTimeMissing, presentationType, state.activityType, state.allDay, state.date, state.description, dealId, state.duration, editData, entityId, state.guestPermissions, state.linkedEntities, state.location, onActivityCreated, onClose, state.participants, state.recurrenceCount, state.recurrenceDays, state.recurrenceEnabled, state.recurrenceEndDate, state.recurrenceEndType, state.reminderMinutes, runGuardedMutation, seededTaskPriority, state.startTime, t, taskPriority, state.title, translateErrorMessage, trimmedCallPhone, trimmedDate, trimmedStartTime, state.visibility, visibleFields]) // eslint-disable-line react-hooks/exhaustive-deps
 
   const handleKeyDown = useDialogKeyHandler({ onConfirm: handleSave })
 
@@ -588,14 +595,14 @@ export function ScheduleActivityDialog({
         {/* Title */}
         <div className="flex flex-col gap-1.5">
           <label className="text-overline font-semibold text-muted-foreground tracking-wider">
-            {getFieldLabel(state.activityType, 'title', t, 'customers.schedule.titleLabel', 'Title')}
+            {getFieldLabel(presentationType, 'title', t, 'customers.schedule.titleLabel', 'Title')}
           </label>
           <input
             type="text"
             value={state.title}
             onChange={(e) => state.setTitle(e.target.value)}
             placeholder={
-              state.activityType === 'email'
+              presentationType === 'email'
                 ? t('customers.schedule.subjectPlaceholder', 'Subject...')
                 : t('customers.schedule.titlePlaceholder', 'Activity title...')
             }
@@ -608,7 +615,7 @@ export function ScheduleActivityDialog({
             workflows match Figma 829:50 / 790:280 (date row first, then status chips). */}
         <DateTimeFields
           visible={visibleFields}
-          activityType={state.activityType}
+          activityType={presentationType}
           date={state.date}
           setDate={state.setDate}
           startTime={state.startTime}
@@ -630,7 +637,7 @@ export function ScheduleActivityDialog({
         />
 
         {/* Call: Direction + Outcome chips */}
-        {state.activityType === 'call' && (
+        {presentationType === 'call' && (
           <div className="flex flex-col gap-3">
             <div>
               <label className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
@@ -690,7 +697,7 @@ export function ScheduleActivityDialog({
         )}
 
         {/* Task: Priority chips */}
-        {state.activityType === 'task' && (
+        {presentationType === 'task' && (
           <div>
             <label className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
               {t('customers.schedule.task.priorityLabel', 'Priority')}
@@ -723,7 +730,7 @@ export function ScheduleActivityDialog({
         {/* Participants */}
         <ParticipantsField
           visible={visibleFields}
-          activityType={state.activityType}
+          activityType={presentationType}
           participants={state.participants}
           setParticipants={state.setParticipants}
           removeParticipant={state.removeParticipant}
@@ -732,7 +739,7 @@ export function ScheduleActivityDialog({
         />
 
         {/* Location (or phone number for calls) */}
-        {state.activityType === 'call' ? (
+        {presentationType === 'call' ? (
           <div className="flex flex-col gap-1.5">
             <label htmlFor="schedule-call-phone" className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
               {t('customers.schedule.call.phoneLabel', 'Phone number')}
@@ -751,7 +758,7 @@ export function ScheduleActivityDialog({
         ) : (
           <LocationField
             visible={visibleFields}
-            activityType={state.activityType}
+            activityType={presentationType}
             location={state.location}
             setLocation={state.setLocation}
           />
@@ -760,7 +767,7 @@ export function ScheduleActivityDialog({
         {/* Linked Entities */}
         <LinkedEntitiesField
           visible={visibleFields}
-          activityType={state.activityType}
+          activityType={presentationType}
           linkedEntities={state.linkedEntities}
           setLinkedEntities={state.setLinkedEntities}
         />
@@ -768,7 +775,7 @@ export function ScheduleActivityDialog({
         {/* Description */}
         <div>
           <label className="text-overline font-semibold uppercase text-muted-foreground tracking-wider">
-            {getFieldLabel(state.activityType, 'description', t, 'customers.schedule.description', 'Description')}
+            {getFieldLabel(presentationType, 'description', t, 'customers.schedule.description', 'Description')}
           </label>
           <div className="mt-[8px]">
             <SwitchableMarkdownInput
@@ -777,12 +784,12 @@ export function ScheduleActivityDialog({
               isMarkdownEnabled={state.markdownEnabled}
               // Email bodies are plain text from other mail clients, not Markdown; `<address>`
               // or `<url>` tokens in them break the MDX editor (#5903).
-              disableMarkdown={state.activityType === 'email'}
+              disableMarkdown={presentationType === 'email'}
               // The plain textarea defaults to 3 hidden-overflow rows, which
               // would cut off quoted replies; give email bodies room and a scrollbar.
-              rows={state.activityType === 'email' ? 8 : undefined}
+              rows={presentationType === 'email' ? 8 : undefined}
               textareaClassName={
-                state.activityType === 'email'
+                presentationType === 'email'
                   ? 'w-full resize-y overflow-y-auto rounded-lg border border-muted-foreground/20 bg-background px-3 py-2 text-sm shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring'
                   : undefined
               }
@@ -795,7 +802,7 @@ export function ScheduleActivityDialog({
         {/* Reminder + Visibility */}
         <FooterFields
           visible={visibleFields}
-          activityType={state.activityType}
+          activityType={presentationType}
           reminderMinutes={state.reminderMinutes}
           setReminderMinutes={state.setReminderMinutes}
           visibility={state.visibility}

package/src/modules/customers/components/detail/schedule/fieldConfig.ts

@@ -16,6 +16,22 @@ export type ScheduleFieldId =
   | 'reminder'
   | 'visibility'
 
+const KNOWN_ACTIVITY_TYPES: ReadonlySet<string> = new Set(['meeting', 'call', 'task', 'email', 'note'])
+
+export function isKnownActivityType(type: string): type is ActivityType {
+  return KNOWN_ACTIVITY_TYPES.has(type)
+}
+
+// The built-in Event type and any custom or historical dictionary key the backend
+// accepts fall outside this dialog's five legacy presentation kinds (#7486) — this
+// dialog predates the configurable calendar event type catalog. Resolve those to
+// Meeting's chrome/field set, the closest and broadest safe default, while callers
+// keep the exact persisted key (`editData.interactionType` / the save payload)
+// untouched so the stored type is never silently rewritten.
+export function resolveScheduleActivityType(type: string): ActivityType {
+  return isKnownActivityType(type) ? type : 'meeting'
+}
+
 export const FIELD_VISIBILITY: Record<ActivityType, Set<ScheduleFieldId>> = {
   meeting: new Set([
     'title', 'date', 'startTime', 'duration', 'allDay', 'timezone', 'recurrence',