Skip to content

Commit 1368ffe

Browse files
refactor: move data-table hooks/contexts/provider from features to web modules (calcom#27833)
* refactor: move data-table hooks/contexts/provider from features to web modules Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: update broken useColumnResizing import path in DataTable.tsx Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: update remaining broken import paths for moved hooks Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * docs: update GUIDE.md import paths and file references for moved modules Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
1 parent 397bf3c commit 1368ffe

63 files changed

Lines changed: 123 additions & 124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/playground/date-range-filter/page.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import { useReactTable, getCoreRowModel, createColumnHelper } from "@tanstack/react-table";
44
import { useMemo } from "react";
55

6-
import { ColumnFilterType, DataTableProvider } from "@calcom/features/data-table";
6+
import { ColumnFilterType } from "@calcom/features/data-table";
7+
import { DataTableProvider } from "~/data-table/DataTableProvider";
78
import type { DateRangeFilterOptions } from "@calcom/features/data-table/lib/types";
89
import { DateRangeFilter } from "~/data-table/components/filters/DateRangeFilter";
910

apps/web/modules/bookings/components/BookingListContainer.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
"use client";
22

33
import dayjs from "@calcom/dayjs";
4-
import { useDataTable, useDisplayedFilterCount } from "@calcom/features/data-table";
4+
import { useDataTable } from "~/data-table/hooks/useDataTable";
5+
import { useDisplayedFilterCount } from "~/data-table/hooks/useDisplayedFilterCount";
56
import { useLocale } from "@calcom/lib/hooks/useLocale";
67
import { trpc } from "@calcom/trpc/react";
78
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";

apps/web/modules/bookings/hooks/useActiveFiltersValidator.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import type { ActiveFilter, ActiveFilters, ActiveFiltersValidator } from "@calcom/features/data-table";
1+
import type { ActiveFilter, ActiveFilters } from "@calcom/features/data-table";
22
import { ColumnFilterType } from "@calcom/features/data-table";
3+
import type { ActiveFiltersValidator } from "~/data-table/DataTableProvider";
34
import { trpc } from "@calcom/trpc/react";
45
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
56
import { useCallback, useMemo } from "react";

apps/web/modules/bookings/hooks/useBookingFilters.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import {
2-
useFilterValue,
3-
ZMultiSelectFilterValue,
4-
ZDateRangeFilterValue,
5-
ZTextFilterValue,
6-
} from "@calcom/features/data-table";
1+
import { ZMultiSelectFilterValue, ZDateRangeFilterValue, ZTextFilterValue } from "@calcom/features/data-table";
2+
import { useFilterValue } from "~/data-table/hooks/useFilterValue";
73

84
export function useBookingFilters() {
95
const eventTypeIds = useFilterValue("eventTypeId", ZMultiSelectFilterValue)?.data as number[] | undefined;

apps/web/modules/bookings/hooks/useCalendarAllowedFilters.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useMemo, useEffect, useRef } from "react";
22

3-
import { ColumnFilterType, useDataTable } from "@calcom/features/data-table";
3+
import { ColumnFilterType } from "@calcom/features/data-table";
4+
import { useDataTable } from "~/data-table/hooks/useDataTable";
45
import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
56

67
/**

apps/web/modules/bookings/views/bookings-view.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"use client";
22

3-
import { ColumnFilterType, DataTableProvider, type SystemFilterSegment } from "@calcom/features/data-table";
3+
import { ColumnFilterType, type SystemFilterSegment } from "@calcom/features/data-table";
4+
import { DataTableProvider } from "~/data-table/DataTableProvider";
45
import { useSegments } from "~/data-table/hooks/useSegments";
56
import FeatureOptInBannerWrapper from "~/feature-opt-in/components/FeatureOptInBannerWrapper";
67
import { useLocale } from "@calcom/lib/hooks/useLocale";

packages/features/data-table/DataTableProvider.tsx renamed to apps/web/modules/data-table/DataTableProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type {
2020
SegmentIdentifier,
2121
ActiveFilters,
2222
UseSegments,
23-
} from "./lib/types";
23+
} from "@calcom/features/data-table/lib/types";
2424

2525
export type { ActiveFiltersValidatorState };
2626
export type { ActiveFiltersValidator } from "./contexts";

apps/web/modules/data-table/components/DataTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import {
2121
TableRow,
2222
} from "@calcom/ui/components/table";
2323

24-
import { useColumnSizingVars } from "@calcom/features/data-table/hooks";
25-
import { useColumnResizing } from "@calcom/features/data-table/hooks/useColumnResizing";
24+
import { useColumnSizingVars } from "~/data-table/hooks/useColumnSizingVars";
25+
import { useColumnResizing } from "~/data-table/hooks/useColumnResizing";
2626
import type { SeparatorRow } from "@calcom/features/data-table/lib/separator";
2727
import { isSeparatorRow } from "@calcom/features/data-table/lib/separator";
2828

apps/web/modules/data-table/components/DataTablePagination.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { type Table } from "@tanstack/react-table";
44

55
import { Pagination } from "@calcom/ui/components/pagination";
66

7-
import { useDataTable } from "@calcom/features/data-table/hooks";
7+
import { useDataTable } from "~/data-table/hooks";
88

99
interface DataTablePaginationProps<TData> {
1010
table: Table<TData>;

apps/web/modules/data-table/components/DataTableToolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import classNames from "@calcom/ui/classNames";
1010
import { Button, type ButtonProps } from "@calcom/ui/components/button";
1111
import { FilterSearchField } from "@calcom/ui/components/form";
1212

13-
import { useColumnFilters, useDataTable } from "@calcom/features/data-table/hooks";
13+
import { useColumnFilters, useDataTable } from "~/data-table/hooks";
1414

1515
interface DataTableToolbarProps extends ComponentPropsWithoutRef<"div"> {
1616
children: React.ReactNode;

0 commit comments

Comments
 (0)