diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md index 7f9d0908a3..ce2502691f 100644 --- a/plugins/catalog-react/api-report.md +++ b/plugins/catalog-react/api-report.md @@ -306,7 +306,7 @@ export type EntityListContextProps< next?: () => void; prev?: () => void; }; - count?: number; + totalItems?: number; }; // @public diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx index 5f8bf361f1..bc8e6b6038 100644 --- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx +++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx @@ -235,7 +235,7 @@ describe('', () => { await waitFor(() => { expect(result.current.entities.length).toBe(1); }); - expect(result.current.count).toBe(1); + expect(result.current.totalItems).toBe(1); await expect(() => waitFor(() => { @@ -252,7 +252,7 @@ describe('', () => { await waitFor(() => { expect(result.current.backendEntities.length).toBeGreaterThan(0); }); - expect(result.current.count).toBe(2); + expect(result.current.totalItems).toBe(2); expect(result.current.backendEntities.length).toBe(2); expect(mockCatalogApi.getEntities).toHaveBeenCalledTimes(1); @@ -278,7 +278,7 @@ describe('', () => { }); expect(result.current.backendEntities.length).toBe(2); - expect(result.current.count).toBe(2); + expect(result.current.totalItems).toBe(2); mockCatalogApi.getEntities!.mockRejectedValueOnce('error'); act(() => { @@ -460,7 +460,7 @@ describe('', () => { }); }); - expect(result.current.count).toBe(10); + expect(result.current.totalItems).toBe(10); }); it('returns an error on catalogApi failure', async () => { diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx index 1f2300c1c5..c81a399040 100644 --- a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx +++ b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx @@ -109,7 +109,7 @@ export type EntityListContextProps< prev?: () => void; }; - count?: number; + totalItems?: number; }; /** @@ -126,7 +126,7 @@ type OutputState = { entities: Entity[]; backendEntities: Entity[]; pageInfo?: QueryEntitiesResponse['pageInfo']; - count?: number; + totalItems?: number; }; /** @@ -226,7 +226,7 @@ export const EntityListProvider = ( backendEntities: response.items, entities: response.items.filter(entityFilter), pageInfo: response.pageInfo, - count: response.totalItems, + totalItems: response.totalItems, }); } } else { @@ -247,7 +247,7 @@ export const EntityListProvider = ( backendEntities: response.items, entities: response.items.filter(entityFilter), pageInfo: response.pageInfo, - count: response.totalItems, + totalItems: response.totalItems, }); } } @@ -272,7 +272,7 @@ export const EntityListProvider = ( appliedFilters: requestedFilters, backendEntities: response.items, entities, - count: entities.length, + totalItems: entities.length, }); } else { const entities = outputState.backendEntities.filter(entityFilter); @@ -280,7 +280,7 @@ export const EntityListProvider = ( appliedFilters: requestedFilters, backendEntities: outputState.backendEntities, entities, - count: entities.length, + totalItems: entities.length, }); } } @@ -361,7 +361,7 @@ export const EntityListProvider = ( loading, error, pageInfo, - count: outputState.count, + totalItems: outputState.totalItems, }), [outputState, updateFilters, queryParameters, loading, error, pageInfo], ); diff --git a/plugins/catalog-react/src/testUtils/providers.tsx b/plugins/catalog-react/src/testUtils/providers.tsx index ae99352f2c..6b88168207 100644 --- a/plugins/catalog-react/src/testUtils/providers.tsx +++ b/plugins/catalog-react/src/testUtils/providers.tsx @@ -71,7 +71,8 @@ export function MockEntityListContextProvider< loading: value?.loading ?? false, queryParameters: value?.queryParameters ?? defaultValues.queryParameters, error: value?.error, - count: (value?.entities ?? defaultValues.entities).length, + totalItems: + value?.totalItems ?? (value?.entities ?? defaultValues.entities).length, }), [value, defaultValues, filters, updateFilters], ); diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx index a233499fde..8aa5b9e376 100644 --- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx @@ -88,7 +88,7 @@ export const CatalogTable = (props: CatalogTableProps) => { } = props; const { isStarredEntity, toggleStarredEntity } = useStarredEntities(); const entityListContext = useEntityList(); - const { loading, error, entities, filters, pageInfo, count } = + const { loading, error, entities, filters, pageInfo, totalItems } = entityListContext; const enablePagination = !!pageInfo; @@ -176,7 +176,7 @@ export const CatalogTable = (props: CatalogTableProps) => { .filter(s => s) .join(' '); - const title = `${titleDisplay} (${count})`; + const title = `${titleDisplay} (${totalItems})`; const actions = props.actions || defaultActions; const options = { actionsColumnIndex: -1, diff --git a/plugins/catalog/src/components/CatalogTable/PaginatedCatalogTable.test.tsx b/plugins/catalog/src/components/CatalogTable/PaginatedCatalogTable.test.tsx index 84f9beea7c..976cdff667 100644 --- a/plugins/catalog/src/components/CatalogTable/PaginatedCatalogTable.test.tsx +++ b/plugins/catalog/src/components/CatalogTable/PaginatedCatalogTable.test.tsx @@ -142,7 +142,7 @@ describe('PaginatedCatalogTable', () => { e.entity), - count: data.length, + totalItems: data.length, filters: { kind: new EntityKindFilter('component'), },