diff --git a/.changeset/chatty-pears-nail.md b/.changeset/chatty-pears-nail.md new file mode 100644 index 0000000000..548e89ec1a --- /dev/null +++ b/.changeset/chatty-pears-nail.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +When retrieving the text of a document also check if the entity is of type group. The function will then also return the display name and the description and not only the description. diff --git a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts index bb44670443..ef3886aea6 100644 --- a/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts +++ b/plugins/catalog-backend/src/search/DefaultCatalogCollator.ts @@ -22,6 +22,7 @@ import { Entity, stringifyEntityRef, UserEntity, + GroupEntity, } from '@backstage/catalog-model'; import { Config } from '@backstage/config'; import { @@ -97,9 +98,13 @@ export class DefaultCatalogCollator { return entity.kind.toLocaleUpperCase('en-US') === 'USER'; } + private isGroupEntity(entity: Entity): entity is GroupEntity { + return entity.kind.toLocaleUpperCase('en-US') === 'GROUP'; + } + private getDocumentText(entity: Entity): string { let documentText = entity.metadata.description || ''; - if (this.isUserEntity(entity)) { + if (this.isUserEntity(entity) || this.isGroupEntity(entity)) { if (entity.spec?.profile?.displayName && documentText) { // combine displayName and description const displayName = entity.spec?.profile?.displayName;