Skip to content

fix: week view and column view slots not fetching at end of month bug #24374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emrysal merged 5 commits into from
Oct 9, 2025
Merged

fix: week view and column view slots not fetching at end of month bug #24374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc584b2
fix: dont pick date value from url, use selectedDate value from booke…
Ryukemeister Oct 8, 2025
b8fc723
Merge branch 'main' into fix-week-view-bug
Ryukemeister Oct 9, 2025
409821a
fix: replace month count logic with usePrefectch hook
Ryukemeister Oct 9, 2025
01dca70
intialise booker layout as week view
Ryukemeister Oct 9, 2025
99055fe
Merge branch 'main' into fix-week-view-bug
Ryukemeister Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/platform/atoms/booker/BookerWebWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const BookerPlatformWrapperComponent = (props: BookerWebWrapperAtomProps) => {
: clientFetchedEvent;

const bookerLayout = useBookerLayout(event.data?.profile?.bookerLayouts);
const selectedDate = searchParams?.get("date");
const selectedDate = useBookerStoreContext((state) => state.selectedDate);
Copy link
Contributor Author

@Ryukemeister Ryukemeister Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is an issue with this approach, what happens is we pick date from search params and that value is correct, but when the params are updated nextjs is not able to detect this param updation so the value of selectedDate never changes. hence we can use selectedDate from useBookerStoreContext instead

const isRedirect = searchParams?.get("redirected") === "true" || false;
const fromUserNameRedirected = searchParams?.get("username") || "";
const rescheduleUid =
Expand Down
25 changes: 8 additions & 17 deletions packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import {
import { Header } from "@calcom/features/bookings/Booker/components/Header";
import { BookerSection } from "@calcom/features/bookings/Booker/components/Section";
import { useBookerLayout } from "@calcom/features/bookings/Booker/components/hooks/useBookerLayout";
import { usePrefetch } from "@calcom/features/bookings/Booker/components/hooks/usePrefetch";
import { useTimePreferences } from "@calcom/features/bookings/lib";
import { LargeCalendar } from "@calcom/features/calendar-view/LargeCalendar";
import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
import { useTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/useTimesForSchedule";
import { getRoutedTeamMemberIdsFromSearchParams } from "@calcom/lib/bookings/getRoutedTeamMemberIdsFromSearchParams";
import { BookerLayouts } from "@calcom/prisma/zod-utils";

import { formatUsername } from "../../booker/BookerPlatformWrapper";
import type {
Expand All @@ -40,7 +40,6 @@ const CalendarViewPlatformWrapperComponent = (
teamMemberEmail,
crmAppSlug,
crmOwnerRecordType,
view = "MONTH_VIEW",
} = props;

const teamId: number | undefined = props.isTeamEvent ? props.teamId : undefined;
Expand Down Expand Up @@ -73,22 +72,15 @@ const CalendarViewPlatformWrapperComponent = (
);
const selectedDate = useBookerStoreContext((state) => state.selectedDate);
const date = dayjs(selectedDate).format("YYYY-MM-DD");
const monthCount =
((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
dayjs(date).add(1, "month").month() !==
dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
? 2
: undefined;
const month = useBookerStoreContext((state) => state.month);
const [dayCount] = useBookerStoreContext((state) => [state.dayCount, state.setDayCount], shallow);

const prefetchNextMonth =
(bookerLayout.layout === BookerLayouts.WEEK_VIEW &&
!!bookerLayout.extraDays &&
dayjs(date).month() !== dayjs(date).add(bookerLayout.extraDays, "day").month()) ||
(bookerLayout.layout === BookerLayouts.COLUMN_VIEW &&
dayjs(date).month() !== dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month());
const { prefetchNextMonth, monthCount } = usePrefetch({
date,
month,
bookerLayout,
bookerState,
});

const [startTime, endTime] = useTimesForSchedule({
month,
Expand Down Expand Up @@ -136,7 +128,6 @@ const CalendarViewPlatformWrapperComponent = (
}, [props.routingFormSearchParams]);
const bookingData = useBookerStoreContext((state) => state.bookingData);
const setBookingData = useBookerStoreContext((state) => state.setBookingData);
const layout = BookerLayouts[view];

useGetBookingForReschedule({
uid: props.rescheduleUid ?? props.bookingUid ?? "",
Expand All @@ -154,7 +145,7 @@ const CalendarViewPlatformWrapperComponent = (
eventId: event?.data?.id,
rescheduleUid: props.rescheduleUid ?? null,
bookingUid: props.bookingUid ?? null,
layout: layout,
layout: "week_view",
Copy link
Contributor Author

@Ryukemeister Ryukemeister Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we know this is always gonna be week view hence we hardcode the layout as week_view

org: props.entity?.orgSlug,
username,
bookingData,
Expand Down
Loading