[#446] removed direct state update (#468)

src/features/Calendars/CalendarSlice.ts

@@ -23,12 +23,6 @@ import {
   updateSeriesAsync,
 } from "./services";
 
-// Define error type for rejected actions
-export interface RejectedError {
-  message: string;
-  status?: number;
-}
-
 const CalendarSlice = createSlice({
   name: "calendars",
   initialState: {
@@ -182,42 +176,10 @@ const CalendarSlice = createSlice({
           );
         }
       )
-      .addCase(
-        putEventAsync.fulfilled,
-        (
-          state,
-          action: PayloadAction<{
-            calId: string;
-            events: CalendarEvent[];
-            calType?: "temp";
-          }>
-        ) => {
-          state.pending = false;
-          const type = action.payload.calType === "temp" ? "templist" : "list";
-
-          if (!state[type][action.payload.calId]) {
-            state[type][action.payload.calId] = {
-              id: action.payload.calId,
-              events: {},
-            } as Calendar;
-          }
-          action.payload.events.forEach((event) => {
-            state[type][action.payload.calId].events[event.uid] = event;
-          });
-          Object.keys(state[type][action.payload.calId].events).forEach(
-            (id) => {
-              state[type][action.payload.calId].events[id].color =
-                state[type][action.payload.calId].color;
-              state[type][action.payload.calId].events[id].calId =
-                action.payload.calId;
-              if (!state[type][action.payload.calId].events[id].timezone) {
-                state[type][action.payload.calId].events[id].timezone =
-                  browserDefaultTimeZone;
-              }
-            }
-          );
-        }
-      )
+      .addCase(putEventAsync.fulfilled, (state) => {
+        state.pending = false;
+        state.error = null;
+      })
       .addCase(
         getEventAsync.fulfilled,
         (
@@ -236,50 +198,12 @@ const CalendarSlice = createSlice({
             action.payload.event;
         }
       )
-      .addCase(
-        moveEventAsync.fulfilled,
-        (
-          state,
-          action: PayloadAction<{ calId: string; events: CalendarEvent[] }>
-        ) => {
-          state.pending = false;
-          if (!state.list[action.payload.calId]) {
-            state.list[action.payload.calId] = {
-              id: action.payload.calId,
-              events: {},
-            } as Calendar;
-          }
-          action.payload.events.forEach((event) => {
-            state.list[action.payload.calId].events[event.uid] = event;
-          });
-          Object.keys(state.list[action.payload.calId].events).forEach((id) => {
-            state.list[action.payload.calId].events[id].color =
-              state.list[action.payload.calId].color;
-            state.list[action.payload.calId].events[id].calId =
-              action.payload.calId;
-            if (!state.list[action.payload.calId].events[id].timezone) {
-              state.list[action.payload.calId].events[id].timezone =
-                browserDefaultTimeZone;
-            }
-          });
-        }
-      )
-      .addCase(deleteEventAsync.fulfilled, (state, action) => {
+      .addCase(moveEventAsync.fulfilled, (state) => {
+        state.pending = false;
+        state.error = null;
+      })
+      .addCase(deleteEventAsync.fulfilled, (state) => {
         state.pending = false;
-        const [baseId, recurrenceId] = action.payload.eventId.split("/");
-        if (recurrenceId) {
-          Object.keys(state.list[action.payload.calId].events).forEach(
-            (element) => {
-              if (extractEventBaseUuid(element) === baseId) {
-                delete state.list[action.payload.calId].events[element];
-              }
-            }
-          );
-        } else {
-          delete state.list[action.payload.calId].events[
-            action.payload.eventId
-          ];
-        }
         state.error = null;
       })
       .addCase(deleteEventInstanceAsync.fulfilled, (state, action) => {

src/features/Calendars/services/addSharedCalendarAsync.ts

@@ -2,7 +2,7 @@ import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { getUserDetails } from "@/features/User/userAPI";
 import { addSharedCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const addSharedCalendarAsync = createAsyncThunk<
   {

src/features/Calendars/services/createCalendarAsync.ts

@@ -1,8 +1,9 @@
 import { getUserDetails } from "@/features/User/userAPI";
+import { userData } from "@/features/User/userDataTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { postCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const createCalendarAsync = createAsyncThunk<
   {
@@ -15,7 +16,7 @@ export const createCalendarAsync = createAsyncThunk<
     ownerEmails: string[];
   },
   {
-    userId: string;
+    userData: userData;
     calId: string;
     color: Record<string, string>;
     name: string;
@@ -24,21 +25,25 @@ export const createCalendarAsync = createAsyncThunk<
   { rejectValue: RejectedError }
 >(
   "calendars/createCalendar",
-  async ({ userId, calId, color, name, desc }, { rejectWithValue }) => {
+  async ({ userData, calId, color, name, desc }, { rejectWithValue }) => {
     try {
-      await postCalendar(userId, calId, color, name, desc);
-      const ownerData: any = await getUserDetails(userId.split("/")[0]);
+      if (!userData.openpaasId) {
+        throw new Error("No openpaasId");
+      }
+
+      await postCalendar(userData.openpaasId, calId, color, name, desc);
+      const owner = [userData.given_name, userData.family_name]
+        .filter(Boolean)
+        .join(" ");
 
       return {
-        userId,
+        userId: userData.openpaasId,
         calId,
         color,
         name,
         desc,
-        owner: [ownerData.firstname, ownerData.lastname]
-          .filter(Boolean)
-          .join(" "),
-        ownerEmails: ownerData.emails ?? [],
+        owner,
+        ownerEmails: userData.email ? [userData.email] : [],
       };
     } catch (err: any) {
       return rejectWithValue({

src/features/Calendars/services/deleteEventAsync.ts

@@ -1,7 +1,7 @@
 import { deleteEvent } from "@/features/Events/EventApi";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const deleteEventAsync = createAsyncThunk<
   { calId: string; eventId: string },

src/features/Calendars/services/deleteEventInstanceAsync.ts

@@ -2,7 +2,7 @@ import { deleteEventInstance } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const deleteEventInstanceAsync = createAsyncThunk<

src/features/Calendars/services/getCalendarDetailAsync.ts

@@ -2,7 +2,7 @@ import { CalendarEvent } from "@/features/Events/EventsTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { getCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { extractCalendarEvents } from "../utils/extractCalendarEvents";
 
 export const getCalendarDetailAsync = createAsyncThunk<

src/features/Calendars/services/getCalendarsListAsync.ts

@@ -2,7 +2,7 @@ import { getOpenPaasUser, getUserDetails } from "@/features/User/userAPI";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { getCalendars } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 import { normalizeCalendar } from "../utils/normalizeCalendar";
 

src/features/Calendars/services/getEventAsync.ts

@@ -2,7 +2,7 @@ import { getEvent } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const getEventAsync = createAsyncThunk<
   { calId: string; event: CalendarEvent },

src/features/Calendars/services/getTempCalendarsListAsync.ts

@@ -4,7 +4,7 @@ import { getUserDetails } from "@/features/User/userAPI";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { getCalendars } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const getTempCalendarsListAsync = createAsyncThunk<
@@ -14,9 +14,14 @@ export const getTempCalendarsListAsync = createAsyncThunk<
 >("calendars/getTempCalendars", async (tempUser, { rejectWithValue }) => {
   try {
     const importedCalendars: Record<string, Calendar> = {};
-
+    if (!tempUser.openpaasId) {
+      const username = tempUser.displayName || tempUser.email || "User";
+      throw new Error(
+        `TRANSLATION:calendar.userDoesNotHaveValidId|name=${encodeURIComponent(username)}`
+      );
+    }
     const calendars = (await getCalendars(
-      tempUser.openpaasId ?? "",
+      tempUser.openpaasId,
       "sharedPublic=true&"
     )) as Record<string, any>;
 

src/features/Calendars/services/importEventFromFileAsync.ts

@@ -2,7 +2,7 @@ import { importEventFromFile } from "@/features/Events/EventApi";
 import { importFile } from "@/utils/apiUtils";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const importEventFromFileAsync = createAsyncThunk<
   void,

src/features/Calendars/services/moveEventAsync.ts

@@ -8,11 +8,11 @@ import {
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { getCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const moveEventAsync = createAsyncThunk<
-  { calId: string; events: CalendarEvent[] },
+  { calId: string },
   { cal: Calendar; newEvent: CalendarEvent; newURL: string },
   { rejectValue: RejectedError }
 >(
@@ -21,31 +21,8 @@ export const moveEventAsync = createAsyncThunk<
     try {
       await moveEvent(newEvent, newURL);
 
-      const eventDate = new Date(newEvent.start);
-      const { start: weekStart, end: weekEnd } = computeWeekRange(eventDate);
-
-      const calEvents = (await getCalendar(cal.id, {
-        start: formatDateToYYYYMMDDTHHMMSS(weekStart),
-        end: formatDateToYYYYMMDDTHHMMSS(weekEnd),
-      })) as Record<string, any>;
-      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,
-              eventURL
-            );
-          });
-        }
-      );
-
       return {
         calId: cal.id,
-        events,
       };
     } catch (err: any) {
       return rejectWithValue({

src/features/Calendars/services/patchACLCalendarAsync.ts

@@ -1,7 +1,7 @@
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { updateAclCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const patchACLCalendarAsync = createAsyncThunk<
   {

src/features/Calendars/services/patchCalendarAsync.ts

@@ -1,7 +1,7 @@
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { proppatchCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const patchCalendarAsync = createAsyncThunk<
   {

src/features/Calendars/services/putEventAsync.ts

@@ -1,18 +1,12 @@
 import { putEvent } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
-import { parseCalendarEvent } from "@/features/Events/eventUtils";
-import {
-  computeWeekRange,
-  formatDateToYYYYMMDDTHHMMSS,
-} from "@/utils/dateUtils";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { getCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const putEventAsync = createAsyncThunk<
-  { calId: string; events: CalendarEvent[]; calType?: "temp" },
+  { calId: string; calType?: "temp" },
   { cal: Calendar; newEvent: CalendarEvent; calType?: "temp" },
   { rejectValue: RejectedError }
 >(
@@ -23,34 +17,9 @@ export const putEventAsync = createAsyncThunk<
         newEvent,
         cal.ownerEmails ? cal.ownerEmails[0] : undefined
       );
-      const eventDate = new Date(newEvent.start);
-
-      const { start: weekStart, end: weekEnd } = computeWeekRange(eventDate);
-
-      const calEvents = (await getCalendar(cal.id, {
-        start: formatDateToYYYYMMDDTHHMMSS(weekStart),
-        end: formatDateToYYYYMMDDTHHMMSS(weekEnd),
-      })) as Record<string, any>;
-      const events: CalendarEvent[] = calEvents._embedded["dav:item"].flatMap(
-        (eventdata: any) => {
-          const vevents = eventdata.data[2] as any[][];
-          const eventURL = eventdata._links.self.href;
-          const valarm = eventdata.data[2][0][2][0];
-          return vevents.map((vevent: any[]) => {
-            return parseCalendarEvent(
-              vevent[1],
-              cal.color ?? {},
-              cal.id,
-              eventURL,
-              valarm
-            );
-          });
-        }
-      );
 
       return {
         calId: cal.id,
-        events,
         calType,
       };
     } catch (err: any) {

src/features/Calendars/services/refreshCalendar.ts

@@ -3,7 +3,7 @@ import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import pMap from "p-map";
 import { fetchSyncTokenChanges } from "../api/fetchSyncTokenChanges";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 import { expandEventFunction } from "../utils/expandEventFunction";
 import { processSyncUpdates } from "../utils/processSyncTokenUpdates";

src/features/Calendars/services/removeCalendarAsync.ts

@@ -1,7 +1,7 @@
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
 import { removeCalendar } from "../CalendarApi";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 
 export const removeCalendarAsync = createAsyncThunk<
   {

src/features/Calendars/services/updateEventInstanceAsync.ts

@@ -2,7 +2,7 @@ import { putEventWithOverrides } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const updateEventInstanceAsync = createAsyncThunk<

src/features/Calendars/services/updateSeriesAsync.ts

@@ -2,7 +2,7 @@ import { updateSeries } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
 import { formatReduxError } from "@/utils/errorUtils";
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { RejectedError } from "../CalendarSlice";
+import { RejectedError } from "../types/RejectedError";
 import { Calendar } from "../CalendarTypes";
 
 export const updateSeriesAsync = createAsyncThunk<

src/features/Calendars/types/RejectedError.ts

@@ -0,0 +1,6 @@
+// Define error type for rejected actions
+
+export interface RejectedError {
+  message: string;
+  status?: number;
+}