Scheduling infrastructure for absolutely everyone.
refactor: remove 3 @calcom/web imports from @calcom/features by relocating blocklist UI and useEvent hook (#27775)
Benny Joo29bb4fd49790
diff --git a/packages/features/blocklist/components/BlockedEntriesColumns.tsx b/apps/web/modules/blocklist/components/BlockedEntriesColumns.tsxsimilarity index 98%rename from packages/features/blocklist/components/BlockedEntriesColumns.tsxrename to apps/web/modules/blocklist/components/BlockedEntriesColumns.tsxindex 41a762740dd..354dec97b10 100644--- a/packages/features/blocklist/components/BlockedEntriesColumns.tsx+++ b/apps/web/modules/blocklist/components/BlockedEntriesColumns.tsx@@ -14,7 +14,7 @@ import {} from "@calcom/ui/components/dropdown";import { Checkbox } from "@calcom/ui/components/form";-import type { BlocklistEntry, BlocklistScope } from "../types";+import type { BlocklistEntry, BlocklistScope } from "@calcom/features/blocklist/types";interface UseBlockedEntriesColumnsProps<T extends BlocklistEntry> {t: (key: string) => string;diff --git a/packages/features/blocklist/components/BlockedEntriesTable.tsx b/apps/web/modules/blocklist/components/BlockedEntriesTable.tsxsimilarity index 97%rename from packages/features/blocklist/components/BlockedEntriesTable.tsxrename to apps/web/modules/blocklist/components/BlockedEntriesTable.tsxindex 9aa7e42b277..df366f7c7e0 100644--- a/packages/features/blocklist/components/BlockedEntriesTable.tsx+++ b/apps/web/modules/blocklist/components/BlockedEntriesTable.tsx@@ -5,14 +5,14 @@ import { getCoreRowModel, getSortedRowModel, useReactTable } from "@tanstack/reaimport type { ReactNode } from "react";import { useMemo, useState } from "react";-import { DataTableSelectionBar, DataTableWrapper } from "~/data-table/components";+import { DataTableSelectionBar, DataTableWrapper } from "@calcom/web/modules/data-table/components";import { IS_CALCOM } from "@calcom/lib/constants";import { useLocale } from "@calcom/lib/hooks/useLocale";import { Button } from "@calcom/ui/components/button";import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";import { EmptyScreen } from "@calcom/ui/components/empty-screen";-import type { BlocklistEntry, BlocklistPermissions, BlocklistScope } from "../types";+import type { BlocklistEntry, BlocklistPermissions, BlocklistScope } from "@calcom/features/blocklist/types";import { useBlockedEntriesColumns } from "./BlockedEntriesColumns";import { BlocklistEntryDetailsSheet } from "./BlocklistEntryDetailsSheet";diff --git a/packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsx b/apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsxsimilarity index 99%rename from packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsxrename to apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsxindex e043af5e485..cc4548244c0 100644--- a/packages/features/blocklist/components/BlocklistEntryDetailsSheet.tsx+++ b/apps/web/modules/blocklist/components/BlocklistEntryDetailsSheet.tsx@@ -17,7 +17,7 @@ import {} from "@calcom/ui/components/sheet";import { SkeletonText } from "@calcom/ui/components/skeleton";-import type { BlocklistEntry, BlocklistEntryDetails, BlocklistScope } from "../types";+import type { BlocklistEntry, BlocklistEntryDetails, BlocklistScope } from "@calcom/features/blocklist/types";export interface BlocklistEntryDetailsSheetProps<T extends BlocklistEntry> {scope: BlocklistScope;diff --git a/packages/features/blocklist/components/BookingReportDetailsModal.tsx b/apps/web/modules/blocklist/components/BookingReportDetailsModal.tsxsimilarity index 98%rename from packages/features/blocklist/components/BookingReportDetailsModal.tsxrename to apps/web/modules/blocklist/components/BookingReportDetailsModal.tsxindex eb07bfba49c..64f530743d9 100644--- a/packages/features/blocklist/components/BookingReportDetailsModal.tsx+++ b/apps/web/modules/blocklist/components/BookingReportDetailsModal.tsx@@ -10,7 +10,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/coimport { ToggleGroup } from "@calcom/ui/components/form";import { Icon } from "@calcom/ui/components/icon";-import type { GroupedBookingReport, BlocklistScope } from "../types";+import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types";interface FormData {blockType: WatchlistType;diff --git a/packages/features/blocklist/components/CreateBlocklistEntryModal.tsx b/apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsxsimilarity index 99%rename from packages/features/blocklist/components/CreateBlocklistEntryModal.tsxrename to apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsxindex 327202975a4..a215cee9cfe 100644--- a/packages/features/blocklist/components/CreateBlocklistEntryModal.tsx+++ b/apps/web/modules/blocklist/components/CreateBlocklistEntryModal.tsx@@ -12,7 +12,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/coimport { Input, Label, TextArea, ToggleGroup } from "@calcom/ui/components/form";import { Icon } from "@calcom/ui/components/icon";-import type { BlocklistScope, CreateBlocklistEntryFormData } from "../types";+import type { BlocklistScope, CreateBlocklistEntryFormData } from "@calcom/features/blocklist/types";export interface CreateBlocklistEntryModalProps {isOpen: boolean;diff --git a/packages/features/blocklist/components/PendingReportsBadge.tsx b/apps/web/modules/blocklist/components/PendingReportsBadge.tsxsimilarity index 100%rename from packages/features/blocklist/components/PendingReportsBadge.tsxrename to apps/web/modules/blocklist/components/PendingReportsBadge.tsxdiff --git a/packages/features/blocklist/components/PendingReportsColumns.tsx b/apps/web/modules/blocklist/components/PendingReportsColumns.tsxsimilarity index 97%rename from packages/features/blocklist/components/PendingReportsColumns.tsxrename to apps/web/modules/blocklist/components/PendingReportsColumns.tsxindex f37d25d58e8..ebc20a4c6c3 100644--- a/packages/features/blocklist/components/PendingReportsColumns.tsx+++ b/apps/web/modules/blocklist/components/PendingReportsColumns.tsx@@ -14,7 +14,7 @@ import {} from "@calcom/ui/components/dropdown";import { Checkbox } from "@calcom/ui/components/form";-import type { GroupedBookingReport, BlocklistScope } from "../types";+import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types";interface UsePendingReportsColumnsProps<T extends GroupedBookingReport> {t: (key: string) => string;diff --git a/packages/features/blocklist/components/PendingReportsTable.tsx b/apps/web/modules/blocklist/components/PendingReportsTable.tsxsimilarity index 95%rename from packages/features/blocklist/components/PendingReportsTable.tsxrename to apps/web/modules/blocklist/components/PendingReportsTable.tsxindex 2791218a7a2..3fd605f1a35 100644--- a/packages/features/blocklist/components/PendingReportsTable.tsx+++ b/apps/web/modules/blocklist/components/PendingReportsTable.tsx@@ -5,12 +5,12 @@ import { getCoreRowModel, getSortedRowModel, useReactTable } from "@tanstack/reaimport type { ReactNode } from "react";import { useMemo, useState } from "react";-import { DataTableSelectionBar, DataTableWrapper } from "~/data-table/components";+import { DataTableSelectionBar, DataTableWrapper } from "@calcom/web/modules/data-table/components";import { useLocale } from "@calcom/lib/hooks/useLocale";import type { WatchlistType } from "@calcom/prisma/enums";import { EmptyScreen } from "@calcom/ui/components/empty-screen";-import type { GroupedBookingReport, BlocklistScope } from "../types";+import type { GroupedBookingReport, BlocklistScope } from "@calcom/features/blocklist/types";import { BookingReportDetailsModal } from "./BookingReportDetailsModal";import { usePendingReportsColumns } from "./PendingReportsColumns";diff --git a/packages/features/blocklist/index.ts b/apps/web/modules/blocklist/index.tssimilarity index 94%rename from packages/features/blocklist/index.tsrename to apps/web/modules/blocklist/index.tsindex 30e88479f2e..57a5ca59d53 100644--- a/packages/features/blocklist/index.ts+++ b/apps/web/modules/blocklist/index.ts@@ -1,4 +1,3 @@-export * from "./types";export * from "./components/CreateBlocklistEntryModal";export * from "./components/BlockedEntriesTable";export * from "./components/BlockedEntriesColumns";diff --git a/apps/web/modules/bookings/components/AvailableTimeSlots.tsx b/apps/web/modules/bookings/components/AvailableTimeSlots.tsxindex 73724d7cc9d..56d602517ba 100644--- a/apps/web/modules/bookings/components/AvailableTimeSlots.tsx+++ b/apps/web/modules/bookings/components/AvailableTimeSlots.tsx@@ -17,7 +17,7 @@ import { BookerLayouts } from "@calcom/prisma/zod-utils";import classNames from "@calcom/ui/classNames";import { AvailableTimesHeader } from "@calcom/web/modules/bookings/components/AvailableTimesHeader";-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";+import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent";import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param";type AvailableTimeSlotsProps = {diff --git a/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx b/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsxindex 5758360a470..3c132c69e38 100644--- a/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx+++ b/apps/web/modules/bookings/components/BookEventForm/BookFormAsModal.tsx@@ -11,7 +11,7 @@ import { DialogContent } from "@calcom/ui/components/dialog";import { getDurationFormatted } from "../event-meta/Duration";import { FromTime } from "@calcom/features/bookings/Booker/utils/dates";-import { useEvent } from "@calcom/features/bookings/Booker/utils/event";+import { useEvent } from "@calcom/web/modules/schedules/hooks/useEvent";import { useBookerTime } from "@calcom/features/bookings/Booker/hooks/useBookerTime";const BookEventFormWrapper = ({ children, onCancel }: { onCancel: () => void; children: ReactNode }) => {diff --git a/apps/web/modules/bookings/components/BookerWebWrapper.tsx b/apps/web/modules/bookings/components/BookerWebWrapper.tsxindex a7718987d5e..009de9fc35f 100644--- a/apps/web/modules/bookings/components/BookerWebWrapper.tsx+++ b/apps/web/modules/bookings/components/BookerWebWrapper.tsx@@ -16,7 +16,7 @@ import { useSlots } from "../hooks/useSlots";import { useVerifyCode } from "../hooks/useVerifyCode";import { useVerifyEmail } from "../hooks/useVerifyEmail";import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";-import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event";+import { useEvent, useScheduleForEvent } from "@calcom/web/modules/schedules/hooks/useEvent";import { useBrandColors } from "@calcom/features/bookings/Booker/utils/use-brand-colors";import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR, WEBAPP_URL } from "@calcom/lib/constants";diff --git a/apps/web/modules/bookings/components/LargeCalendar.tsx b/apps/web/modules/bookings/components/LargeCalendar.tsxindex 26ae9e9e3b4..557609e7cc4 100644--- a/apps/web/modules/bookings/components/LargeCalendar.tsx+++ b/apps/web/modules/bookings/components/LargeCalendar.tsx@@ -9,7 +9,7 @@ import { Calendar } from "@calcom/web/modules/calendars/weeklyview/components/Caimport type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/events";import { localStorage } from "@calcom/lib/webstorage";-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";+import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent";import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param";import { useOverlayCalendarStore } from "@calcom/features/bookings/Booker/components/OverlayCalendar/store";diff --git a/apps/web/modules/bookings/types.ts b/apps/web/modules/bookings/types.tsindex 07ebe905376..b654b0aecfc 100644--- a/apps/web/modules/bookings/types.ts+++ b/apps/web/modules/bookings/types.ts@@ -1,7 +1,7 @@import type { DataTableRow } from "@calcom/features/data-table/lib/separator";import type { RouterOutputs } from "@calcom/trpc/react";import type { BookerEventQuery } from "@calcom/features/bookings/types";-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";+import type { useScheduleForEventReturnType } from "@calcom/web/modules/schedules/hooks/useEvent";import type { ToggledConnectedCalendars, CustomClassNames } from "@calcom/features/bookings/Booker/types";import type { EventBusyDate } from "@calcom/types/Calendar";diff --git a/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsxindex 6b3f4204c88..5b28c21975d 100644--- a/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx+++ b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx@@ -10,7 +10,7 @@ import {PendingReportsBadge,PendingReportsTable,type SortByOption,-} from "@calcom/features/blocklist";+} from "@calcom/web/modules/blocklist";import { DataTableProvider, useDataTable } from "@calcom/features/data-table";import { DataTableToolbar } from "~/data-table/components";import { useLocale } from "@calcom/lib/hooks/useLocale";diff --git a/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx b/apps/web/modules/ee/organizations/privacy/blocklist-table.tsxindex 8f8cb0c951c..9d2e6662714 100644--- a/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx+++ b/apps/web/modules/ee/organizations/privacy/blocklist-table.tsx@@ -9,7 +9,7 @@ import {PendingReportsBadge,PendingReportsTable,type SortByOption,-} from "@calcom/features/blocklist";+} from "@calcom/web/modules/blocklist";import { useDataTable } from "@calcom/features/data-table";import { DataTableToolbar } from "~/data-table/components";import { useLocale } from "@calcom/lib/hooks/useLocale";diff --git a/apps/web/modules/embed/components/Embed.tsx b/apps/web/modules/embed/components/Embed.tsxindex 982d27a904f..7e5a0350db7 100644--- a/apps/web/modules/embed/components/Embed.tsx+++ b/apps/web/modules/embed/components/Embed.tsx@@ -21,7 +21,7 @@ import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/storeimport {useEvent,useScheduleForEvent,-} from "@calcom/features/bookings/Booker/utils/event";+} from "@calcom/web/modules/schedules/hooks/useEvent";import DatePicker from "@calcom/features/calendars/components/DatePicker";import { Dialog } from "@calcom/features/components/controlled-dialog";import { TimezoneSelect } from "@calcom/web/modules/timezone/components/TimezoneSelect";diff --git a/packages/features/bookings/Booker/utils/event.ts b/apps/web/modules/schedules/hooks/useEvent.tssimilarity index 97%rename from packages/features/bookings/Booker/utils/event.tsrename to apps/web/modules/schedules/hooks/useEvent.tsindex 0b86b7d4fd0..b91671ededf 100644--- a/packages/features/bookings/Booker/utils/event.ts+++ b/apps/web/modules/schedules/hooks/useEvent.ts@@ -1,7 +1,7 @@import { shallow } from "zustand/shallow";import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";-import { useSchedule } from "~/schedules/hooks/useSchedule";+import { useSchedule } from "@calcom/web/modules/schedules/hooks/useSchedule";import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";import { trpc } from "@calcom/trpc/react";diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.tsindex 60ed3c984ad..b55999f18a6 100644--- a/packages/features/bookings/Booker/types.ts+++ b/packages/features/bookings/Booker/types.ts@@ -1,8 +1,4 @@-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";-import type { BookerEventQuery } from "@calcom/features/bookings/types";import type { IntlSupportedTimeZones } from "@calcom/lib/timeZones";-import type { EventBusyDate } from "@calcom/types/Calendar";-import type { TIsAvailableOutputSchema } from "@calcom/trpc/server/routers/viewer/slots/isAvailable.schema";import type React from "react";import type { GetBookingType } from "../lib/get-booking";