From 684fd8202779205954ee52c6e95761d44da3aeee Mon Sep 17 00:00:00 2001
From: Camille Moussu <cmoussu@linagora.com>
Date: Mon, 25 Aug 2025 09:47:43 +0200
Subject: [PATCH] [#4] event url is now stored and reused when updating event
 to prevent duplication

---
 src/components/Calendar/CalendarSelection.tsx | 12 +++----
 src/features/Calendars/CalendarSlice.ts       | 19 ++++++----
 src/features/Events/EventApi.ts               | 36 +++++++++----------
 src/features/Events/EventsTypes.ts            |  1 +
 src/features/Events/eventUtils.ts             |  4 ++-
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/components/Calendar/CalendarSelection.tsx b/src/components/Calendar/CalendarSelection.tsx
index c354d82..9179d08 100644
--- a/src/components/Calendar/CalendarSelection.tsx
+++ b/src/components/Calendar/CalendarSelection.tsx
@@ -26,9 +26,9 @@ export default function CalendarSelection({
 
   return (
     <div>
-      <p className="calendarListHeader">
+      <span className="calendarListHeader">
         <h3>Personnal Calendars</h3>
-      </p>
+      </span>
       {personnalCalendars.map((id) => {
         return (
           <div key={id}>
@@ -46,9 +46,9 @@ export default function CalendarSelection({
       })}
       {delegatedCalendars.length > 0 && (
         <>
-          <p className="calendarListHeader">
+          <span className="calendarListHeader">
             <h3>Delegated Calendars</h3>
-          </p>
+          </span>
           {delegatedCalendars.map((id) => (
             <div key={id}>
               <label>
@@ -66,9 +66,9 @@ export default function CalendarSelection({
       )}
       {sharedCalendars.length > 0 && (
         <>
-          <p className="calendarListHeader">
+          <span className="calendarListHeader">
             <h3>Shared Calendars</h3>
-          </p>
+          </span>
           {sharedCalendars.map((id) => (
             <div key={id}>
               <label>
diff --git a/src/features/Calendars/CalendarSlice.ts b/src/features/Calendars/CalendarSlice.ts
index aaee08a..1c165fe 100644
--- a/src/features/Calendars/CalendarSlice.ts
+++ b/src/features/Calendars/CalendarSlice.ts
@@ -54,8 +54,9 @@ 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 eventURL = eventdata._links.self.href;
       return vevents.map((vevent: any[]) => {
-        return parseCalendarEvent(vevent[1], color, calId);
+        return parseCalendarEvent(vevent[1], color, calId, eventURL);
       });
     }
   );
@@ -67,7 +68,7 @@ export const putEventAsync = createAsyncThunk<
   { calId: string; events: CalendarEvent[] }, // Return type
   { cal: Calendars; newEvent: CalendarEvent } // Arg type
 >("calendars/putEvent", async ({ cal, newEvent }) => {
-  const response = await putEvent(cal, newEvent);
+  const response = await putEvent(newEvent);
   const calEvents = (await getCalendar(cal.id, {
     start: formatDateToYYYYMMDDTHHMMSS(new Date(newEvent.start)),
     end: formatDateToYYYYMMDDTHHMMSS(
@@ -77,8 +78,9 @@ export const putEventAsync = createAsyncThunk<
   const events: CalendarEvent[] = calEvents._embedded["dav:item"].flatMap(
     (eventdata: any) => {
       const vevents = eventdata.data[2] as any[][];
+      const eventURL = eventdata._links.self.href;
       return vevents.map((vevent: any[]) => {
-        return parseCalendarEvent(vevent[1], cal.color ?? "", cal.id);
+        return parseCalendarEvent(vevent[1], cal.color ?? "", cal.id, eventURL);
       });
     }
   );
@@ -91,9 +93,9 @@ export const putEventAsync = createAsyncThunk<
 
 export const deleteEventAsync = createAsyncThunk<
   { calId: string; eventId: string }, // Return type
-  { calId: string; eventId: string } // Arg type
->("calendars/delEvent", async ({ calId, eventId }) => {
-  const response = await deleteEvent(calId, eventId);
+  { calId: string; eventId: string; eventURL: string } // Arg type
+>("calendars/delEvent", async ({ calId, eventId, eventURL }) => {
+  const response = await deleteEvent(eventURL);
   return { calId, eventId };
 });
 
@@ -118,6 +120,11 @@ const CalendarSlice = createSlice({
       }
       state.list[action.payload.calendarUid].events[action.payload.event.uid] =
         action.payload.event;
+      state.list[action.payload.calendarUid].events[
+        action.payload.event.uid
+      ].URL = `dav/calendars/${action.payload.calendarUid}/${
+        action.payload.event.uid.split("/")[0]
+      }.isc`;
     },
     removeEvent: (
       state,
diff --git a/src/features/Events/EventApi.ts b/src/features/Events/EventApi.ts
index 87cd76c..dca1c72 100644
--- a/src/features/Events/EventApi.ts
+++ b/src/features/Events/EventApi.ts
@@ -1,28 +1,24 @@
 import { api } from "../../utils/apiUtils";
-import { Calendars } from "../Calendars/CalendarTypes";
 import { CalendarEvent } from "./EventsTypes";
 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(calendarEventToJCal(event)),
-      headers: {
-        "content-type": "text/calendar; charset=utf-8",
-      },
-    }
-  ).json();
-  return response;
+export async function putEvent(event: CalendarEvent) {
+  const response = await api(`dav${event.URL}`, {
+    method: "PUT",
+    body: JSON.stringify(calendarEventToJCal(event)),
+    headers: {
+      "content-type": "text/calendar; charset=utf-8",
+    },
+  });
+  if (response.status === 201) {
+    console.log("PUT :", response.url);
+  }
+  return await response.json();
 }
 
-export async function deleteEvent(calId: string, eventId: string) {
-  const response = await api(
-    `dav/calendars/${calId}/${eventId.split("/")[0]}.isc`,
-    {
-      method: "DELETE",
-    }
-  ).json();
+export async function deleteEvent(eventURL: string) {
+  const response = await api(eventURL, {
+    method: "DELETE",
+  }).json();
   return response;
 }
diff --git a/src/features/Events/EventsTypes.ts b/src/features/Events/EventsTypes.ts
index 8680709..7f4c744 100644
--- a/src/features/Events/EventsTypes.ts
+++ b/src/features/Events/EventsTypes.ts
@@ -1,6 +1,7 @@
 import { userAttendee, userOrganiser } from "../User/userDataTypes";
 
 export interface CalendarEvent {
+  URL: string;
   calId: string;
   uid: string;
   transp?: string;
diff --git a/src/features/Events/eventUtils.ts b/src/features/Events/eventUtils.ts
index df9defe..0a55eeb 100644
--- a/src/features/Events/eventUtils.ts
+++ b/src/features/Events/eventUtils.ts
@@ -8,7 +8,8 @@ type RawEntry = [string, Record<string, string>, string, any];
 export function parseCalendarEvent(
   data: RawEntry[],
   color: string,
-  calendarid: string
+  calendarid: string,
+  eventURL: string
 ): CalendarEvent {
   const event: Partial<CalendarEvent> = { color, attendee: [] };
   let recurrenceId;
@@ -75,6 +76,7 @@ export function parseCalendarEvent(
     event.uid = `${event.uid}/${recurrenceId}`;
   }
 
+  event.URL = eventURL;
   if (!event.uid || !event.start) {
     console.error(
       `missing crucial event param in calendar ${calendarid} `,