[#31] fixed sending data

src/features/Events/EventApi.ts

@@ -1,14 +1,14 @@
 import { api } from "../../utils/apiUtils";
 import { Calendars } from "../Calendars/CalendarTypes";
 import { CalendarEvent } from "./EventsTypes";
-import { calendarEventToICal, calendarEventToJCal } from "./eventUtils";
+import { calendarEventToJCal } from "./eventUtils";
 
 export async function putEvent(cal: Calendars, event: CalendarEvent) {
   const response = await api(
     `dav/calendars/${cal.id}/${event.uid.split(".")[0]}.isc`,
     {
       method: "PUT",
-      body: JSON.stringify(calendarEventToICal(cal, event)),
+      body: JSON.stringify(calendarEventToJCal(event)),
       headers: {
         "content-type": "text/calendar; charset=utf-8",
       },
@@ -16,10 +16,3 @@ export async function putEvent(cal: Calendars, event: CalendarEvent) {
   ).json();
   return response;
 }
-
-export async function getEvent(calID: string, eventID: string) {
-  const response = await api
-    .get(`dav/calendars/${calID}/${eventID}.ics`)
-    .json();
-  return response;
-}

src/features/Events/EventModal.tsx

@@ -62,8 +62,6 @@ function EventPopover({
   }, [selectedRange]);
 
   const handleSave = async () => {
-    if (!calendarid) return; // Prevent crash if no calendar is selected
-
     const newEvent: CalendarEvent = {
       title,
       start: new Date(start),
@@ -86,12 +84,7 @@ function EventPopover({
       transp: "OPAQUE",
       color: userPersonnalCalendars[calendarid]?.color,
     };
-    // dispatch(
-    //   addEvent({
-    //     calendarUid: userPersonnalCalendars[calendarid]?.id,
-    //     event: newEvent,
-    //   })
-    // );
+
     dispatch(
       putEventAsync({
         cal: userPersonnalCalendars[calendarid],
@@ -208,11 +201,7 @@ function EventPopover({
           >
             Cancel
           </Button>
-          <Button
-            variant="contained"
-            onClick={handleSave}
-            disabled={!(calendarid ?? false) || !title}
-          >
+          <Button variant="contained" onClick={handleSave} disabled={!title}>
             Save
           </Button>
         </Box>

src/features/Events/eventUtils.ts

@@ -87,19 +87,14 @@ export function parseCalendarEvent(
 }
 
 export function calendarEventToJCal(event: CalendarEvent): any[] {
-  const tzid = event.timezone ?? "UTC"; // Fallback to UTC if no timezone provided
+  const tzid = event.timezone; // Fallback to UTC if no timezone provided
 
   const vevent: any[] = [
     "vevent",
     [
       ["uid", {}, "text", event.uid],
       ["transp", {}, "text", event.transp ?? "OPAQUE"],
-      [
-        "dtstart",
-        { tzid },
-        "date-time",
-        event.start.toISOString().split(".")[0],
-      ],
+      ["dtstart", { tzid }, "date-time", formatDateToICal(event.start)],
       ["class", {}, "text", event.class ?? "PUBLIC"],
       [
         "x-openpaas-videoconference",
@@ -117,7 +112,7 @@ export function calendarEventToJCal(event: CalendarEvent): any[] {
       "dtend",
       { tzid },
       "date-time",
-      event.start.toISOString().split(".")[0],
+      formatDateToICal(event.end),
     ]);
   }
   if (event.organizer) {
@@ -125,9 +120,15 @@ export function calendarEventToJCal(event: CalendarEvent): any[] {
       "organizer",
       { cn: event.organizer.cn },
       "cal-address",
-      `mailto:${event.organizer.cal_address}`,
+      event.organizer.cal_address,
     ]);
   }
+  if (event.location) {
+    vevent[1].push(["location", {}, "text", event.location]);
+  }
+  if (event.description) {
+    vevent[1].push(["description", {}, "text", event.description]);
+  }
 
   event.attendee.forEach((att) => {
     vevent[1].push([
@@ -140,18 +141,19 @@ export function calendarEventToJCal(event: CalendarEvent): any[] {
         cutype: att.cutype,
       },
       "cal-address",
-      `mailto:${att.cal_address}`,
+      att.cal_address,
     ]);
   });
 
-  const vtimezone: any[] = ["vtimezone", [["tzid", {}, "text", tzid]], []];
-
-  return ["vcalendar", [], [vevent, vtimezone]];
+  const vtimezone = new ICAL.Timezone({
+    component: TIMEZONES.zones[event.timezone].ics,
+    tzid: event.timezone,
+  });
+  return ["vcalendar", [], [vevent, vtimezone.component.jCal]];
 }
-
-function formatDateToICal(date: Date, tz?: string) {
+function formatDateToICal(date: Date) {
   // Format date like: 20250214T110000 (local time)
-  // If tz is provided, use TZID param in DTSTART/DTEND
+
   const pad = (n: number) => n.toString().padStart(2, "0");
   const year = date.getFullYear();
   const month = pad(date.getMonth() + 1);
@@ -161,61 +163,3 @@ function formatDateToICal(date: Date, tz?: string) {
   const seconds = pad(date.getSeconds());
   return `${year}${month}${day}T${hours}${minutes}${seconds}`;
 }
-
-export function calendarEventToICal(
-  cal: Calendars,
-  event: CalendarEvent
-): string {
-  const lines = [];
-  lines.push("BEGIN:VCALENDAR");
-  lines.push("VERSION:2.0");
-  lines.push("PRODID:-//Sabre//Sabre VObject 4.1.3//EN");
-  if (cal.calscale) lines.push(`CALSCALE:${cal.calscale}`);
-  if (cal.version) lines.push(`VERSION:${cal.version}`);
-
-  lines.push(TIMEZONES.zones[event.timezone].ics);
-  lines.push("BEGIN:VEVENT");
-  lines.push(`UID:${event.uid}`);
-
-  if (event.transp) lines.push(`TRANSP:${event.transp.toUpperCase()}`);
-  if (event.start)
-    lines.push(
-      `DTSTART${event.timezone ? `;TZID=${event.timezone}` : ""}:` +
-        formatDateToICal(event.start)
-    );
-  if (event.end)
-    lines.push(
-      `DTEND${event.timezone ? `;TZID=${event.timezone}` : ""}:` +
-        formatDateToICal(event.end)
-    );
-  lines.push(`DTSTAMP:${ICAL.Time.now().toICALString()}`);
-
-  if (event.class) lines.push(`CLASS:${event.class.toUpperCase()}`);
-  if (event.x_openpass_videoconference !== undefined)
-    lines.push(
-      `X-OPENPAAS-VIDEOCONFERENCE:${event.x_openpass_videoconference || ""}`
-    );
-  if (event.title) lines.push(`SUMMARY:${event.title}`);
-  if (event.description) lines.push(`DESCRIPTION:${event.description}`);
-  if (event.location) lines.push(`LOCATION:${event.location}`);
-
-  if (event.organizer) {
-    lines.push(
-      `ORGANIZER;CN=${event.organizer.cn}:${event.organizer.cal_address}`
-    );
-  }
-
-  event.attendee.forEach((att) => {
-    lines.push(
-      `ATTENDEE;PARTSTAT=${att.partstat};RSVP=${att.rsvp};ROLE=${att.role};CUTYPE=${att.cutype};CN=${att.cn}:${att.cal_address}`
-    );
-  });
-
-  if (event.stamp) lines.push(`DTSTAMP:${formatDateToICal(event.stamp)}Z`);
-  if (event.sequence !== undefined) lines.push(`SEQUENCE:${event.sequence}`);
-
-  lines.push("END:VEVENT");
-  lines.push("END:VCALENDAR\n");
-  console.debug(lines.join("\r\n"));
-  return lines.join("\r\n");
-}