From 1ab962241629179f56f94cdc91986cf4ab75b316 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Wed, 8 Jan 2025 10:12:55 +0100 Subject: [PATCH] feat: add DataTableWrapper (#18503) * feat: data table wrapper * feat: add DataTableWrapper --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> --- .../components/DataTableWrapper.tsx | 73 +++++++++++ .../data-table/components/filters/index.tsx | 17 +-- .../features/data-table/components/index.ts | 1 + packages/features/data-table/lib/context.tsx | 3 +- .../components/RoutingFormResponsesTable.tsx | 54 +++----- .../components/UserTable/UserListTable.tsx | 117 ++++++++---------- 6 files changed, 153 insertions(+), 112 deletions(-) create mode 100644 packages/features/data-table/components/DataTableWrapper.tsx diff --git a/packages/features/data-table/components/DataTableWrapper.tsx b/packages/features/data-table/components/DataTableWrapper.tsx new file mode 100644 index 0000000000..52df35f0e6 --- /dev/null +++ b/packages/features/data-table/components/DataTableWrapper.tsx @@ -0,0 +1,73 @@ +"use client"; + +import type { Table as ReactTableType } from "@tanstack/react-table"; +import { useRef } from "react"; + +import { + DataTable, + DataTableToolbar, + DataTablePagination, + useFetchMoreOnBottomReached, +} from "@calcom/features/data-table"; + +export type DataTableWrapperProps = { + testId?: string; + table: ReactTableType; + isPending: boolean; + hasNextPage: boolean; + fetchNextPage: () => void; + isFetching: boolean; + totalDBRowCount?: number; + ToolbarLeft?: React.ReactNode; + ToolbarRight?: React.ReactNode; + children: React.ReactNode; +}; + +export function DataTableWrapper({ + testId, + table, + isPending, + hasNextPage, + fetchNextPage, + isFetching, + totalDBRowCount, + ToolbarLeft, + ToolbarRight, + children, +}: DataTableWrapperProps) { + const tableContainerRef = useRef(null); + const fetchMoreOnBottomReached = useFetchMoreOnBottomReached({ + tableContainerRef, + hasNextPage, + fetchNextPage, + isFetching, + }); + + return ( + fetchMoreOnBottomReached(e.target as HTMLDivElement)}> + +
+
+
{ToolbarLeft}
+
+
{ToolbarRight}
+
+
+ + {children} + + + {totalDBRowCount && ( +
+ +
+ )} + + ); +} diff --git a/packages/features/data-table/components/filters/index.tsx b/packages/features/data-table/components/filters/index.tsx index 65f37e2953..852e076565 100644 --- a/packages/features/data-table/components/filters/index.tsx +++ b/packages/features/data-table/components/filters/index.tsx @@ -122,19 +122,18 @@ const ColumnVisibilityButton = forwardRef(ColumnVisibilityButtonComponent) as { table: Table; - omit?: string[]; externalFilters?: ExternalFilter[]; } function AddFilterButtonComponent( - { table, omit, externalFilters }: AddFilterButtonProps, + { table, externalFilters }: AddFilterButtonProps, ref: React.Ref ) { const { t } = useLocale(); const { activeFilters, setActiveFilters, displayedExternalFilters, setDisplayedExternalFilters } = useDataTable(); - const filterableColumns = useFilterableColumns(table, omit); + const filterableColumns = useFilterableColumns(table); const handleAddFilter = useCallback( (columnId: string) => { @@ -188,14 +187,10 @@ function AddFilterButtonComponent( ); } -function useFilterableColumns(table: Table, omit?: string[]) { +function useFilterableColumns(table: Table) { const columns = useMemo( - () => - table - .getAllColumns() - .filter((column) => column.getCanFilter()) - .filter((column) => !omit?.includes(column.id)), - [table.getAllColumns(), omit] + () => table.getAllColumns().filter((column) => column.getCanFilter()), + [table.getAllColumns()] ); const filterableColumns = useMemo( @@ -228,7 +223,7 @@ function useFilterableColumns(table: Table, omit?: string[]) { } const AddFilterButton = forwardRef(AddFilterButtonComponent) as ( - props: AddFilterButtonProps & { ref?: React.Ref; omit?: string[] } + props: AddFilterButtonProps & { ref?: React.Ref } ) => ReturnType; // Add the new ActiveFilters component diff --git a/packages/features/data-table/components/index.ts b/packages/features/data-table/components/index.ts index 8467f5f68d..1b29221f03 100644 --- a/packages/features/data-table/components/index.ts +++ b/packages/features/data-table/components/index.ts @@ -4,4 +4,5 @@ export { DataTablePagination } from "./DataTablePagination"; export { DataTableFilters } from "./filters"; export { DataTable } from "./DataTable"; export { DataTableSkeleton } from "./DataTableSkeleton"; +export { DataTableWrapper } from "./DataTableWrapper"; export type { DataTableProps } from "./DataTable"; diff --git a/packages/features/data-table/lib/context.tsx b/packages/features/data-table/lib/context.tsx index 2f9c4fce68..933ae0cb82 100644 --- a/packages/features/data-table/lib/context.tsx +++ b/packages/features/data-table/lib/context.tsx @@ -52,7 +52,8 @@ export function DataTableProvider({ children }: { children: React.ReactNode }) { const clearAll = useCallback(() => { setActiveFilters([]); - }, [setActiveFilters]); + setDisplayedExternalFilters([]); + }, [setActiveFilters, setDisplayedExternalFilters]); const updateFilter = useCallback( (columnId: string, value: FilterValue) => { diff --git a/packages/features/insights/components/RoutingFormResponsesTable.tsx b/packages/features/insights/components/RoutingFormResponsesTable.tsx index 6bc8dabd59..d26e4a214e 100644 --- a/packages/features/insights/components/RoutingFormResponsesTable.tsx +++ b/packages/features/insights/components/RoutingFormResponsesTable.tsx @@ -11,17 +11,16 @@ import { // eslint-disable-next-line no-restricted-imports import startCase from "lodash/startCase"; import Link from "next/link"; -import { useRef, useMemo, useId } from "react"; +import { useMemo, useId } from "react"; import { z } from "zod"; import dayjs from "@calcom/dayjs"; import type { ExternalFilter } from "@calcom/features/data-table"; import { - DataTableProvider, - DataTable, - DataTableSkeleton, + DataTableWrapper, DataTableFilters, - useFetchMoreOnBottomReached, + DataTableProvider, + DataTableSkeleton, useColumnFilters, multiSelectFilter, textFilter, @@ -260,14 +259,9 @@ export function RoutingFormResponsesTable() { ); } -export function RoutingFormResponsesTableContent({ - children, -}: { - children?: React.ReactNode | ((table: RoutingFormTableType) => React.ReactNode); -}) { +export function RoutingFormResponsesTableContent() { const { t } = useLocale(); const { filter } = useFilterContext(); - const tableContainerRef = useRef(null); const { copyToClipboard } = useCopy(); const { @@ -534,13 +528,6 @@ export function RoutingFormResponsesTableContent({ }, }); - const fetchMoreOnBottomReached = useFetchMoreOnBottomReached({ - tableContainerRef, - hasNextPage, - fetchNextPage, - isFetching, - }); - const externalFilters = useMemo( () => [ { @@ -563,24 +550,23 @@ export function RoutingFormResponsesTableContent({ return (
- { - if (hasNextPage) { - fetchMoreOnBottomReached(e.target as HTMLDivElement); - } - }} - enableColumnResizing={true} - isPending={isFetching && !data}> -
-
+ isPending={isFetching && !data} + hasNextPage={hasNextPage} + fetchNextPage={fetchNextPage} + isFetching={isFetching} + ToolbarLeft={ + <> -
+ + } + ToolbarRight={ + <> -
- -
- + + }> + +
); } diff --git a/packages/features/users/components/UserTable/UserListTable.tsx b/packages/features/users/components/UserTable/UserListTable.tsx index 42969fb560..0186b901be 100644 --- a/packages/features/users/components/UserTable/UserListTable.tsx +++ b/packages/features/users/components/UserTable/UserListTable.tsx @@ -4,17 +4,15 @@ import { keepPreviousData } from "@tanstack/react-query"; import { getCoreRowModel, getSortedRowModel, useReactTable, type ColumnDef } from "@tanstack/react-table"; import { useSession } from "next-auth/react"; import { useQueryState, parseAsBoolean } from "nuqs"; -import { useMemo, useReducer, useRef, useState } from "react"; +import { useMemo, useReducer, useState } from "react"; import { + DataTableWrapper, DataTableProvider, - DataTable, DataTableToolbar, - DataTableFilters, DataTableSelectionBar, - DataTablePagination, + DataTableFilters, useColumnFilters, - useFetchMoreOnBottomReached, textFilter, isTextFilterValue, isSingleSelectFilterValue, @@ -122,7 +120,6 @@ function UserListTableContent() { const { data: teams } = trpc.viewer.organizations.getTeams.useQuery(); const { data: facetedTeamValues } = trpc.viewer.organizations.getFacetedValues.useQuery(); - const tableContainerRef = useRef(null); const [state, dispatch] = useReducer(reducer, initialState); const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); const [isDownloading, setIsDownloading] = useState(false); @@ -294,6 +291,7 @@ function UserListTableContent() { id: "member", accessorFn: (data) => data.email, enableHiding: false, + enableColumnFilter: false, size: 200, header: () => { return `Members`; @@ -485,13 +483,6 @@ function UserListTableContent() { }, }); - const fetchMoreOnBottomReached = useFetchMoreOnBottomReached({ - tableContainerRef, - hasNextPage, - fetchNextPage, - isFetching, - }); - const numberOfSelectedRows = table.getSelectedRowModel().rows.length; const handleDownload = async () => { @@ -549,63 +540,56 @@ function UserListTableContent() { return ( <> - fetchMoreOnBottomReached(e.target as HTMLDivElement)}> - -
-
- setDebouncedSearchTerm(value)} - className="sm:max-w-64 max-w-full" - /> -
-
+ hasNextPage={hasNextPage} + fetchNextPage={fetchNextPage} + isFetching={isFetching} + totalDBRowCount={totalDBRowCount} + ToolbarLeft={ + setDebouncedSearchTerm(value)} + className="sm:max-w-64 max-w-full" + /> + } + ToolbarRight={ + <> + handleDownload()} + data-testid="export-members-button"> + {t("download")} + + + + {adminOrOwner && ( handleDownload()} - data-testid="export-members-button"> - {t("download")} + color="primary" + StartIcon="plus" + className="rounded-md" + onClick={() => + dispatch({ + type: "INVITE_MEMBER", + payload: { + showModal: true, + }, + }) + } + data-testid="new-organization-member-button"> + {t("add")} - {/* We have to omit member because we don't want the filter to show but we can't disable filtering as we need that for the search bar */} - - - {adminOrOwner && ( - - dispatch({ - type: "INVITE_MEMBER", - payload: { - showModal: true, - }, - }) - } - data-testid="new-organization-member-button"> - {t("add")} - - )} -
-
-
- -
-
- -
- + )} + + }> +
+
{numberOfSelectedRows >= 2 && dynamicLinkVisible && ( @@ -638,7 +622,8 @@ function UserListTableContent() { /> )} - + + {state.deleteMember.showModal && } {state.inviteMember.showModal && } {state.impersonateMember.showModal && }