@open-mercato/core 0.8.1-develop.7454.1.010095490f → 0.8.1-develop.7455.1.8f7e53badb

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

@@ -193,6 +193,11 @@
   "customers.audit.todos.link": "할 일 연결",
   "customers.audit.todos.unlink": "할 일 연결 해제",
   "customers.calendar.actions.newEvent": "새 이벤트",
+  "customers.calendar.activityTypes.errors.changeConfirmationRequired": "이벤트 유형을 변경하면 기존 값이 삭제됩니다.",
+  "customers.calendar.activityTypes.errors.fieldNotApplicable": "이 필드는 선택한 활동 유형에 적용되지 않습니다.",
+  "customers.calendar.activityTypes.errors.forbidden": "활동 유형을 볼 권한이 없습니다.",
+  "customers.calendar.activityTypes.errors.loadFailed": "활동 유형을 불러오지 못했습니다.",
+  "customers.calendar.activityTypes.errors.unavailable": "이 활동 유형은 사용할 수 없습니다.",
   "customers.calendar.agenda.eventsCount.few": "이벤트 {count}건",
   "customers.calendar.agenda.eventsCount.many": "이벤트 {count}건",
   "customers.calendar.agenda.eventsCount.one": "이벤트 {count}건",
@@ -232,6 +237,8 @@
   "customers.calendar.editor.assigneePlaceholder": "팀원에게 배정…",
   "customers.calendar.editor.attendees": "참석자",
   "customers.calendar.editor.cancel": "취소",
+  "customers.calendar.editor.catalogLoadFailed": "활동 유형을 불러오지 못했습니다. 다시 시도한 후 이벤트를 저장하세요.",
+  "customers.calendar.editor.catalogLoading": "활동 유형을 불러오는 중…",
   "customers.calendar.editor.category": "카테고리",
   "customers.calendar.editor.close": "닫기",
   "customers.calendar.editor.conflictTitle": "일정 충돌",
@@ -249,8 +256,14 @@
   "customers.calendar.editor.dealsSection": "거래",
   "customers.calendar.editor.description": "설명",
   "customers.calendar.editor.descriptionPlaceholder": "세부 정보 추가…",
+  "customers.calendar.editor.discardConfirm": "유형 변경 및 값 삭제",
+  "customers.calendar.editor.discardDescription": "이벤트 유형을 변경하면 새 유형에 적용되지 않는 값이 삭제됩니다.",
+  "customers.calendar.editor.discardFields": "삭제할 값:",
+  "customers.calendar.editor.discardTitle": "이벤트 유형을 변경할까요?",
+  "customers.calendar.editor.discardUnknownField": "사용자 정의 필드",
   "customers.calendar.editor.error": "이벤트를 저장하지 못했습니다",
   "customers.calendar.editor.guestBadge": "게스트",
+  "customers.calendar.editor.historicalType": "이 이벤트 유형은 새 이벤트에 사용할 수 없습니다. 현재 이벤트를 계속 편집하거나 다른 유형을 선택하세요.",
   "customers.calendar.editor.location": "장소",
   "customers.calendar.editor.locationPlaceholder": "장소 또는 링크 추가…",
   "customers.calendar.editor.multiDayHint": "여러 날 이벤트 · {count}일",
@@ -295,6 +308,7 @@
   "customers.calendar.editor.saved": "이벤트가 저장되었습니다",
   "customers.calendar.editor.saving": "저장 중…",
   "customers.calendar.editor.searching": "검색 중…",
+  "customers.calendar.editor.timezone": "시간대",
   "customers.calendar.editor.title.create": "새 이벤트",
   "customers.calendar.editor.title.edit": "이벤트 수정",
   "customers.calendar.editor.titleLabel.email": "제목",
@@ -303,6 +317,7 @@
   "customers.calendar.editor.titlePlaceholder": "제목 추가…",
   "customers.calendar.editor.to": "받는 사람",
   "customers.calendar.editor.typeSwitcher": "이벤트 유형",
+  "customers.calendar.editor.typeUnavailable": "저장하기 전에 사용 가능한 이벤트 유형을 선택하세요.",
   "customers.calendar.editor.types.call": "통화",
   "customers.calendar.editor.types.email": "이메일",
   "customers.calendar.editor.types.event": "이벤트",
@@ -312,6 +327,8 @@
   "customers.calendar.editor.validation.assigneeRequired": "이 작업을 팀 구성원에게 할당",
   "customers.calendar.editor.validation.endsBeforeStarts": "종료 시각은 시작 시각 이후여야 합니다",
   "customers.calendar.editor.validation.relatedToRequired": "이 이벤트에 연결할 연락처 또는 회사를 선택하세요",
+  "customers.calendar.editor.validation.timezoneGap": "선택한 시간대에 이 현지 시간이 존재하지 않습니다",
+  "customers.calendar.editor.validation.timezoneInvalid": "유효한 시간대를 선택하세요",
   "customers.calendar.editor.validation.titleRequired": "제목은 필수입니다",
   "customers.calendar.empty.action": "새 이벤트",
   "customers.calendar.empty.agenda": "이 기간에 예정된 일정이 없습니다",
