diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx index 165d75bf48..1a9d363ec4 100644 --- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx +++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx @@ -34,6 +34,7 @@ import { useEntityList, useStarredEntities, } from '@backstage/plugin-catalog-react'; +import CircularProgress from '@material-ui/core/CircularProgress'; import Typography from '@material-ui/core/Typography'; import { visuallyHidden } from '@mui/utils'; import Edit from '@material-ui/icons/Edit'; @@ -195,11 +196,20 @@ export const CatalogTable = (props: CatalogTableProps) => { const titlePreamble = capitalize( filters.user?.value ?? t('catalogTable.allFilters'), ); - const title = + const titleText = props.title || [titlePreamble, currentType, pluralize(currentKind), currentCount] .filter(s => s) .join(' '); + const title = + loading && !isLoading ? ( + <> + {titleText}{' '} + + + ) : ( + titleText + ); const actions = props.actions || defaultActions; const options: TableProps['options'] = {