From 066d37a29ae599f3f77cbf13c75f743a3b42e549 Mon Sep 17 00:00:00 2001
From: Camille Moussu <66134347+Eriikah@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:46:20 +0200
Subject: [PATCH] Bug month navigation (#194)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
---
 __test__/components/Calendar.test.tsx | 44 +++++++++++++++++++++++++++
 src/components/Calendar/Calendar.tsx  |  8 +++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/__test__/components/Calendar.test.tsx b/__test__/components/Calendar.test.tsx
index 838c7f6..26767ca 100644
--- a/__test__/components/Calendar.test.tsx
+++ b/__test__/components/Calendar.test.tsx
@@ -3,6 +3,7 @@ import CalendarApp from "../../src/components/Calendar/Calendar";
 import * as eventThunks from "../../src/features/Calendars/CalendarSlice";
 import { renderWithProviders } from "../utils/Renderwithproviders";
 import { searchUsers } from "../../src/features/User/userAPI";
+import * as calendarThunks from "../../src/features/Calendars/CalendarSlice";
 import { useRef } from "react";
 
 import userEvent from "@testing-library/user-event";
@@ -302,4 +303,47 @@ describe("calendar Availability search", () => {
     });
     expect(dayNumbersWithContent.length).toBe(0);
   });
+
+  it("should fetch calendar details with date range matching the displayed month", async () => {
+    const spy = jest
+      .spyOn(calendarThunks, "getCalendarDetailAsync")
+      .mockImplementation((payload) => {
+        return () => Promise.resolve(payload) as any;
+      });
+    jest.useFakeTimers().setSystemTime(new Date("2025-01-01"));
+    renderWithProviders(<CalendarLayout />, preloadedState);
+
+    await waitFor(() => {
+      expect(spy).toHaveBeenCalled();
+    });
+
+    const calendarRef = (window as any).__calendarRef;
+    const calendarApi = calendarRef.current;
+    const view = calendarApi?.view;
+    calendarApi.changeView("dayGridMonth");
+    fireEvent.click(screen.getByTestId("ChevronRightIcon"));
+
+    expect(spy).toHaveBeenCalledTimes(2);
+    const callArgs = spy.mock.calls[1][0];
+    expect(callArgs.calId).toBe("user1/cal1");
+
+    const startDate = new Date(
+      callArgs.match.start.replace(
+        /(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})/,
+        "$1-$2-$3T$4:$5:$6"
+      )
+    );
+    const endDate = new Date(
+      callArgs.match.end.replace(
+        /(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})/,
+        "$1-$2-$3T$4:$5:$6"
+      )
+    );
+    // Verify the date range matches the displayed view
+    const viewStart = new Date(view.currentStart);
+    const viewEnd = new Date(view.currentEnd);
+
+    expect(startDate.getTime()).toBeLessThanOrEqual(viewStart.getTime());
+    expect(endDate.getTime()).toBeGreaterThanOrEqual(viewEnd.getTime());
+  });
 });
diff --git a/src/components/Calendar/Calendar.tsx b/src/components/Calendar/Calendar.tsx
index 1e7edb0..2d9d428 100644
--- a/src/components/Calendar/Calendar.tsx
+++ b/src/components/Calendar/Calendar.tsx
@@ -301,7 +301,8 @@ export default function CalendarApp({
               return (
                 eventDate.getFullYear() === date.getFullYear() &&
                 eventDate.getMonth() === date.getMonth() &&
-                eventDate.getDate() === date.getDate()
+                eventDate.getDate() === date.getDate() &&
+                event.status !== "CANCELLED"
               );
             });
             if (hasEvents) {
@@ -374,7 +375,10 @@ export default function CalendarApp({
               calendarRef.current?.getDate() || new Date(arg.start);
 
             if (arg.view.type === "dayGridMonth") {
-              setSelectedDate(new Date(arg.start));
+              const start = new Date(arg.start).getTime();
+              const end = new Date(arg.end).getTime();
+              const middle = start + (end - start) / 2;
+              setSelectedDate(new Date(middle));
               setSelectedMiniDate(calendarCurrentDate);
             } else {
               setSelectedDate(new Date(arg.start));