eduvia/workavia-calendar-front
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor recurring event modification (#173)

Browse Source
This commit is contained in:
Camille Moussu
2025-10-07 18:16:00 +02:00
committed by GitHub
parent 3f8f3eff23
commit c86db8fa49
15 changed files with 1924 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__test__/features/Events/EventDisplay.test.tsx
+60 -65
View File
@@ -46,7 +46,7 @@ describe("Event Preview Display", () => {
color: "#FF0000",
events: {
event1: {
id: "event1",
uid: "event1",
title: "Test Event",
calId: "667037022b752d0026472254/cal1",
start: day.toISOString(),
@@ -72,7 +72,7 @@ describe("Event Preview Display", () => {
],
},
event2: {
id: "event2",
uid: "event2",
title: "Test Event",
calId: "667037022b752d0026472254/cal1",
start: day.toISOString(),
@@ -87,7 +87,7 @@ describe("Event Preview Display", () => {
color: "#FF0000",
events: {
event1: {
id: "event1",
uid: "event1",
calId: "otherCal/cal",
title: "Test Event Other cal",
start: day.toISOString(),
@@ -358,7 +358,6 @@ describe("Event Preview Display", () => {
await waitFor(() => {
expect(spy).toHaveBeenCalled();
expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick");
});
const updatedEvent = spy.mock.calls[0][0].newEvent;
@@ -416,7 +415,6 @@ describe("Event Preview Display", () => {
await waitFor(() => {
expect(spy).toHaveBeenCalled();
expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick");
});
const updatedEvent = spy.mock.calls[0][0].newEvent;
@@ -474,7 +472,6 @@ describe("Event Preview Display", () => {
await waitFor(() => {
expect(spy).toHaveBeenCalled();
expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick");
});
const updatedEvent = spy.mock.calls[0][0].newEvent;
@@ -507,8 +504,8 @@ describe("Event Preview Display", () => {
await waitFor(() => {
expect(spy).toHaveBeenCalled();
expect(screen.getByText("Edit Event")).toBeInTheDocument();
});
expect(screen.getByText("Edit Event")).toBeInTheDocument();
});
it("properly render message button when MAIL_SPA_URL is not null and event has attendees", () => {
(window as any).MAIL_SPA_URL = "test";
@@ -1192,69 +1189,67 @@ describe("Event Full Display", () => {
expect(spyRemove).toHaveBeenCalled();
});
// const spyPut = jest
// .spyOn(eventThunks, "putEventAsync")
// .mockImplementation((payload) => () => Promise.resolve(payload) as any);
// const spyRemove = jest.spyOn(eventThunks, "removeEvent");
it("removes recurrence instances when saving an edited recurring series", async () => {
const spyPut = jest
.spyOn(eventThunks, "putEventAsync")
.mockImplementation((payload) => () => Promise.resolve(payload) as any);
const spyRemove = jest.spyOn(eventThunks, "removeEvent");
// const day = new Date();
// const preloadedRecurrence = {
// ...preloadedState,
// calendars: {
// list: {
// "667037022b752d0026472254/cal1": {
// id: "667037022b752d0026472254/cal1",
// name: "First Calendar",
// color: "#FF0000",
// events: {
// "base/20250101": {
// uid: "base/20250101",
// calId: "667037022b752d0026472254/cal1",
// title: "eventA",
// },
// "base/20250201": {
// uid: "base/20250201",
// calId: "667037022b752d0026472254/cal1",
// title: "eventB",
// },
// "base/20250301": {
// uid: "base/20250301",
// title: "Recurring event",
// calId: "667037022b752d0026472254/cal1",
// start: day.toISOString(),
// end: day.toISOString(),
// organizer: { cal_address: "test@test.com" },
// attendee: [{ cal_address: "test@test.com", cn: "Test" }],
// },
// },
// },
// },
// pending: false,
// },
// };
const day = new Date();
const preloadedRecurrence = {
...preloadedState,
calendars: {
list: {
"667037022b752d0026472254/cal1": {
id: "667037022b752d0026472254/cal1",
name: "First Calendar",
color: "#FF0000",
events: {
"base/20250101": {
uid: "base/20250101",
calId: "667037022b752d0026472254/cal1",
title: "eventA",
},
"base/20250201": {
uid: "base/20250201",
calId: "667037022b752d0026472254/cal1",
title: "eventB",
},
"base/20250301": {
uid: "base/20250301",
title: "Recurring event",
calId: "667037022b752d0026472254/cal1",
start: day.toISOString(),
end: day.toISOString(),
organizer: { cal_address: "test@test.com" },
attendee: [{ cal_address: "test@test.com", cn: "Test" }],
},
},
},
},
pending: false,
},
};
// renderWithProviders(
// <EventDisplayModal
// open={true}
// onClose={mockOnClose}
// calId={"667037022b752d0026472254/cal1"}
// eventId={"base/20250301"}
// />,
// preloadedRecurrence
// );
renderWithProviders(
<EventDisplayModal
open={true}
onClose={mockOnClose}
calId={"667037022b752d0026472254/cal1"}
eventId={"base/20250301"}
/>,
preloadedRecurrence
);
// act(() => fireEvent.click(screen.getByText("Save")));
act(() => fireEvent.click(screen.getByText("Save")));
// await waitFor(() => {
// expect(spyPut).toHaveBeenCalled();
// });
await waitFor(() => {
expect(spyPut).toHaveBeenCalled();
});
await waitFor(() => {
expect(spyRemove).toHaveBeenCalled();
});
});
// await waitFor(() => {
// expect(spyRemove).toHaveBeenCalled();
// });
// });
it("InfoRow renders error style when error prop is true", () => {
renderWithProviders(<InfoRow icon={<span>i</span>} text="Bad" error />);