@@ -368,6 +385,7 @@
   "customers.calendar.settings.conflictWarnings": "충돌 경고",
   "customers.calendar.settings.eventCategories": "이벤트 카테고리",
   "customers.calendar.settings.eventCategoriesHint": "직접 지정하는 그룹 라벨입니다(예: 팀 미팅, 영업 통화). 이벤트 생성 시 선택할 수 있습니다.",
+  "customers.calendar.settings.manageActivityTypes": "활동 유형 관리",
   "customers.calendar.settings.max": "(최대 {count}개)",
   "customers.calendar.settings.removeTag": "{tag} 제거",
   "customers.calendar.settings.save": "변경사항 저장",
@@ -798,6 +816,71 @@
   "customers.companies.presets.inactive60": "60일 초과 비활성",
   "customers.companies.presets.myAccounts": "내 담당 계정",
   "customers.companies.presets.recentlyCreated": "최근 생성됨",
+  "customers.config.activityTypes.appearance": "모양",
+  "customers.config.activityTypes.behavior": "양식 동작",
+  "customers.config.activityTypes.columns.active": "선택 가능",
+  "customers.config.activityTypes.columns.behavior": "동작",
+  "customers.config.activityTypes.columns.fields": "필드",
+  "customers.config.activityTypes.columns.fieldsets": "필드셋",
+  "customers.config.activityTypes.columns.key": "고정 키",
+  "customers.config.activityTypes.columns.order": "순서",
+  "customers.config.activityTypes.columns.source": "출처",
+  "customers.config.activityTypes.columns.type": "활동 유형",
+  "customers.config.activityTypes.configure": "설정",
+  "customers.config.activityTypes.delete": "삭제",
+  "customers.config.activityTypes.empty": "사용 가능한 활동 유형이 없습니다.",
+  "customers.config.activityTypes.fields.allDay": "하루 종일",
+  "customers.config.activityTypes.fields.baseKind": "기본 동작",
+  "customers.config.activityTypes.fields.color": "색상 (#RRGGBB)",
+  "customers.config.activityTypes.fields.customFieldsetIds": "사용자 지정 필드셋",
+  "customers.config.activityTypes.fields.endTime": "종료 시간",
+  "customers.config.activityTypes.fields.icon": "아이콘",
+  "customers.config.activityTypes.fields.label": "레이블",
+  "customers.config.activityTypes.fields.location": "위치 필드",
+  "customers.config.activityTypes.fields.order": "표시 순서",
+  "customers.config.activityTypes.fields.people": "사람 필드",
+  "customers.config.activityTypes.fields.priority": "우선순위",
+  "customers.config.activityTypes.fields.recurrence": "반복",
+  "customers.config.activityTypes.fields.resources": "리소스",
+  "customers.config.activityTypes.fields.selectable": "새 이벤트에 사용 가능",
+  "customers.config.activityTypes.fields.value": "고정 키",
+  "customers.config.activityTypes.fieldsetsUnavailable": "필드셋을 사용할 수 없습니다. 저장하기 전에 다시 불러오세요.",
+  "customers.config.activityTypes.inactiveHint": "현재 모듈이 이 재정의의 적용을 막고 있습니다.",
+  "customers.config.activityTypes.inherited": "상속됨",
+  "customers.config.activityTypes.inheritedHint": "저장하면 이 조직에 대한 로컬 재정의가 생성됩니다.",
+  "customers.config.activityTypes.invalidBehavior": "양식 동작 값을 확인하세요.",
+  "customers.config.activityTypes.invalidKey": "소문자, 숫자, 하이픈 또는 밑줄로 된 키를 사용하세요.",
+  "customers.config.activityTypes.loadFailed": "활동 유형을 불러오지 못했습니다.",
+  "customers.config.activityTypes.loadingFieldsets": "필드셋 불러오는 중…",
+  "customers.config.activityTypes.local": "로컬 재정의",
+  "customers.config.activityTypes.missing": "누락됨",
+  "customers.config.activityTypes.missingHint": "설정된 일부 필드셋이 더 이상 존재하지 않습니다.",
+  "customers.config.activityTypes.new": "새 활동 유형",
+  "customers.config.activityTypes.no": "아니요",
+  "customers.config.activityTypes.noFieldsets": "아직 사용자 지정 필드셋이 정의되지 않았습니다.",
+  "customers.config.activityTypes.options.assignee": "담당자",
+  "customers.config.activityTypes.options.attendees": "참석자",
+  "customers.config.activityTypes.options.call": "통화",
+  "customers.config.activityTypes.options.email": "이메일",
+  "customers.config.activityTypes.options.event": "이벤트",
+  "customers.config.activityTypes.options.location": "위치",
+  "customers.config.activityTypes.options.meeting": "회의",
+  "customers.config.activityTypes.options.none": "없음",
+  "customers.config.activityTypes.options.note": "메모",
+  "customers.config.activityTypes.options.participants": "참여자",
+  "customers.config.activityTypes.options.phoneLink": "전화 링크",
+  "customers.config.activityTypes.options.recipients": "수신자",
+  "customers.config.activityTypes.options.task": "작업",
+  "customers.config.activityTypes.refresh": "새로고침",
+  "customers.config.activityTypes.removed": "활동 유형 설정을 제거했습니다.",
+  "customers.config.activityTypes.reset": "재정의 초기화",
+  "customers.config.activityTypes.resetConfirm": "로컬 활동 유형 설정을 제거할까요?",
+  "customers.config.activityTypes.retry": "다시 시도",
+  "customers.config.activityTypes.save": "저장",
+  "customers.config.activityTypes.saveFailed": "활동 유형을 저장하지 못했습니다.",
+  "customers.config.activityTypes.saved": "활동 유형을 저장했습니다.",
+  "customers.config.activityTypes.view": "보기",
+  "customers.config.activityTypes.yes": "예",
   "customers.config.addressFormat.description": "고객 모듈 전반에서 주소 입력 폼과 표시 방식을 어떻게 구성할지 선택하세요.",
   "customers.config.addressFormat.error": "주소 설정을 불러오지 못했습니다",
   "customers.config.addressFormat.errorSave": "주소 설정 업데이트에 실패했습니다",

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

