From 2d0803090aeaadf63412519992021c7cfb511837 Mon Sep 17 00:00:00 2001
From: Camille Moussu <66134347+Eriikah@users.noreply.github.com>
Date: Tue, 4 Nov 2025 14:14:29 +0100
Subject: [PATCH] [#278] fixed unprefilled calendar and added test (#279)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
---
 __test__/features/Events/EventModal.test.tsx | 7 +++++++
 src/features/Events/EventModal.tsx           | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/__test__/features/Events/EventModal.test.tsx b/__test__/features/Events/EventModal.test.tsx
index 60f059c..587061a 100644
--- a/__test__/features/Events/EventModal.test.tsx
+++ b/__test__/features/Events/EventModal.test.tsx
@@ -341,4 +341,11 @@ describe("EventPopover", () => {
 
     expect(mockOnClose).toHaveBeenCalledWith({}, "backdropClick");
   });
+
+  it("BUGFIX: Prefill Calendar field", async () => {
+    renderPopover();
+    await waitFor(() =>
+      expect(screen.getByLabelText("Calendar")).toHaveTextContent("Calendar 1")
+    );
+  });
 });
diff --git a/src/features/Events/EventModal.tsx b/src/features/Events/EventModal.tsx
index 53cdb3f..a095256 100644
--- a/src/features/Events/EventModal.tsx
+++ b/src/features/Events/EventModal.tsx
@@ -130,6 +130,12 @@ function EventPopover({
     userPersonnalCalendarsRef.current = userPersonnalCalendars;
   }, [userPersonnalCalendars]);
 
+  useEffect(() => {
+    if (!calendarid && userPersonnalCalendars.length > 0) {
+      setCalendarid(userPersonnalCalendars[0].id);
+    }
+  }, [calendarid, userPersonnalCalendars]);
+
   const resetAllStateToDefault = useCallback(() => {
     setShowMore(false);
     setShowDescription(false);