Complete recurrence editing and calendar preferences

webui/src/features/calendar/calendarViewModel.ts

@@ -74,7 +74,7 @@ const MAX_TIMED_EVENT_COLUMNS = 3;
 const CALENDAR_MODE_STORAGE_KEY = "govoplan.calendar.mode";
 const CALENDAR_VIEW_PREFERENCES_STORAGE_KEY =
   "govoplan.calendar.viewPreferences";
-const DEFAULT_CALENDAR_VIEW_PREFERENCES: CalendarViewPreferences = {
+export const DEFAULT_CALENDAR_VIEW_PREFERENCES: CalendarViewPreferences = {
   dimWeekends: true,
   dimOffHours: true,
   workdayStartHour: 6,
@@ -84,6 +84,10 @@ const DEFAULT_CALENDAR_VIEW_PREFERENCES: CalendarViewPreferences = {
   alternateContinuousMonths: true,
 };
 
+export function calendarEventInstanceId(event: CalendarEvent): string {
+  return event.instance_id || event.id;
+}
+
 export function rangeForMode(
   mode: CalendarMode,
   focusDate: Date,
@@ -677,7 +681,7 @@ export function layoutTimedEventsForDay(
     }
     if (hidden.length > 0) {
       overflows.push({
-        key: `${dayKey(day)}-${hidden[0].event.id}-overflow`,
+        key: `${dayKey(day)}-${calendarEventInstanceId(hidden[0].event)}-overflow`,
         top: Math.min(...hidden.map((item) => item.top)),
         column: overflowColumn,
         columns: MAX_TIMED_EVENT_COLUMNS,