From a4647dfa739cd730c09918c5c4b8df03e0161f2d Mon Sep 17 00:00:00 2001 From: Tyler Davis Date: Fri, 8 Nov 2024 19:46:03 +1100 Subject: [PATCH 1/3] Enable customization of CatalogTable pagination Signed-off-by: Tyler Davis --- .../components/CatalogTable/CursorPaginatedCatalogTable.tsx | 2 +- .../components/CatalogTable/OffsetPaginatedCatalogTable.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx index da9f13e85c..7198f8a60c 100644 --- a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx @@ -39,9 +39,9 @@ export function CursorPaginatedCatalogTable(props: PaginatedCatalogTableProps) { columns={columns} data={data} options={{ + paginationPosition: 'both', ...options, // These settings are configured to force server side pagination - paginationPosition: 'both', pageSizeOptions: [], showFirstLastPageButtons: false, pageSize: Number.MAX_SAFE_INTEGER, diff --git a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx index 0faa0043a1..a86dd60b50 100644 --- a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx @@ -29,7 +29,7 @@ import { export function OffsetPaginatedCatalogTable( props: TableProps, ) { - const { columns, data, isLoading } = props; + const { columns, data, isLoading, options } = props; const { updateFilters, setLimit, setOffset, limit, totalItems, offset } = useEntityList(); const [page, setPage] = React.useState( @@ -53,6 +53,7 @@ export function OffsetPaginatedCatalogTable( pageSizeOptions: [5, 10, 20, 50, 100], pageSize: limit, emptyRowsWhenPaging: false, + ...options, }} onSearchChange={(searchText: string) => updateFilters({ From 79e9631ff2ab5c1e12a6cfbb8e7a7f6a38f5d38d Mon Sep 17 00:00:00 2001 From: Tyler Davis Date: Fri, 8 Nov 2024 19:48:35 +1100 Subject: [PATCH 2/3] add changeset Signed-off-by: Tyler Davis --- .changeset/serious-penguins-remain.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/serious-penguins-remain.md diff --git a/.changeset/serious-penguins-remain.md b/.changeset/serious-penguins-remain.md new file mode 100644 index 0000000000..613d2a7404 --- /dev/null +++ b/.changeset/serious-penguins-remain.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog': minor +--- + +Allow CursorPaginatedCatalogTable and OffsetPaginatedCatalogTable to configure Table options, specifically `paginationPostition` From 1c9da31f19f10c54daa7aca5ddba3d3c1ab4cf64 Mon Sep 17 00:00:00 2001 From: Tyler Davis Date: Sat, 9 Nov 2024 07:07:47 +1100 Subject: [PATCH 3/3] Update .changeset/serious-penguins-remain.md Co-authored-by: Vincenzo Scamporlino Signed-off-by: Tyler Davis --- .changeset/serious-penguins-remain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/serious-penguins-remain.md b/.changeset/serious-penguins-remain.md index 613d2a7404..fc90b4ad01 100644 --- a/.changeset/serious-penguins-remain.md +++ b/.changeset/serious-penguins-remain.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog': minor --- -Allow CursorPaginatedCatalogTable and OffsetPaginatedCatalogTable to configure Table options, specifically `paginationPostition` +Allow `OffsetPaginatedCatalogTable` to configure Table options and `CursorPaginatedCatalogTable` to configure `paginationPosition`.