From cb20f595acd24b376d1d7fef81358d5456e8824c Mon Sep 17 00:00:00 2001 From: Pablo Lara Date: Sat, 21 Sep 2024 22:15:04 +0200 Subject: [PATCH] rename: rename table components --- app/(prowler)/providers/page.tsx | 4 ++-- components/providers/index.ts | 5 ----- .../table/{ColumnsProvider.tsx => columns-provider.tsx} | 2 +- ...TableColumnHeader.tsx => data-table-column-header.tsx} | 0 ...FilterColumnTable.tsx => data-table-filter-custom.tsx} | 6 ++++-- ...{DataTablePagination.tsx => data-table-pagination.tsx} | 0 .../{DataTableProvider.tsx => data-table-provider.tsx} | 8 ++++---- components/providers/table/index.ts | 7 +++++++ ...letonTableProvider.tsx => skeleton-table-provider.tsx} | 0 components/users/table/DataTableUser.tsx | 3 ++- 10 files changed, 20 insertions(+), 15 deletions(-) rename components/providers/table/{ColumnsProvider.tsx => columns-provider.tsx} (97%) rename components/providers/table/{DataTableColumnHeader.tsx => data-table-column-header.tsx} (100%) rename components/providers/table/{FilterColumnTable.tsx => data-table-filter-custom.tsx} (92%) rename components/providers/table/{DataTablePagination.tsx => data-table-pagination.tsx} (100%) rename components/providers/table/{DataTableProvider.tsx => data-table-provider.tsx} (92%) create mode 100644 components/providers/table/index.ts rename components/providers/table/{SkeletonTableProvider.tsx => skeleton-table-provider.tsx} (100%) diff --git a/app/(prowler)/providers/page.tsx b/app/(prowler)/providers/page.tsx index 7b2d11118e..79ccbf5d29 100644 --- a/app/(prowler)/providers/page.tsx +++ b/app/(prowler)/providers/page.tsx @@ -3,12 +3,12 @@ import { Suspense } from "react"; import { getProvider } from "@/actions"; import { FilterControls } from "@/components/filters"; +import { AddProviderModal } from "@/components/providers"; import { - AddProviderModal, ColumnsProvider, DataTableProvider, SkeletonTableProvider, -} from "@/components/providers"; +} from "@/components/providers/table"; import { Header } from "@/components/ui"; import { SearchParamsProps } from "@/types"; diff --git a/components/providers/index.ts b/components/providers/index.ts index 1f067cd69d..b92fe7eb83 100644 --- a/components/providers/index.ts +++ b/components/providers/index.ts @@ -8,8 +8,3 @@ export * from "./forms/DeleteForm"; export * from "./ProviderInfo"; export * from "./ScanStatus"; export * from "./SnippetIdProvider"; -export * from "./table/ColumnsProvider"; -export * from "./table/DataTableColumnHeader"; -export * from "./table/DataTablePagination"; -export * from "./table/DataTableProvider"; -export * from "./table/SkeletonTableProvider"; diff --git a/components/providers/table/ColumnsProvider.tsx b/components/providers/table/columns-provider.tsx similarity index 97% rename from components/providers/table/ColumnsProvider.tsx rename to components/providers/table/columns-provider.tsx index 679ea4b4ae..2b7ecbb5a5 100644 --- a/components/providers/table/ColumnsProvider.tsx +++ b/components/providers/table/columns-provider.tsx @@ -9,8 +9,8 @@ import { ProviderProps } from "@/types"; import { DateWithTime } from "../DateWithTime"; import { ProviderInfo } from "../ProviderInfo"; import { SnippetIdProvider } from "../SnippetIdProvider"; +import { DataTableColumnHeader } from "./data-table-column-header"; import { DataTableRowActions } from "./data-table-row-actions"; -import { DataTableColumnHeader } from "./DataTableColumnHeader"; const getProviderData = (row: { original: ProviderProps }) => { return row.original; diff --git a/components/providers/table/DataTableColumnHeader.tsx b/components/providers/table/data-table-column-header.tsx similarity index 100% rename from components/providers/table/DataTableColumnHeader.tsx rename to components/providers/table/data-table-column-header.tsx diff --git a/components/providers/table/FilterColumnTable.tsx b/components/providers/table/data-table-filter-custom.tsx similarity index 92% rename from components/providers/table/FilterColumnTable.tsx rename to components/providers/table/data-table-filter-custom.tsx index 09b210dd44..6774257d3e 100644 --- a/components/providers/table/FilterColumnTable.tsx +++ b/components/providers/table/data-table-filter-custom.tsx @@ -1,12 +1,14 @@ +"use client"; + import { Button } from "@nextui-org/react"; import { useRouter, useSearchParams } from "next/navigation"; import { useCallback, useMemo } from "react"; -interface FilterColumnTableProps { +interface DataTableFilterCustomProps { filters: { key: string; values: string[] }[]; } -export function FilterColumnTable({ filters }: FilterColumnTableProps) { +export function DataTableFilterCustom({ filters }: DataTableFilterCustomProps) { const router = useRouter(); const searchParams = useSearchParams(); diff --git a/components/providers/table/DataTablePagination.tsx b/components/providers/table/data-table-pagination.tsx similarity index 100% rename from components/providers/table/DataTablePagination.tsx rename to components/providers/table/data-table-pagination.tsx diff --git a/components/providers/table/DataTableProvider.tsx b/components/providers/table/data-table-provider.tsx similarity index 92% rename from components/providers/table/DataTableProvider.tsx rename to components/providers/table/data-table-provider.tsx index b89fa2a6c6..e300496913 100644 --- a/components/providers/table/DataTableProvider.tsx +++ b/components/providers/table/data-table-provider.tsx @@ -23,8 +23,8 @@ import { } from "@/components/ui"; import { MetaDataProps } from "@/types"; -import { DataTablePagination } from "./DataTablePagination"; -import { FilterColumnTable } from "./FilterColumnTable"; +import { DataTableFilterCustom } from "./data-table-filter-custom"; +import { DataTablePagination } from "./data-table-pagination"; interface DataTableProviderProps { columns: ColumnDef[]; @@ -56,7 +56,7 @@ export function DataTableProvider({ }); // This will be used to have "custom" filters in the table and will be - // passed to the FilterColumnTable component. This needs to be dynamic + // passed to the DataTableFilterCustom component. This needs to be dynamic // based on the columns that are available in the table. const filters = [ @@ -67,7 +67,7 @@ export function DataTableProvider({ return ( <> - +
diff --git a/components/providers/table/index.ts b/components/providers/table/index.ts new file mode 100644 index 0000000000..673896eada --- /dev/null +++ b/components/providers/table/index.ts @@ -0,0 +1,7 @@ +export { ColumnsProvider } from "./columns-provider"; +export { DataTableColumnHeader } from "./data-table-column-header"; +export { DataTableFilterCustom } from "./data-table-filter-custom"; +export { DataTablePagination } from "./data-table-pagination"; +export { DataTableProvider } from "./data-table-provider"; +export { DataTableRowActions } from "./data-table-row-actions"; +export { SkeletonTableProvider } from "./skeleton-table-provider"; diff --git a/components/providers/table/SkeletonTableProvider.tsx b/components/providers/table/skeleton-table-provider.tsx similarity index 100% rename from components/providers/table/SkeletonTableProvider.tsx rename to components/providers/table/skeleton-table-provider.tsx diff --git a/components/users/table/DataTableUser.tsx b/components/users/table/DataTableUser.tsx index 7b5c6a5049..b13093c2ab 100644 --- a/components/users/table/DataTableUser.tsx +++ b/components/users/table/DataTableUser.tsx @@ -11,7 +11,6 @@ import { } from "@tanstack/react-table"; import { useState } from "react"; -import { DataTablePagination } from "@/components/providers"; import { Table, TableBody, @@ -22,6 +21,8 @@ import { } from "@/components/ui"; import { MetaDataProps } from "@/types"; +import { DataTablePagination } from "./DataTablePagination"; + interface DataTableUserProps { columns: ColumnDef[]; data: TData[];