@@ -193,6 +193,11 @@
   "customers.audit.todos.link": "Powiąż zadanie",
   "customers.audit.todos.unlink": "Odepnij zadanie",
   "customers.calendar.actions.newEvent": "Nowe wydarzenie",
+  "customers.calendar.activityTypes.errors.changeConfirmationRequired": "Zmiana typu wydarzenia usunie istniejące wartości.",
+  "customers.calendar.activityTypes.errors.fieldNotApplicable": "To pole nie dotyczy wybranego typu aktywności.",
+  "customers.calendar.activityTypes.errors.forbidden": "Nie masz uprawnień do wyświetlania typów aktywności.",
+  "customers.calendar.activityTypes.errors.loadFailed": "Nie udało się wczytać typów aktywności.",
+  "customers.calendar.activityTypes.errors.unavailable": "Ten typ aktywności jest niedostępny.",
   "customers.calendar.agenda.eventsCount.few": "{count} wydarzenia",
   "customers.calendar.agenda.eventsCount.many": "{count} wydarzeń",
   "customers.calendar.agenda.eventsCount.one": "{count} wydarzenie",
@@ -232,6 +237,8 @@
   "customers.calendar.editor.assigneePlaceholder": "Przypisz do członka zespołu…",
   "customers.calendar.editor.attendees": "Uczestnicy",
   "customers.calendar.editor.cancel": "Anuluj",
+  "customers.calendar.editor.catalogLoadFailed": "Nie udało się wczytać typów aktywności. Spróbuj ponownie, aby zapisać wydarzenie.",
+  "customers.calendar.editor.catalogLoading": "Wczytywanie typów aktywności…",
   "customers.calendar.editor.category": "Kategoria",
   "customers.calendar.editor.close": "Zamknij",
   "customers.calendar.editor.conflictTitle": "Konflikt w kalendarzu",
@@ -249,8 +256,14 @@
   "customers.calendar.editor.dealsSection": "Szanse",
   "customers.calendar.editor.description": "Opis",
   "customers.calendar.editor.descriptionPlaceholder": "Dodaj szczegóły…",
+  "customers.calendar.editor.discardConfirm": "Zmień typ i usuń wartości",
+  "customers.calendar.editor.discardDescription": "Zmiana typu wydarzenia usunie wartości, które nie dotyczą nowego typu.",
+  "customers.calendar.editor.discardFields": "Wartości do usunięcia:",
+  "customers.calendar.editor.discardTitle": "Zmienić typ wydarzenia?",
+  "customers.calendar.editor.discardUnknownField": "Pole niestandardowe",
   "customers.calendar.editor.error": "Nie udało się zapisać wydarzenia",
   "customers.calendar.editor.guestBadge": "Gość",
+  "customers.calendar.editor.historicalType": "Ten typ wydarzenia nie jest dostępny dla nowych wydarzeń. Możesz dalej edytować to wydarzenie albo wybrać inny typ.",
   "customers.calendar.editor.location": "Lokalizacja",
   "customers.calendar.editor.locationPlaceholder": "Dodaj lokalizację lub link…",
   "customers.calendar.editor.multiDayHint": "Wydarzenie wielodniowe · {count} dni",
@@ -295,6 +308,7 @@
   "customers.calendar.editor.saved": "Wydarzenie zapisane",
   "customers.calendar.editor.saving": "Zapisywanie…",
   "customers.calendar.editor.searching": "Wyszukiwanie…",
+  "customers.calendar.editor.timezone": "Strefa czasowa",
   "customers.calendar.editor.title.create": "Nowe wydarzenie",
   "customers.calendar.editor.title.edit": "Edytuj wydarzenie",
   "customers.calendar.editor.titleLabel.email": "Temat",
@@ -303,6 +317,7 @@
   "customers.calendar.editor.titlePlaceholder": "Dodaj tytuł…",
   "customers.calendar.editor.to": "Do",
   "customers.calendar.editor.typeSwitcher": "Typ wydarzenia",
