* display UTM parameters * persist view (list | calendar) in localStorage * move to next page on clicking "next" of last item in the page improve navigation ^ Conflicts: ^ apps/web/modules/bookings/components/BookingCalendarContainer.tsx * fix navigation on calendar view * Delete apps/web/modules/bookings/NAVIGATION_IMPLEMENTATION.md * avoid page size being 0 * check feature flag on user level * use map to improve useBookingListData * address feedback * feat(bookings): add smart navigation for calendar view - Add sort option to tRPC bookings.get schema and handler - Create NAVIGATION_PROBE_WINDOW_MONTHS constant (3 months) - Create useNearestFutureBooking hook to find nearest future booking - Create useNearestPastBooking hook to find nearest past booking - Update useCalendarNavigationCapabilities to use probe results - Update BookingCalendarContainer to wire up probe hooks This enables the booking details sheet to: - Disable next/prev buttons when no bookings exist in that direction - Jump directly to the week containing the nearest booking Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix type error * feat: add booking selection state when using slideover (#25637) * implement booking selection when using slideover * remove pixel shift * fix * auto scroll to selected event on calendar * make DateValues header sticky when scrolling --------- Co-authored-by: Eunjae Lee <hey@eunjae.dev> * prefetch previous / next weeks on calendar view * clean up classes * handle "fetched & but no data" situation more correctly in useCalendarAutoSelector --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
250 lines
8.5 KiB
TypeScript
250 lines
8.5 KiB
TypeScript
"use client";
|
|
|
|
import { useReactTable, getCoreRowModel, getSortedRowModel } from "@tanstack/react-table";
|
|
import React, { useMemo, useEffect } from "react";
|
|
|
|
import dayjs from "@calcom/dayjs";
|
|
import { DataTableFilters } from "@calcom/features/data-table";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { trpc } from "@calcom/trpc/react";
|
|
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
|
|
import { Alert } from "@calcom/ui/components/alert";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { ButtonGroup } from "@calcom/ui/components/buttonGroup";
|
|
import { Icon } from "@calcom/ui/components/icon";
|
|
|
|
import { useBookingCalendarData } from "~/bookings/hooks/useBookingCalendarData";
|
|
import { useBookingFilters } from "~/bookings/hooks/useBookingFilters";
|
|
import { useCalendarAllowedFilters } from "~/bookings/hooks/useCalendarAllowedFilters";
|
|
import { useCalendarAutoSelector } from "~/bookings/hooks/useCalendarAutoSelector";
|
|
import { useCalendarNavigationCapabilities } from "~/bookings/hooks/useCalendarNavigationCapabilities";
|
|
import { useCurrentWeekStart } from "~/bookings/hooks/useCurrentWeekStart";
|
|
import { useFacetedUniqueValues } from "~/bookings/hooks/useFacetedUniqueValues";
|
|
|
|
import { buildFilterColumns, getFilterColumnVisibility } from "../columns/filterColumns";
|
|
import { getWeekStart } from "../lib/weekUtils";
|
|
import { BookingDetailsSheetStoreProvider } from "../store/bookingDetailsSheetStore";
|
|
import type { RowData, BookingListingStatus, BookingsGetOutput } from "../types";
|
|
import { BookingCalendarView } from "./BookingCalendarView";
|
|
import { BookingDetailsSheet } from "./BookingDetailsSheet";
|
|
import { ViewToggleButton } from "./ViewToggleButton";
|
|
import { WeekPicker } from "./WeekPicker";
|
|
|
|
// For calendar view, fetch all statuses except cancelled
|
|
const STATUSES: BookingListingStatus[] = ["upcoming", "unconfirmed", "recurring", "past"];
|
|
|
|
interface BookingCalendarContainerProps {
|
|
status: BookingListingStatus;
|
|
permissions: {
|
|
canReadOthersBookings: boolean;
|
|
};
|
|
bookingsV3Enabled: boolean;
|
|
}
|
|
|
|
interface BookingCalendarInnerProps extends BookingCalendarContainerProps {
|
|
data?: {
|
|
bookings: BookingsGetOutput["bookings"];
|
|
recurringInfo: BookingsGetOutput["recurringInfo"];
|
|
totalCount: BookingsGetOutput["totalCount"];
|
|
};
|
|
allowedFilterIds: string[];
|
|
isPending: boolean;
|
|
hasError: boolean;
|
|
errorMessage?: string;
|
|
hasNextPage: boolean;
|
|
isFetched: boolean;
|
|
isFetchingNextPage: boolean;
|
|
}
|
|
|
|
function BookingCalendarInner({
|
|
status,
|
|
permissions,
|
|
bookingsV3Enabled,
|
|
data,
|
|
allowedFilterIds,
|
|
hasError,
|
|
errorMessage,
|
|
hasNextPage,
|
|
isFetched,
|
|
isFetchingNextPage,
|
|
}: BookingCalendarInnerProps) {
|
|
const { t } = useLocale();
|
|
const user = useMeQuery().data;
|
|
const { currentWeekStart, setCurrentWeekStart, userWeekStart } = useCurrentWeekStart();
|
|
|
|
const rowData = useBookingCalendarData({ data, status });
|
|
|
|
// Extract bookings from table data
|
|
const bookings = useMemo(() => {
|
|
return rowData
|
|
.filter((row): row is Extract<RowData, { type: "data" }> => row.type === "data")
|
|
.map((row) => row.booking);
|
|
}, [rowData]);
|
|
|
|
// Handle auto-selection for calendar view
|
|
useCalendarAutoSelector(bookings, hasNextPage, isFetched, isFetchingNextPage);
|
|
|
|
const goToPreviousWeek = () => {
|
|
setCurrentWeekStart(currentWeekStart.subtract(1, "week"));
|
|
};
|
|
|
|
const goToNextWeek = () => {
|
|
setCurrentWeekStart(currentWeekStart.add(1, "week"));
|
|
};
|
|
|
|
const goToToday = () => {
|
|
setCurrentWeekStart(getWeekStart(dayjs(), userWeekStart));
|
|
};
|
|
|
|
const ErrorView = errorMessage ? (
|
|
<Alert severity="error" title={t("something_went_wrong")} message={errorMessage} />
|
|
) : undefined;
|
|
|
|
const columns = useMemo(() => {
|
|
return buildFilterColumns({ t, permissions, status }).filter((column) =>
|
|
allowedFilterIds.includes(column.id || "")
|
|
);
|
|
}, [allowedFilterIds, t, permissions, status]);
|
|
|
|
const getFacetedUniqueValues = useFacetedUniqueValues();
|
|
|
|
const table = useReactTable<RowData>({
|
|
data: rowData,
|
|
columns,
|
|
initialState: {
|
|
columnVisibility: getFilterColumnVisibility(),
|
|
},
|
|
getCoreRowModel: getCoreRowModel(),
|
|
getSortedRowModel: getSortedRowModel(),
|
|
getFacetedUniqueValues,
|
|
});
|
|
|
|
return (
|
|
<>
|
|
<div className="mb-4 flex items-center justify-between">
|
|
<div className="flex items-center gap-2">
|
|
<WeekPicker
|
|
currentWeekStart={currentWeekStart}
|
|
userWeekStart={userWeekStart}
|
|
onDateChange={setCurrentWeekStart}
|
|
/>
|
|
{allowedFilterIds.length > 0 && <DataTableFilters.FilterBar table={table} />}
|
|
</div>
|
|
|
|
<div className="flex items-center gap-2">
|
|
<Button color="secondary" onClick={goToToday} className="capitalize">
|
|
{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>
|
|
<ViewToggleButton bookingsV3Enabled={bookingsV3Enabled} />
|
|
</div>
|
|
</div>
|
|
{hasError && ErrorView ? (
|
|
ErrorView
|
|
) : (
|
|
<BookingCalendarView
|
|
bookings={bookings}
|
|
currentWeekStart={currentWeekStart}
|
|
onWeekStartChange={setCurrentWeekStart}
|
|
/>
|
|
)}
|
|
|
|
<BookingDetailsSheet
|
|
userTimeZone={user?.timeZone}
|
|
userTimeFormat={user?.timeFormat === null ? undefined : user?.timeFormat}
|
|
userId={user?.id}
|
|
userEmail={user?.email}
|
|
/>
|
|
</>
|
|
);
|
|
}
|
|
|
|
export function BookingCalendarContainer(props: BookingCalendarContainerProps) {
|
|
const { canReadOthersBookings } = props.permissions;
|
|
const { userIds } = useBookingFilters();
|
|
const { currentWeekStart, setCurrentWeekStart, userWeekStart } = useCurrentWeekStart();
|
|
|
|
const allowedFilterIds = useCalendarAllowedFilters({
|
|
canReadOthersBookings,
|
|
});
|
|
|
|
const query = trpc.viewer.bookings.get.useInfiniteQuery(
|
|
{
|
|
limit: 100, // Use max limit for calendar view
|
|
filters: {
|
|
statuses: STATUSES,
|
|
userIds,
|
|
// Always fetch only the current week for calendar view
|
|
afterStartDate: currentWeekStart.startOf("day").toISOString(),
|
|
beforeEndDate: currentWeekStart.add(6, "day").endOf("day").toISOString(),
|
|
},
|
|
},
|
|
{
|
|
getNextPageParam: (lastPage) => lastPage.nextCursor,
|
|
staleTime: 5 * 60 * 1000, // 5 minutes - data is considered fresh
|
|
gcTime: 30 * 60 * 1000, // 30 minutes - cache retention time
|
|
}
|
|
);
|
|
|
|
const { isFetched, hasNextPage, isFetchingNextPage, fetchNextPage } = query;
|
|
|
|
// Automatically fetch all pages until no more data
|
|
useEffect(() => {
|
|
if (hasNextPage && !isFetchingNextPage) {
|
|
fetchNextPage();
|
|
}
|
|
}, [hasNextPage, isFetchingNextPage, fetchNextPage]);
|
|
|
|
// Flatten all pages into a single data object
|
|
const data = useMemo(() => {
|
|
if (!query.data?.pages) return undefined;
|
|
|
|
// Combine all bookings from all pages
|
|
const allBookings = query.data.pages.flatMap((page) => page.bookings);
|
|
|
|
// recurringInfo is the same across all pages (queried globally by user, not per page)
|
|
const recurringInfo = query.data.pages[0]?.recurringInfo ?? [];
|
|
|
|
// totalCount is the same across all pages
|
|
const totalCount = query.data.pages[0]?.totalCount ?? 0;
|
|
|
|
return { bookings: allBookings, recurringInfo, totalCount };
|
|
}, [query.data?.pages]);
|
|
|
|
const bookings = useMemo(() => data?.bookings ?? [], [data?.bookings]);
|
|
|
|
// Create navigation capabilities for calendar view
|
|
// This hook handles probe queries and prefetching internally
|
|
const capabilities = useCalendarNavigationCapabilities({
|
|
currentWeekStart,
|
|
setCurrentWeekStart,
|
|
userWeekStart,
|
|
filters: { statuses: STATUSES, userIds },
|
|
});
|
|
|
|
return (
|
|
<BookingDetailsSheetStoreProvider bookings={bookings} capabilities={capabilities}>
|
|
<BookingCalendarInner
|
|
{...props}
|
|
data={data}
|
|
allowedFilterIds={allowedFilterIds}
|
|
isPending={query.isPending}
|
|
hasError={!!query.error}
|
|
errorMessage={query.error?.message}
|
|
hasNextPage={hasNextPage}
|
|
isFetched={isFetched}
|
|
isFetchingNextPage={isFetchingNextPage}
|
|
/>
|
|
</BookingDetailsSheetStoreProvider>
|
|
);
|
|
}
|