diff --git a/.changeset/thin-donuts-join.md b/.changeset/thin-donuts-join.md
new file mode 100644
index 0000000000..84705711d2
--- /dev/null
+++ b/.changeset/thin-donuts-join.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Fixed Entity kind pluralisation in the `CatalogKindHeader` component.
diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json
index 1528737aac..244aab8626 100644
--- a/plugins/catalog/package.json
+++ b/plugins/catalog/package.json
@@ -49,6 +49,7 @@
"@material-ui/lab": "4.0.0-alpha.57",
"history": "^5.0.0",
"lodash": "^4.17.21",
+ "pluralize": "^8.0.0",
"react-helmet": "6.1.0",
"react-use": "^17.2.4",
"zen-observable": "^0.9.0"
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
index 9f68252ca7..f511f58c58 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.test.tsx
@@ -31,6 +31,7 @@ import {
} from '@backstage/test-utils';
import { CatalogKindHeader } from './CatalogKindHeader';
import { errorApiRef } from '@backstage/core-plugin-api';
+import pluralize from 'pluralize';
const entities: Entity[] = [
{
@@ -96,7 +97,7 @@ describe('', () => {
entities.map(entity => {
expect(
- screen.getByRole('option', { name: `${entity.kind}s` }),
+ screen.getByRole('option', { name: `${pluralize(entity.kind)}` }),
).toBeInTheDocument();
});
});
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index b0aaeae658..bb9e98d9c3 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -31,6 +31,7 @@ import {
} from '@backstage/plugin-catalog-react';
import useAsync from 'react-use/lib/useAsync';
import { useApi } from '@backstage/core-plugin-api';
+import pluralize from 'pluralize';
const useStyles = makeStyles((theme: Theme) =>
createStyles({
@@ -132,7 +133,7 @@ export function CatalogKindHeader(props: CatalogKindHeaderProps) {
>
{Object.keys(options).map(kind => (
))}
diff --git a/yarn.lock b/yarn.lock
index be413cbe94..12417af790 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4750,6 +4750,7 @@ __metadata:
cross-fetch: ^3.1.5
history: ^5.0.0
lodash: ^4.17.21
+ pluralize: ^8.0.0
react-helmet: 6.1.0
react-use: ^17.2.4
zen-observable: ^0.9.0