+  "customers.calendar.editor.typeUnavailable": "Przed zapisaniem wybierz dostępny typ wydarzenia.",
   "customers.calendar.editor.types.call": "Telefon",
   "customers.calendar.editor.types.email": "E-mail",
   "customers.calendar.editor.types.event": "Wydarzenie",
@@ -312,6 +327,8 @@
   "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.timezoneGap": "Ta godzina nie istnieje w wybranej strefie czasowej",
+  "customers.calendar.editor.validation.timezoneInvalid": "Wybierz poprawną strefę czasową",
   "customers.calendar.editor.validation.titleRequired": "Tytuł jest wymagany",
   "customers.calendar.empty.action": "Nowe wydarzenie",
   "customers.calendar.empty.agenda": "Brak zaplanowanych wydarzeń w tym okresie",
@@ -368,6 +385,7 @@
   "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.",
+  "customers.calendar.settings.manageActivityTypes": "Zarządzaj typami aktywności",
   "customers.calendar.settings.max": "(maks. {count})",
   "customers.calendar.settings.removeTag": "Usuń {tag}",
   "customers.calendar.settings.save": "Zapisz zmiany",
@@ -798,6 +816,71 @@
   "customers.companies.presets.inactive60": "Nieaktywne > 60 dni",
   "customers.companies.presets.myAccounts": "Moje konta",
   "customers.companies.presets.recentlyCreated": "Ostatnio utworzone",
+  "customers.config.activityTypes.appearance": "Wygląd",
+  "customers.config.activityTypes.behavior": "Zachowanie formularza",
+  "customers.config.activityTypes.columns.active": "Możliwość wyboru",
+  "customers.config.activityTypes.columns.behavior": "Zachowanie",
+  "customers.config.activityTypes.columns.fields": "Pola",
+  "customers.config.activityTypes.columns.fieldsets": "Zestawy pól",
+  "customers.config.activityTypes.columns.key": "Stały klucz",
+  "customers.config.activityTypes.columns.order": "Kolejność",
+  "customers.config.activityTypes.columns.source": "Źródło",
+  "customers.config.activityTypes.columns.type": "Typ aktywności",
+  "customers.config.activityTypes.configure": "Konfiguruj",
+  "customers.config.activityTypes.delete": "Usuń",
+  "customers.config.activityTypes.empty": "Brak dostępnych typów aktywności.",
+  "customers.config.activityTypes.fields.allDay": "Cały dzień",
+  "customers.config.activityTypes.fields.baseKind": "Podstawowe zachowanie",
+  "customers.config.activityTypes.fields.color": "Kolor (#RRGGBB)",
+  "customers.config.activityTypes.fields.customFieldsetIds": "Zestawy pól niestandardowych",
+  "customers.config.activityTypes.fields.endTime": "Czas zakończenia",
+  "customers.config.activityTypes.fields.icon": "Ikona",
+  "customers.config.activityTypes.fields.label": "Etykieta",
+  "customers.config.activityTypes.fields.location": "Pole lokalizacji",
+  "customers.config.activityTypes.fields.order": "Kolejność wyświetlania",
+  "customers.config.activityTypes.fields.people": "Pole osób",
+  "customers.config.activityTypes.fields.priority": "Priorytet",
+  "customers.config.activityTypes.fields.recurrence": "Powtarzanie",
+  "customers.config.activityTypes.fields.resources": "Zasoby",
+  "customers.config.activityTypes.fields.selectable": "Dostępny dla nowych wydarzeń",
+  "customers.config.activityTypes.fields.value": "Stały klucz",
+  "customers.config.activityTypes.fieldsetsUnavailable": "Zestawy pól są niedostępne. Wczytaj je ponownie przed zapisem.",
+  "customers.config.activityTypes.inactiveHint": "Moduł obecnie uniemożliwia zastosowanie tego nadpisania.",
+  "customers.config.activityTypes.inherited": "Dziedziczony",
+  "customers.config.activityTypes.inheritedHint": "Zapis utworzy lokalne nadpisanie dla tej organizacji.",
+  "customers.config.activityTypes.invalidBehavior": "Sprawdź wartości zachowania formularza.",
+  "customers.config.activityTypes.invalidKey": "Użyj klucza z małych liter, cyfr, łączników lub podkreśleń.",
+  "customers.config.activityTypes.loadFailed": "Nie udało się wczytać typów aktywności.",
+  "customers.config.activityTypes.loadingFieldsets": "Wczytywanie zestawów pól…",
+  "customers.config.activityTypes.local": "Lokalne nadpisanie",
+  "customers.config.activityTypes.missing": "brak",
+  "customers.config.activityTypes.missingHint": "Niektóre skonfigurowane zestawy pól już nie istnieją.",
+  "customers.config.activityTypes.new": "Nowy typ aktywności",
+  "customers.config.activityTypes.no": "Nie",
+  "customers.config.activityTypes.noFieldsets": "Nie zdefiniowano jeszcze zestawów pól niestandardowych.",
+  "customers.config.activityTypes.options.assignee": "Osoba przypisana",
+  "customers.config.activityTypes.options.attendees": "Uczestnicy",
+  "customers.config.activityTypes.options.call": "Połączenie",
+  "customers.config.activityTypes.options.email": "E-mail",
+  "customers.config.activityTypes.options.event": "Wydarzenie",
+  "customers.config.activityTypes.options.location": "Lokalizacja",
+  "customers.config.activityTypes.options.meeting": "Spotkanie",
+  "customers.config.activityTypes.options.none": "Brak",
+  "customers.config.activityTypes.options.note": "Notatka",
+  "customers.config.activityTypes.options.participants": "Osoby uczestniczące",
+  "customers.config.activityTypes.options.phoneLink": "Łącze telefoniczne",
+  "customers.config.activityTypes.options.recipients": "Odbiorcy",
+  "customers.config.activityTypes.options.task": "Zadanie",
+  "customers.config.activityTypes.refresh": "Odśwież",
+  "customers.config.activityTypes.removed": "Usunięto konfigurację typu aktywności.",
+  "customers.config.activityTypes.reset": "Zresetuj nadpisanie",
+  "customers.config.activityTypes.resetConfirm": "Usunąć lokalną konfigurację typu aktywności?",
+  "customers.config.activityTypes.retry": "Ponów",
+  "customers.config.activityTypes.save": "Zapisz",
+  "customers.config.activityTypes.saveFailed": "Nie udało się zapisać typu aktywności.",
+  "customers.config.activityTypes.saved": "Zapisano typ aktywności.",
+  "customers.config.activityTypes.view": "Wyświetl",
+  "customers.config.activityTypes.yes": "Tak",
   "customers.config.addressFormat.description": "Wybierz, jak powinny być zbudowane formularze i widoki w module klientów.",
   "customers.config.addressFormat.error": "Nie udało się wczytać ustawień adresu",
   "customers.config.addressFormat.errorSave": "Nie udało się zaktualizować ustawień adresu",

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

