* Revert "fix: revert bookings redesign (#25172)"
This reverts commit 1f102bf3b4.
* add bookings-v3 feature flag
* put things behind a feature flag
* remove no longer needed test
* revert e2e tests
* put back description
* revert AvatarGroup
* apply feedback
* remove "view" booking action
* remove Alert (When the bookings query errors, this branch now renders only the alert and skips the data-table filter/segment controls. Those controls moved into BookingsList, so in error states users can no longer clear or tweak filters to recover from the failure, effectively trapping them behind the alert.)
* address feedback
* revert useMediaQuery
164 lines
5.7 KiB
TypeScript
164 lines
5.7 KiB
TypeScript
"use client";
|
|
|
|
import { useMemo, useEffect } from "react";
|
|
|
|
import dayjs from "@calcom/dayjs";
|
|
import { useTimePreferences } from "@calcom/features/bookings/lib";
|
|
import { Calendar } from "@calcom/features/calendars/weeklyview";
|
|
import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { useGetTheme } from "@calcom/lib/hooks/useTheme";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
|
|
import { Icon } from "@calcom/ui/components/icon";
|
|
|
|
import { useBookingDetailsSheetStore } from "../store/bookingDetailsSheetStore";
|
|
import type { BookingOutput } from "../types";
|
|
|
|
type BookingsCalendarViewProps = {
|
|
bookings: BookingOutput[];
|
|
currentWeekStart: dayjs.Dayjs;
|
|
onWeekStartChange: (weekStart: dayjs.Dayjs) => void;
|
|
isPending?: boolean;
|
|
};
|
|
|
|
export function BookingsCalendarView({
|
|
bookings,
|
|
currentWeekStart,
|
|
onWeekStartChange,
|
|
isPending = false,
|
|
}: BookingsCalendarViewProps) {
|
|
const setSelectedBookingId = useBookingDetailsSheetStore((state) => state.setSelectedBookingId);
|
|
const { t } = useLocale();
|
|
const { timezone } = useTimePreferences();
|
|
const { resolvedTheme, forcedTheme } = useGetTheme();
|
|
|
|
const goToPreviousWeek = () => {
|
|
onWeekStartChange(currentWeekStart.subtract(1, "week"));
|
|
};
|
|
|
|
const goToNextWeek = () => {
|
|
onWeekStartChange(currentWeekStart.add(1, "week"));
|
|
};
|
|
|
|
const goToToday = () => {
|
|
onWeekStartChange(dayjs().startOf("week"));
|
|
};
|
|
|
|
const startDate = useMemo(() => currentWeekStart.toDate(), [currentWeekStart]);
|
|
const endDate = useMemo(() => currentWeekStart.add(6, "day").toDate(), [currentWeekStart]);
|
|
|
|
// Intentionally only runs on mount to trigger the initial currentWeekStart
|
|
useEffect(() => {
|
|
onWeekStartChange(currentWeekStart);
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, []);
|
|
|
|
const events = useMemo<CalendarEvent[]>(() => {
|
|
const hasDarkTheme = !forcedTheme && resolvedTheme === "dark";
|
|
|
|
return bookings
|
|
.filter((booking) => {
|
|
const bookingStart = dayjs(booking.startTime);
|
|
return (
|
|
(bookingStart.isAfter(currentWeekStart) || bookingStart.isSame(currentWeekStart)) &&
|
|
bookingStart.isBefore(currentWeekStart.add(7, "day"))
|
|
);
|
|
})
|
|
.sort((a, b) => {
|
|
const startDiff = new Date(a.startTime).getTime() - new Date(b.startTime).getTime();
|
|
if (startDiff !== 0) return startDiff;
|
|
return new Date(a.endTime).getTime() - new Date(b.endTime).getTime();
|
|
})
|
|
.map((booking, idx) => {
|
|
// Parse eventTypeColor and extract the appropriate color based on theme
|
|
const eventTypeColor =
|
|
booking.eventType?.eventTypeColor &&
|
|
booking.eventType.eventTypeColor[hasDarkTheme ? "darkEventTypeColor" : "lightEventTypeColor"];
|
|
|
|
return {
|
|
id: idx,
|
|
title: booking.title,
|
|
start: new Date(booking.startTime),
|
|
end: new Date(booking.endTime),
|
|
options: {
|
|
status: booking.status,
|
|
...(eventTypeColor && { color: eventTypeColor }),
|
|
bookingId: booking.id,
|
|
},
|
|
};
|
|
});
|
|
}, [bookings, currentWeekStart, resolvedTheme, forcedTheme]);
|
|
|
|
const weekStart = currentWeekStart;
|
|
const weekEnd = currentWeekStart.add(6, "day");
|
|
const startMonth = weekStart.format("MMM");
|
|
const endMonth = weekEnd.format("MMM");
|
|
const year = weekEnd.format("YYYY");
|
|
|
|
const weekRange =
|
|
startMonth === endMonth ? (
|
|
<>
|
|
<span className="text-emphasis">{`${startMonth} ${weekStart.format("D")} - ${weekEnd.format(
|
|
"D"
|
|
)}`}</span>
|
|
<span className="text-muted">, {year}</span>
|
|
</>
|
|
) : (
|
|
<>
|
|
<span className="text-emphasis">{`${weekStart.format("MMM D")} - ${weekEnd.format("MMM D")}`}</span>
|
|
<span className="text-muted">, {year}</span>
|
|
</>
|
|
);
|
|
|
|
return (
|
|
<div className="border-subtle flex h-[calc(100vh-260px)] min-h-[600px] flex-col rounded-2xl border">
|
|
<div className="mx-4 mt-4 flex items-center justify-between py-1.5">
|
|
<div className="flex items-center gap-2">
|
|
<h2 className="text-xl font-semibold">{weekRange}</h2>
|
|
{isPending && <Icon name="refresh-cw" className="text-muted h-4 w-4 animate-spin" />}
|
|
</div>
|
|
<div className="flex items-center gap-2">
|
|
<Button color="secondary" onClick={goToToday} className="capitalize leading-4">
|
|
{t("today")}
|
|
</Button>
|
|
<ButtonGroup combined>
|
|
<Button color="secondary" onClick={goToPreviousWeek}>
|
|
<span className="sr-only">{t("view_previous_week")}</span>
|
|
<Icon name="chevron-left" className="h-4 w-4" />
|
|
</Button>
|
|
<Button color="secondary" onClick={goToNextWeek}>
|
|
<span className="sr-only">{t("view_next_week")}</span>
|
|
<Icon name="chevron-right" className="h-4 w-4" />
|
|
</Button>
|
|
</ButtonGroup>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex-1 overflow-y-auto overflow-x-hidden rounded-2xl">
|
|
<Calendar
|
|
timezone={timezone}
|
|
sortEvents
|
|
startHour={0}
|
|
endHour={23}
|
|
events={events}
|
|
startDate={startDate}
|
|
endDate={endDate}
|
|
gridCellsPerHour={4}
|
|
hoverEventDuration={0}
|
|
showBackgroundPattern={false}
|
|
showBorder={false}
|
|
borderColor="subtle"
|
|
onEventClick={(event) => {
|
|
const bookingId = event.options?.bookingId;
|
|
if (bookingId) {
|
|
setSelectedBookingId(bookingId);
|
|
}
|
|
}}
|
|
hideHeader
|
|
/>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|