* fix: remove @calcom/web imports from packages/features to eliminate circular dependency - Migrate UserTableUser and MemberPermissions types to packages/features/users/types/user-table.ts - Migrate useGeo hook to packages/features/geo/GeoContext.tsx - Migrate buildLegacyRequest to packages/lib/buildLegacyCtx.ts - Migrate Calendar component to packages/features/calendars/weeklyview/components/ - Move test utilities (bookingScenario, fixtures) to packages/features/test/ - Update all imports in packages/features to use new locations - Add re-exports in apps/web for backward compatibility Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: delete original implementation files and fix type issues - Delete original calendar component files in apps/web (keep only re-export stubs) - Migrate OutOfOfficeInSlots to packages/features/bookings/components - Convert apps/web OutOfOfficeInSlots to re-export stub - Fix className vs class issue in Calendar.tsx - Fix @calcom/trpc import violation in user-table.ts by using structural type Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add missing isGroup and contains fields to UserTableUser attributes type Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update customRole type to match actual Prisma Role model Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix build * fix * fix * cleanup weeklyview * fix * refactor to mv MemberPermissions to types package * add types dependency to features * fix * fix * fix * fix * fix * fix * rename * rename * migrate * migrate * migrate * fix * fix * fix * refactor: move test utilities from packages/features/test to tests/libs - Move bookingScenario utilities to tests/libs/bookingScenario - Move fixtures to tests/libs/fixtures - Update all imports in packages/features test files to use new location - Update all imports in apps/web test files to use new location - Eliminates duplication of test utilities between packages/features and apps/web Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: correct relative import paths for tests/libs in test files Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: replace test utility implementations with re-exports to tests/libs Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: fix test import paths and move signup handler tests to apps/web Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: move buildLegacyCtx to packages/lib and restore handlers to packages/features - Move buildLegacyCtx from apps/web/lib to packages/lib to break circular dependency - Update apps/web/lib/buildLegacyCtx.ts to re-export from @calcom/lib - Restore signup handlers and tests to packages/features/auth/signup/handlers - Update handler imports to use @calcom/lib/buildLegacyCtx instead of @calcom/web/lib/buildLegacyCtx Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update recurring-event.test.ts imports to use tests/libs path Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: delete test re-export files and update imports to use tests/libs directly Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update remaining test imports to use tests/libs directly Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: update handleRecurringEventBooking calls to match function signature (1 arg) Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * remove * migrate tests * migrate tests * refactor: update test mock imports by removing and using async for mock creators. * fix type errors * fix: add type assertion for MockUser in p2002.test-suite.ts Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: restore locale import in compareReminderBodyToTemplate.test.ts using relative path Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * feat: create @calcom/testing package and migrate tests from /tests directory - Created new @calcom/testing package in /packages/testing - Moved all files from /tests to /packages/testing - Updated all imports across the codebase to use @calcom/testing alias - Removed /tests directory at root level This allows other packages like @calcom/features and @calcom/web to import testing utilities using the @calcom/testing alias instead of relative paths. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix: add missing useBookings export to @calcom/atoms package Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add missing useCalendarsBusyTimes and useConnectedCalendars exports to @calcom/atoms Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * chore: add @calcom/testing as explicit devDependency to packages that use it Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * refactor: move setupVitest.ts into @calcom/testing package Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * chore: add biome rules to restrict @calcom/testing imports Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * rename libs to lib * rename libs to lib * add rule * add rule * refactor: remove @calcom/features imports from @calcom/testing - Move mockPaymentSuccessWebhookFromStripe to fresh-booking.test.ts - Replace ProfileRepository.generateProfileUid() with uuidv4() - Clone Tracking type into @calcom/testing/src/lib/types.ts - Update imports in expects.ts and getMockRequestDataForBooking.ts - Move source files into src/ folder - Move CalendarManager mock to @calcom/features Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: add explicit exports for nested paths in @calcom/testing Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * improve * improve * fix * fix * fix type checks * fix type checks * fix type checks * fix tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
109 lines
3.8 KiB
TypeScript
109 lines
3.8 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/web/modules/calendars/weeklyview/components/Calendar";
|
|
import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";
|
|
import { useGetTheme } from "@calcom/lib/hooks/useTheme";
|
|
import { useBanners } from "@calcom/web/modules/shell/banners/useBanners";
|
|
|
|
import { useBookingDetailsSheetStore } from "../store/bookingDetailsSheetStore";
|
|
import type { BookingOutput } from "../types";
|
|
|
|
type BookingCalendarViewProps = {
|
|
bookings: BookingOutput[];
|
|
currentWeekStart: dayjs.Dayjs;
|
|
onWeekStartChange: (weekStart: dayjs.Dayjs) => void;
|
|
};
|
|
|
|
export function BookingCalendarView({
|
|
bookings,
|
|
currentWeekStart,
|
|
onWeekStartChange,
|
|
}: BookingCalendarViewProps) {
|
|
const setSelectedBookingUid = useBookingDetailsSheetStore((state) => state.setSelectedBookingUid);
|
|
const selectedBookingUid = useBookingDetailsSheetStore((state) => state.selectedBookingUid);
|
|
const { timezone } = useTimePreferences();
|
|
const { resolvedTheme, forcedTheme } = useGetTheme();
|
|
const { bannersHeight } = useBanners();
|
|
|
|
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 }),
|
|
bookingUid: booking.uid,
|
|
},
|
|
};
|
|
});
|
|
}, [bookings, currentWeekStart, resolvedTheme, forcedTheme]);
|
|
|
|
return (
|
|
<>
|
|
<div
|
|
className="border-subtle flex flex-1 flex-col overflow-y-auto overflow-x-hidden rounded-2xl border"
|
|
style={{ height: `calc(100vh - 6rem - ${bannersHeight}px)` }}>
|
|
<Calendar
|
|
timezone={timezone}
|
|
sortEvents
|
|
startHour={0}
|
|
endHour={23}
|
|
events={events}
|
|
startDate={startDate}
|
|
endDate={endDate}
|
|
gridCellsPerHour={4}
|
|
hoverEventDuration={0}
|
|
showBackgroundPattern={false}
|
|
showBorder={false}
|
|
borderColor="subtle"
|
|
selectedBookingUid={selectedBookingUid}
|
|
onEventClick={(event) => {
|
|
const bookingUid = event.options?.bookingUid;
|
|
if (bookingUid) {
|
|
setSelectedBookingUid(bookingUid);
|
|
}
|
|
}}
|
|
showTimezone
|
|
hideHeader
|
|
/>
|
|
</div>
|
|
</>
|
|
);
|
|
}
|