diff --git a/__test__/features/Events/EventApi.test.tsx b/__test__/features/Events/EventApi.test.tsx index 69b6a70..d6662fe 100644 --- a/__test__/features/Events/EventApi.test.tsx +++ b/__test__/features/Events/EventApi.test.tsx @@ -79,15 +79,14 @@ describe("eventApi", () => { (api as unknown as jest.Mock).mockReturnValue({ json: jest.fn().mockResolvedValue(mockResponse), }); - const result = await moveEvent(mockEvent); + const result = await moveEvent(mockEvent, "newurl.ics"); expect(api).toHaveBeenCalledWith( "dav/calendars/667037022b752d0026472254/667037022b752d0026472254/cal1.ics", expect.objectContaining({ method: "MOVE", headers: { - destination: - "/calendars/667037022b752d0026472254/667037022b752d0026472254/cal1.ics", + destination: "newurl.ics", }, }) ); diff --git a/__test__/features/Events/EventDisplay.test.tsx b/__test__/features/Events/EventDisplay.test.tsx index 093bfb7..869d918 100644 --- a/__test__/features/Events/EventDisplay.test.tsx +++ b/__test__/features/Events/EventDisplay.test.tsx @@ -796,7 +796,6 @@ describe("Event Full Display", () => { await waitFor(() => { expect(spy).toHaveBeenCalled(); - expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick"); }); const updatedEvent = spy.mock.calls[0][0].newEvent; @@ -854,7 +853,6 @@ describe("Event Full Display", () => { await waitFor(() => { expect(spy).toHaveBeenCalled(); - expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick"); }); const updatedEvent = spy.mock.calls[0][0].newEvent; @@ -912,7 +910,6 @@ describe("Event Full Display", () => { await waitFor(() => { expect(spy).toHaveBeenCalled(); - expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick"); }); const updatedEvent = spy.mock.calls[0][0].newEvent; diff --git a/src/features/Calendars/CalendarSlice.ts b/src/features/Calendars/CalendarSlice.ts index cdbbd4e..e941a51 100644 --- a/src/features/Calendars/CalendarSlice.ts +++ b/src/features/Calendars/CalendarSlice.ts @@ -94,9 +94,9 @@ export const putEventAsync = createAsyncThunk< }); export const moveEventAsync = createAsyncThunk< { calId: string; events: CalendarEvent[] }, // Return type - { cal: Calendars; newEvent: CalendarEvent } // Arg type ->("calendars/moveEvent", async ({ cal, newEvent }) => { - const response = await moveEvent(newEvent); + { cal: Calendars; newEvent: CalendarEvent; newURL: string } // Arg type +>("calendars/moveEvent", async ({ cal, newEvent, newURL }) => { + const response = await moveEvent(newEvent, newURL); const calEvents = (await getCalendar(cal.id, { start: formatDateToYYYYMMDDTHHMMSS(new Date(newEvent.start)), end: formatDateToYYYYMMDDTHHMMSS( diff --git a/src/features/Events/EventApi.ts b/src/features/Events/EventApi.ts index 018cf1e..add8daf 100644 --- a/src/features/Events/EventApi.ts +++ b/src/features/Events/EventApi.ts @@ -16,11 +16,11 @@ export async function putEvent(event: CalendarEvent) { return response; } -export async function moveEvent(event: CalendarEvent) { +export async function moveEvent(event: CalendarEvent, newUrl: string) { const response = await api(`dav${event.URL}`, { method: "MOVE", headers: { - destination: event.URL, + destination: newUrl, }, }); return response; diff --git a/src/features/Events/EventDisplay.tsx b/src/features/Events/EventDisplay.tsx index 5d09c10..66917dd 100644 --- a/src/features/Events/EventDisplay.tsx +++ b/src/features/Events/EventDisplay.tsx @@ -132,7 +132,6 @@ export default function EventDisplayModal({ }; dispatch(putEventAsync({ cal: calendar, newEvent })); - onClose({}, "backdropClick"); } const handleSave = () => { @@ -176,7 +175,11 @@ export default function EventDisplayModal({ if (newCalId !== calId) { dispatch( - moveEventAsync({ cal: userPersonnalCalendars[calendarid], newEvent }) + moveEventAsync({ + cal: userPersonnalCalendars[calendarid], + newEvent, + newURL: `/calendars/${newCalId}/${event.uid}.ics`, + }) ); } onClose({}, "backdropClick");