From 0ff53c800a3a95010b3e79df619a43939448b589 Mon Sep 17 00:00:00 2001 From: SzymonGr Date: Tue, 10 Sep 2024 23:07:46 +0200 Subject: [PATCH 1/2] Enable loading state for paginated catalog tables by passing isLoading prop Signed-off-by: SzymonGr --- .changeset/spotty-buses-drive.md | 5 +++++ .../components/CatalogTable/CursorPaginatedCatalogTable.tsx | 1 + .../components/CatalogTable/OffsetPaginatedCatalogTable.tsx | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/spotty-buses-drive.md diff --git a/.changeset/spotty-buses-drive.md b/.changeset/spotty-buses-drive.md new file mode 100644 index 0000000000..76bac9e895 --- /dev/null +++ b/.changeset/spotty-buses-drive.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog': patch +--- + +Enable loading state for paginated catalog tables by passing isLoading prop diff --git a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx index 4ad1d60d2d..da9f13e85c 100644 --- a/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/CursorPaginatedCatalogTable.tsx @@ -62,6 +62,7 @@ export function CursorPaginatedCatalogTable(props: PaginatedCatalogTableProps) { /* this will enable the next button accordingly */ totalCount={next ? Number.MAX_VALUE : Number.MAX_SAFE_INTEGER} localization={{ pagination: { labelDisplayedRows: '' } }} + isLoading={isLoading} {...restProps} /> ); diff --git a/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/OffsetPaginatedCatalogTable.tsx index 1528fb59f9..0faa0043a1 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 } = props; + const { columns, data, isLoading } = props; const { updateFilters, setLimit, setOffset, limit, totalItems, offset } = useEntityList(); const [page, setPage] = React.useState( @@ -68,6 +68,7 @@ export function OffsetPaginatedCatalogTable( }} totalCount={totalItems} localization={{ pagination: { labelDisplayedRows: '' } }} + isLoading={isLoading} /> ); } From 960d259c1470c7e1f2ff156e11d2e1eaa19c71ae Mon Sep 17 00:00:00 2001 From: SzymonGr Date: Wed, 11 Sep 2024 11:27:27 +0200 Subject: [PATCH 2/2] Fix PR check error in changeset file Signed-off-by: SzymonGr --- .changeset/spotty-buses-drive.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/spotty-buses-drive.md b/.changeset/spotty-buses-drive.md index 76bac9e895..2f882be9a3 100644 --- a/.changeset/spotty-buses-drive.md +++ b/.changeset/spotty-buses-drive.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog': patch --- -Enable loading state for paginated catalog tables by passing isLoading prop +Enable loading state for paginated catalog tables by passing `isLoading` prop