diff --git a/src/features/Calendars/CalendarSlice.ts b/src/features/Calendars/CalendarSlice.ts index e8273fe..3c64aac 100644 --- a/src/features/Calendars/CalendarSlice.ts +++ b/src/features/Calendars/CalendarSlice.ts @@ -56,9 +56,10 @@ export const getCalendarDetailAsync = createAsyncThunk< const events: CalendarEvent[] = calendar._embedded["dav:item"].flatMap( (eventdata: any) => { const vevents = eventdata.data[2] as any[][]; // array of ['vevent', RawEntry[], []] + const valarm = eventdata.data[2][0][2][0]; const eventURL = eventdata._links.self.href; return vevents.map((vevent: any[]) => { - return parseCalendarEvent(vevent[1], color, calId, eventURL); + return parseCalendarEvent(vevent[1], color, calId, eventURL, valarm); }); } ); @@ -88,8 +89,15 @@ export const putEventAsync = createAsyncThunk< (eventdata: any) => { const vevents = eventdata.data[2] as any[][]; const eventURL = eventdata._links.self.href; + const valarm = eventdata.data[3][0][1]; return vevents.map((vevent: any[]) => { - return parseCalendarEvent(vevent[1], cal.color ?? "", cal.id, eventURL); + return parseCalendarEvent( + vevent[1], + cal.color ?? "", + cal.id, + eventURL, + valarm + ); }); } ); diff --git a/src/features/Events/EventApi.ts b/src/features/Events/EventApi.ts index 734c9f3..e7a616b 100644 --- a/src/features/Events/EventApi.ts +++ b/src/features/Events/EventApi.ts @@ -16,10 +16,10 @@ export async function getEvent(event: CalendarEvent) { return { ...eventjson, ...event }; } -export async function putEvent(event: CalendarEvent) { +export async function putEvent(event: CalendarEvent, calOwnerEmail?: string) { const response = await api(`dav${event.URL}`, { method: "PUT", - body: JSON.stringify(calendarEventToJCal(event)), + body: JSON.stringify(calendarEventToJCal(event, calOwnerEmail)), headers: { "content-type": "text/calendar; charset=utf-8", }, diff --git a/src/features/Events/EventDisplay.tsx b/src/features/Events/EventDisplay.tsx index e6c9ccd..e9f9472 100644 --- a/src/features/Events/EventDisplay.tsx +++ b/src/features/Events/EventDisplay.tsx @@ -91,7 +91,7 @@ export default function EventDisplayModal({ const [repetition, setRepetition] = useState( event.repetition ?? ({} as RepetitionObject) ); - const [alarm, setAlarm] = useState(""); + const [alarm, setAlarm] = useState(event.alarm.trigger); const [busy, setBusy] = useState(""); const [eventClass, setEventClass] = useState(event?.class ?? "PUBLIC"); const [timezone, setTimezone] = useState(event?.timezone ?? "UTC"); @@ -160,6 +160,7 @@ export default function EventDisplayModal({ attendee: [organizer, ...attendees], transp: "OPAQUE", color: userPersonnalCalendars[calendarid]?.color, + alarm: { trigger: alarm, action: "EMAIL" }, }; const [baseId, recurrenceId] = event.uid.split("/"); @@ -471,31 +472,30 @@ export default function EventDisplayModal({ isOwn={isOwn} /> - - Alarm - - + + Alarm + + Visibility diff --git a/src/features/Events/EventModal.tsx b/src/features/Events/EventModal.tsx index 9b2fbd6..dcd0e6d 100644 --- a/src/features/Events/EventModal.tsx +++ b/src/features/Events/EventModal.tsx @@ -117,6 +117,7 @@ function EventPopover({ ], transp: "OPAQUE", color: userPersonnalCalendars[calendarid]?.color, + alarm: { trigger: alarm, action: "EMAIL" }, }; if (end) { newEvent.end = new Date(end); diff --git a/src/features/Events/EventsTypes.ts b/src/features/Events/EventsTypes.ts index eb0a13f..93df014 100644 --- a/src/features/Events/EventsTypes.ts +++ b/src/features/Events/EventsTypes.ts @@ -22,6 +22,7 @@ export interface CalendarEvent { status?: string; timezone: string; repetition?: RepetitionObject; + alarm: AlarmObject; } export interface RepetitionObject { @@ -31,3 +32,8 @@ export interface RepetitionObject { occurrences?: number; endDate?: string; } + +export interface AlarmObject { + trigger: string; + action: string; +} diff --git a/src/features/Events/eventUtils.ts b/src/features/Events/eventUtils.ts index 0e19bab..d48dd89 100644 --- a/src/features/Events/eventUtils.ts +++ b/src/features/Events/eventUtils.ts @@ -1,6 +1,6 @@ import { Calendars } from "../Calendars/CalendarTypes"; import { userAttendee } from "../User/userDataTypes"; -import { CalendarEvent } from "./EventsTypes"; +import { AlarmObject, CalendarEvent } from "./EventsTypes"; import ICAL from "ical.js"; import { TIMEZONES } from "../../utils/timezone-data"; type RawEntry = [string, Record, string, any]; @@ -9,7 +9,8 @@ export function parseCalendarEvent( data: RawEntry[], color: string, calendarid: string, - eventURL: string + eventURL: string, + valarm?: RawEntry[] ): CalendarEvent { const event: Partial = { color, attendee: [] }; let recurrenceId; @@ -103,6 +104,21 @@ export function parseCalendarEvent( event.uid = `${event.uid}/${recurrenceId}`; } + if (valarm) { + console.log(valarm); + event.alarm = {} as AlarmObject; + for (const [key, params, type, value] of valarm[1]) { + switch (key.toLowerCase()) { + case "action": + event.alarm.action = value; + break; + case "trigger": + event.alarm.trigger = value; + break; + } + } + } + event.URL = eventURL; if (!event.uid || !event.start) { console.error( @@ -115,7 +131,10 @@ export function parseCalendarEvent( return event as CalendarEvent; } -export function calendarEventToJCal(event: CalendarEvent): any[] { +export function calendarEventToJCal( + event: CalendarEvent, + calOwnerEmail?: string +): any[] { const tzid = event.timezone; // Fallback to UTC if no timezone provided const vevent: any[] = [ @@ -138,8 +157,23 @@ export function calendarEventToJCal(event: CalendarEvent): any[] { ], ["summary", {}, "text", event.title ?? ""], ], - [], ]; + if (event.alarm) { + const valarm = [ + ["trigger", {}, "duration", event.alarm.trigger], + ["action", {}, "text", event.alarm.action], + ["attendee", {}, "cal-address", `mailto:${calOwnerEmail}`], + ["summary", {}, "text", event.title], + [ + "description", + {}, + "text", + "This is an automatic alarm sent by OpenPaas", + ], + ]; + vevent.push([["valarm", valarm]]); + } + vevent.push([]); if (event.end) { if (event.allday && event.end.getTime() === event.start.getTime()) {