From eb4390fee042236af1c20d9f3b17c81bd23b0c5b Mon Sep 17 00:00:00 2001 From: David Arranz Date: Sun, 25 Aug 2024 20:18:07 +0200 Subject: [PATCH] . --- client/src/app/catalog/components/CatalogDataTable.tsx | 7 +++++++ .../quotes/components/editors/CatalogPickerDialog.tsx | 2 +- client/src/lib/hooks/useDataTable/useDataTable.tsx | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/client/src/app/catalog/components/CatalogDataTable.tsx b/client/src/app/catalog/components/CatalogDataTable.tsx index e7e32ab..a476b8f 100644 --- a/client/src/app/catalog/components/CatalogDataTable.tsx +++ b/client/src/app/catalog/components/CatalogDataTable.tsx @@ -80,6 +80,13 @@ export const CatalogDataTable = () => { data: data?.items ?? [], columns: columns, pageCount: data?.total_pages ?? -1, + initialState: { + columnVisibility: { + id: false, + article_id: false, + catalog_name: false, + }, + }, }); if (isError) { diff --git a/client/src/app/quotes/components/editors/CatalogPickerDialog.tsx b/client/src/app/quotes/components/editors/CatalogPickerDialog.tsx index b050ed3..fd5d315 100644 --- a/client/src/app/quotes/components/editors/CatalogPickerDialog.tsx +++ b/client/src/app/quotes/components/editors/CatalogPickerDialog.tsx @@ -26,7 +26,7 @@ export const CatalogPickerDialog = ({ {t("quotes.catalog_picker_dialog.title")} - {t("quotes.catalog_picker_dialog.subtitle")} + {t("quotes.catalog_picker_dialog.description")} diff --git a/client/src/lib/hooks/useDataTable/useDataTable.tsx b/client/src/lib/hooks/useDataTable/useDataTable.tsx index 80c6a17..4cd237f 100644 --- a/client/src/lib/hooks/useDataTable/useDataTable.tsx +++ b/client/src/lib/hooks/useDataTable/useDataTable.tsx @@ -1,4 +1,5 @@ import { + InitialTableState, OnChangeFn, PaginationState, getCoreRowModel, @@ -116,6 +117,8 @@ interface UseDataTableProps { */ enableAdvancedFilter?: boolean; + initialState: InitialTableState; + onPaginationChange?: OnChangeFn; } @@ -126,13 +129,16 @@ export function useDataTable({ enableSorting = false, enableHiding = false, enableRowSelection = false, + initialState, onPaginationChange, }: UseDataTableProps) { const { pagination, setPagination, sorting } = useDataTableContext(); // Table states const [rowSelection, setRowSelection] = React.useState({}); - const [columnVisibility, setColumnVisibility] = React.useState({}); + const [columnVisibility, setColumnVisibility] = React.useState( + initialState?.columnVisibility || {} + ); const paginationUpdater: OnChangeFn = (updater) => { if (typeof updater === "function") { @@ -167,6 +173,8 @@ export function useDataTable({ pageCount: pageCount ?? -1, getCoreRowModel: getCoreRowModel(), + initialState, + state: { pagination, sorting,