@@ -1,29 +1,70 @@
 import type { CalendarItem, CalendarItemStatus, CalendarParticipant } from '../../components/calendar/types'
+import { parseLinkedEntities } from './editorPayload'
 import { participantActorKey } from './participantIdentity'
 import type { ConflictScope } from './preferences'
 
 export const EDITOR_DRAFT_CONFLICT_ID = '__draft__'
 
 export type FindConflictsOptions = {
-  // 'all' (default) flags any actor-sharing overlap; 'mine' only flags overlaps
-  // where `currentUserId` is an actor of BOTH events (the user is double-booked).
-  // 'mine' with no `currentUserId` degrades to 'all' — it cannot resolve "mine".
+  // 'all' (default) flags any overlap that shares a person or a resource. 'mine'
+  // narrows the PEOPLE overlaps to those where `currentUserId` is an actor of BOTH
+  // events (the user is double-booked); a shared resource is flagged in both
+  // scopes. 'mine' with no `currentUserId` degrades to 'all' — it cannot resolve
+  // "mine".
   scope?: ConflictScope
   currentUserId?: string | null
 }
 
-function sharesActor(first: CalendarItem, second: CalendarItem): boolean {
-  if (first.ownerUserId && second.ownerUserId && first.ownerUserId === second.ownerUserId) return true
-  if (first.participants.length === 0 || second.participants.length === 0) return false
-  const firstActorKeys = new Set(
-    first.participants
-      .map(participantActorKey)
-      .filter((actorKey): actorKey is string => actorKey !== null),
-  )
-  return second.participants.some((participant) => {
-    const actorKey = participantActorKey(participant)
-    return actorKey !== null && firstActorKeys.has(actorKey)
-  })
+export type ConflictSubject = { kind: 'person' | 'resource'; key: string; label: string }
+
+function participantLabel(participant: CalendarParticipant): string {
+  return participant.name?.trim() || participant.email?.trim() || ''
+}
+
+function bookedResources(item: CalendarItem): Array<{ id: string; label: string }> {
+  return parseLinkedEntities((item.raw as { linkedEntities?: unknown }).linkedEntities).resources
+}
+
+/**
+ * The people and resources two events have in common — what makes an overlap a
+ * double-booking. A person is shared through the owner or a participant; a
+ * resource through a `resource` link. Labels are empty when the event carries no
+ * name for the subject.
+ */
+export function sharedConflictSubjects(first: CalendarItem, second: CalendarItem): ConflictSubject[] {
+  const shared = new Map<string, ConflictSubject>()
+  const labelOf = (item: CalendarItem, actorKey: string): string => {
+    const match = item.participants.find((participant) => participantActorKey(participant) === actorKey)
+    return match ? participantLabel(match) : ''
+  }
+  if (first.ownerUserId && second.ownerUserId && first.ownerUserId === second.ownerUserId) {
+    const key = `user:${first.ownerUserId}`
+    shared.set(key, { kind: 'person', key, label: labelOf(first, key) || labelOf(second, key) })
+  }
+  if (first.participants.length > 0 && second.participants.length > 0) {
+    const secondActorKeys = new Set(
+      second.participants
+        .map(participantActorKey)
+        .filter((actorKey): actorKey is string => actorKey !== null),
+    )
+    for (const participant of first.participants) {
+      const key = participantActorKey(participant)
+      if (key === null || !secondActorKeys.has(key) || shared.has(key)) continue
+      shared.set(key, { kind: 'person', key, label: participantLabel(participant) || labelOf(second, key) })
+    }
+  }
+  const firstResources = bookedResources(first)
+  if (firstResources.length > 0) {
+    const secondResources = new Map(bookedResources(second).map((resource) => [resource.id, resource]))
+    for (const resource of firstResources) {
+      const other = secondResources.get(resource.id)
+      if (!other) continue
+      const key = `resource:${resource.id}`
+      const label = resource.label !== resource.id ? resource.label : other.label !== other.id ? other.label : ''
+      shared.set(key, { kind: 'resource', key, label })
+    }
+  }
+  return [...shared.values()]
 }
 
 function isActor(item: CalendarItem, userId: string): boolean {
@@ -52,12 +93,20 @@ export function findConflicts(items: CalendarItem[], options: FindConflictsOptio
       const other = candidates[lookahead]
       if (other.start.getTime() >= currentEnd) break
       if (current.start.getTime() >= other.end.getTime()) continue
-      // Org-wide rule first: the two events must share at least one actor.
-      if (!sharesActor(current, other)) continue
-      // 'mine' narrows that set to the current user's OWN double-bookings — they
-      // must be an actor of both events. Because they are then the shared actor,
-      // 'mine' is always a strict subset of 'all' (it never invents new conflicts).
-      if (restrictToCurrentUser && !(isActor(current, currentUserId) && isActor(other, currentUserId))) continue
+      // Org-wide rule first: the two events must share at least one actor or
+      // booked resource.
+      const shared = sharedConflictSubjects(current, other)
+      if (shared.length === 0) continue
+      // 'mine' narrows the people overlaps to the current user's OWN
+      // double-bookings — they must be an actor of both events. Because they are
+      // then the shared actor, 'mine' is always a strict subset of 'all' (it never
+      // invents new conflicts). A double-booked resource is not anyone's in
+      // particular — a room cannot host two events — so it is flagged in both scopes.
+      if (
+        restrictToCurrentUser
+        && !shared.some((subject) => subject.kind === 'resource')
+        && !(isActor(current, currentUserId) && isActor(other, currentUserId))
+      ) continue
       appendConflict(conflicts, current.id, other.id)
       appendConflict(conflicts, other.id, current.id)
     }
@@ -74,20 +123,29 @@ export type EditorConflictDraft = {
   // exactly as the grid excludes canceled items, so the editor never warns about
   // a record the grid would not badge/ring. Defaults to 'planned'.
   status?: CalendarItemStatus
+  // Resources the draft books. Omitted when the type has no resources field.
+  resources?: Array<{ id: string; label: string }>
+  // Display name of `ownerUserId`, when the editor knows it (a task's assignee).
+  // An owner who is not also a participant has no name on either event.
+  ownerLabel?: string | null
 }
 
+export type EditorConflict = { item: CalendarItem; shared: ConflictSubject[] }
+
 /**
  * Resolves the items a calendar editor draft conflicts with, using the SAME
- * `findConflicts` rules as the grid (overlap + shared owner/participant) so the
- * editor's conflict warning is always consistent with the grid badges/rings.
- * The edited record itself (`excludeId`) is never treated as a conflict.
+ * `findConflicts` rules as the grid (overlap + shared owner/participant/resource)
+ * so the editor's conflict warning is always consistent with the grid
+ * badges/rings. Each conflict names the people and resources that are
+ * double-booked. The edited record itself (`excludeId`) is never treated as a
+ * conflict.
  */
-export function findEditorConflictItems(
+export function findEditorConflicts(
   draft: EditorConflictDraft,
   others: CalendarItem[],
   excludeId: string | null,
   options: FindConflictsOptions = {},
-): CalendarItem[] {
+): EditorConflict[] {
   const draftStatus: CalendarItemStatus = draft.status ?? 'planned'
   const draftItem: CalendarItem = {
     id: EDITOR_DRAFT_CONFLICT_ID,
@@ -108,7 +166,12 @@ export function findEditorConflictItems(
     color: null,
     isRecurringOccurrence: false,
     updatedAt: null,
-    raw: { id: EDITOR_DRAFT_CONFLICT_ID, interactionType: 'meeting', status: draftStatus },
+    raw: {
+      id: EDITOR_DRAFT_CONFLICT_ID,
+      interactionType: 'meeting',
+      status: draftStatus,
+      linkedEntities: (draft.resources ?? []).map((resource) => ({ id: resource.id, type: 'resource', label: resource.label })),
+    },
   }
   // Exclude the edited record by its underlying interaction id (`raw.id`), which
   // also drops every expanded occurrence of an edited recurring series (those
@@ -122,4 +185,20 @@ export function findEditorConflictItems(
   return conflictIds
     .map((id) => byId.get(id))
     .filter((item): item is CalendarItem => Boolean(item))
+    .map((item) => ({
+      item,
+      shared: sharedConflictSubjects(draftItem, item).map((subject) =>
+        !subject.label && draft.ownerLabel && subject.key === `user:${draft.ownerUserId}`
+          ? { ...subject, label: draft.ownerLabel }
+          : subject),
+    }))
+}
+
+export function findEditorConflictItems(
+  draft: EditorConflictDraft,
+  others: CalendarItem[],
+  excludeId: string | null,
+  options: FindConflictsOptions = {},
+): CalendarItem[] {
+  return findEditorConflicts(draft, others, excludeId, options).map((conflict) => conflict.item)
 }

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

@@ -1,5 +1,7 @@
 import type { CalendarItem } from '../../components/calendar/types'
+import { calendarEventTypeKeySchema, resolveCalendarEventType } from '../../calendar-event-types'
 import { parseRecurrenceRule } from './recurrence'
+import { calendarDayEndInstant, calendarDayStartInstant, calendarInstantToWallTime, calendarWallTimeToInstant, defaultCalendarTimezone, isCalendarTimezone } from './timezone'
 
 export type EditorKind = 'meeting' | 'call' | 'email' | 'note' | 'event' | 'task'
 
@@ -41,7 +43,11 @@ const KIND_BY_INTERACTION_TYPE: Record<string, EditorKind> = {
   deadline: 'task',
 }
 
+/** @deprecated Resolve the effective calendar event type and read `behavior.baseKind`. */
 export function editorKindOfInteractionType(interactionType: string): EditorKind {
+  const parsedKey = calendarEventTypeKeySchema.safeParse(interactionType)
+  const effectiveKind = parsedKey.success ? resolveCalendarEventType(parsedKey.data)?.behavior.baseKind : undefined
+  if (effectiveKind) return effectiveKind
   return KIND_BY_INTERACTION_TYPE[interactionType] ?? 'meeting'
 }
 
@@ -161,6 +167,7 @@ export type EditorFormState = {
   allDay: boolean
   date: string
   startTime: string
+  timezone?: string
   endDate: string
   endTime: string
   repeatFreq: EditorRepeatFreq
@@ -245,6 +252,7 @@ export function createDefaultFormState(
   }
   return {
     kind: 'meeting',
+    timezone: defaultCalendarTimezone(),
     title: '',
     relatedTo: null,
     dealId: null,
@@ -286,21 +294,23 @@ export function buildRecurrenceRule(state: EditorFormState): string | null {
   }
   if (state.repeatEndType === 'count') rule += `;COUNT=${state.repeatCount}`
   if (state.repeatEndType === 'date' && state.repeatUntilDate) {
-    rule += `;UNTIL=${state.repeatUntilDate.replace(/-/g, '')}T235959Z`
+    const until = state.timezone ? calendarDayEndInstant(state.repeatUntilDate, state.timezone) : null
+    rule += `;UNTIL=${until ? until.toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z') : `${state.repeatUntilDate.replace(/-/g, '')}T235959Z`}`
   }
   return rule
 }
 
 export function computeDurationMinutes(state: EditorFormState): number | null {
-  const start = new Date(`${state.date}T${state.startTime}:00`)
-  const end = new Date(`${state.endDate}T${state.endTime}:00`)
-  if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime())) return null
+  const start = state.timezone ? calendarWallTimeToInstant(state.date, state.startTime, state.timezone) : new Date(`${state.date}T${state.startTime}:00`)
+  const end = state.timezone ? calendarWallTimeToInstant(state.endDate, state.endTime, state.timezone) : new Date(`${state.endDate}T${state.endTime}:00`)
+  if (!start || !end || Number.isNaN(start.getTime()) || Number.isNaN(end.getTime())) return null
   const minutes = Math.round((end.getTime() - start.getTime()) / 60_000)
   return minutes > 0 ? minutes : null
 }
 
 export type BuildPayloadOptions = {
   mode: 'create' | 'edit'
+  config?: EditorKindConfig
   id?: string
   /**
    * When the resources module is loaded the payload owns `linkedEntities`
@@ -317,10 +327,16 @@ export type BuildPayloadOptions = {
 }
 
 export function buildInteractionPayload(state: EditorFormState, options: BuildPayloadOptions): Record<string, unknown> {
-  const config = KIND_CONFIG[state.kind]
+  const config = options.config ?? KIND_CONFIG[state.kind]
   const time = state.allDay && config.hasAllDay ? '00:00' : state.startTime
-  const scheduledAt = new Date(`${state.date}T${time}:00`).toISOString()
+  const instant = state.timezone ? (state.allDay && config.hasAllDay ? calendarDayStartInstant(state.date, state.timezone) : calendarWallTimeToInstant(state.date, time, state.timezone)) : new Date(`${state.date}T${time}:00`)
+  if (!instant || !Number.isFinite(instant.getTime())) throw new Error('[internal] Invalid calendar local time')
+  const scheduledAt = instant.toISOString()
   const recurrenceRule = config.hasRepeat ? buildRecurrenceRule(state) : null
+  const recurrenceEnd = recurrenceRule && state.repeatEndType === 'date' && state.repeatUntilDate
+    ? state.timezone ? calendarDayEndInstant(state.repeatUntilDate, state.timezone) : new Date(state.repeatUntilDate)
+    : null
+  if (recurrenceRule && state.repeatEndType === 'date' && state.repeatUntilDate && !recurrenceEnd) throw new Error('[internal] Invalid calendar recurrence day')
   const payload: Record<string, unknown> = {
     ...(options.mode === 'edit' && options.id ? { id: options.id } : {}),
     entityId: state.relatedTo?.id ?? null,
@@ -332,14 +348,12 @@ export function buildInteractionPayload(state: EditorFormState, options: BuildPa
     date: state.date,
     time,
     scheduledAt,
+    ...(state.timezone ? { timezone: state.timezone } : {}),
     durationMinutes: config.hasEnd && !(state.allDay && config.hasAllDay) ? computeDurationMinutes(state) : null,
     allDay: config.hasAllDay ? state.allDay : null,
     location: config.location ? state.location.trim() || null : null,
     recurrenceRule,
-    recurrenceEnd:
-      recurrenceRule && state.repeatEndType === 'date' && state.repeatUntilDate
-        ? new Date(state.repeatUntilDate).toISOString()
-        : null,
+    recurrenceEnd: recurrenceEnd?.toISOString() ?? null,
     participants:
       config.people && config.people !== 'assignee' && state.participants.length > 0
         ? state.participants.map((participant) => ({
@@ -374,10 +388,11 @@ function readUnknownNumber(value: unknown): number | null {
 
 type ParsedRepeat = Pick<EditorFormState, 'repeatFreq' | 'repeatDays' | 'repeatEndType' | 'repeatCount' | 'repeatUntilDate'>
 
-function parseRepeatFromRule(rawRule: unknown, start: Date): ParsedRepeat {
+function parseRepeatFromRule(rawRule: unknown, start: Date, timezone?: string): ParsedRepeat {
+  const wallStart = timezone ? new Date(`${calendarInstantToWallTime(start, timezone).date}T12:00:00`) : start
   const fallback: ParsedRepeat = {
     repeatFreq: 'none',
-    repeatDays: defaultRepeatDays(start),
+    repeatDays: defaultRepeatDays(wallStart),
     repeatEndType: 'never',
     repeatCount: 8,
     repeatUntilDate: '',
@@ -386,7 +401,7 @@ function parseRepeatFromRule(rawRule: unknown, start: Date): ParsedRepeat {
   if (!ruleText) return fallback
   const parsed = parseRecurrenceRule(ruleText)
   if (!parsed) return fallback
-  const repeatDays = defaultRepeatDays(start)
+  const repeatDays = defaultRepeatDays(wallStart)
   if (parsed.byDay) {
     repeatDays.fill(false)
     for (const jsWeekday of parsed.byDay) repeatDays[(jsWeekday + 6) % 7] = true
@@ -399,7 +414,7 @@ function parseRepeatFromRule(rawRule: unknown, start: Date): ParsedRepeat {
     repeatCount = parsed.count
   } else if (parsed.until) {
     repeatEndType = 'date'
-    repeatUntilDate = `${parsed.until.getUTCFullYear()}-${padDatePart(parsed.until.getUTCMonth() + 1)}-${padDatePart(parsed.until.getUTCDate())}`
+    repeatUntilDate = timezone ? calendarInstantToWallTime(parsed.until, timezone).date : `${parsed.until.getUTCFullYear()}-${padDatePart(parsed.until.getUTCMonth() + 1)}-${padDatePart(parsed.until.getUTCDate())}`
   }
   return {
     repeatFreq: parsed.freq === 'DAILY' ? 'daily' : 'weekly',
@@ -427,6 +442,9 @@ 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)
+  const timezone = isCalendarTimezone(raw.timezone) ? raw.timezone : defaultCalendarTimezone()
+  const startWall = calendarInstantToWallTime(item.start, timezone)
+  const endWall = calendarInstantToWallTime(item.end, timezone)
   return {
     kind,
     title: item.title,
@@ -434,11 +452,13 @@ export function parseItemToFormState(item: CalendarItem): EditorFormState {
     dealId: item.dealId,
     dealLabel: null,
     allDay: item.allDay,
-    date: formatLocalDateInput(item.start),
-    startTime: formatLocalTimeInput(item.start),
-    endDate: formatLocalDateInput(item.end),
-    endTime: formatLocalTimeInput(item.end),
-    ...parseRepeatFromRule(item.raw.recurrenceRule, item.start),
+    timezone,
+    date: startWall.date,
+    startTime: startWall.time,
+    endDate: endWall.date,
+    endTime: endWall.time,
+    ...parseRepeatFromRule(item.raw.recurrenceRule, item.start, isCalendarTimezone(raw.timezone) ? timezone : undefined),
+    ...(item.raw.recurrenceEnd && isCalendarTimezone(raw.timezone) ? { repeatUntilDate: calendarInstantToWallTime(new Date(item.raw.recurrenceEnd), timezone).date } : {}),
     category: item.interactionType,
     location: item.location ?? '',
     participants: parseParticipants(item),