Merge pull request #12044 from alexrybch/entity-type-predicates

added type predicates for entities

plugins/catalog-backend/src/search/DefaultCatalogCollator.ts

@@ -20,8 +20,8 @@ import {
 } from '@backstage/backend-common';
 import {
   Entity,
+  isUserEntity,
   stringifyEntityRef,
-  UserEntity,
 } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import {
@@ -93,13 +93,9 @@ export class DefaultCatalogCollator {
     return formatted.toLowerCase();
   }
 
-  private isUserEntity(entity: Entity): entity is UserEntity {
-    return entity.kind.toLocaleUpperCase('en-US') === 'USER';
-  }
-
   private getDocumentText(entity: Entity): string {
     let documentText = entity.metadata.description || '';
-    if (this.isUserEntity(entity)) {
+    if (isUserEntity(entity)) {
       if (entity.spec?.profile?.displayName && documentText) {
         // combine displayName and description
         const displayName = entity.spec?.profile?.displayName;

plugins/catalog-backend/src/search/util.ts

@@ -14,15 +14,7 @@
  * limitations under the License.
  */
 
-import { Entity, UserEntity, GroupEntity } from '@backstage/catalog-model';
-
-function isUserEntity(entity: Entity): entity is UserEntity {
-  return entity.kind.toLocaleUpperCase('en-US') === 'USER';
-}
-
-function isGroupEntity(entity: Entity): entity is GroupEntity {
-  return entity.kind.toLocaleUpperCase('en-US') === 'GROUP';
-}
+import { Entity, isUserEntity, isGroupEntity } from '@backstage/catalog-model';
 
 export function getDocumentText(entity: Entity): string {
   const documentTexts: string[] = [];

plugins/catalog/src/components/EntitySwitch/conditions.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Entity, ComponentEntity } from '@backstage/catalog-model';
+import { ComponentEntity, Entity } from '@backstage/catalog-model';
 
 function strCmp(a: string | undefined, b: string | undefined): boolean {
   return Boolean(