From 44220f26a75fd80b131a7769322cafe9a6952624 Mon Sep 17 00:00:00 2001
From: Jonah Grimes <jgrimes@appriss.com>
Date: Tue, 11 May 2021 17:25:53 -0400
Subject: [PATCH] added handling of undefined to return an empty array

Signed-off-by: Jonah Grimes <jgrimes@appriss.com>
---
 .../RelatedEntitiesCard/RelatedEntitiesCard.tsx   |  2 +-
 .../src/components/RelatedEntitiesCard/presets.ts | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
index a01b7c8c8b..9b3c6fb431 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/RelatedEntitiesCard.tsx
@@ -38,7 +38,7 @@ type Props<T extends Entity> = {
   relationType: string;
   emptyMessage: string;
   emptyHelpLink: string;
-  asRenderableEntities: (entities: Entity[] | undefined) => T[];
+  asRenderableEntities: (entities?: Entity[]) => T[];
 };
 
 export function RelatedEntitiesCard<T extends Entity>({
diff --git a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
index 90a916e902..0d7c7f59f6 100644
--- a/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
+++ b/plugins/catalog/src/components/RelatedEntitiesCard/presets.ts
@@ -31,9 +31,8 @@ export const componentEntityColumns: TableColumn<ComponentEntity>[] = [
 ];
 export const componentEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-component';
-export const asComponentEntities = (
-  entities: Entity[] | undefined,
-): ComponentEntity[] => entities as ComponentEntity[];
+export const asComponentEntities = (entities?: Entity[]): ComponentEntity[] =>
+  (entities as ComponentEntity[]) || new Array<ComponentEntity>();
 
 export const resourceEntityColumns: TableColumn<ResourceEntity>[] = [
   EntityTable.columns.createEntityRefColumn({ defaultKind: 'resource' }),
@@ -44,9 +43,8 @@ export const resourceEntityColumns: TableColumn<ResourceEntity>[] = [
 ];
 export const resourceEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-resource';
-export const asResourceEntities = (
-  entities: Entity[] | undefined,
-): ResourceEntity[] => entities as ResourceEntity[];
+export const asResourceEntities = (entities?: Entity[]): ResourceEntity[] =>
+  (entities as ResourceEntity[]) || new Array<ResourceEntity>();
 
 export const systemEntityColumns: TableColumn<SystemEntity>[] = [
   EntityTable.columns.createEntityRefColumn({ defaultKind: 'system' }),
@@ -55,6 +53,5 @@ export const systemEntityColumns: TableColumn<SystemEntity>[] = [
 ];
 export const systemEntityHelpLink: string =
   'https://backstage.io/docs/features/software-catalog/descriptor-format#kind-system';
-export const asSystemEntities = (
-  entities: Entity[] | undefined,
-): SystemEntity[] => entities as SystemEntity[];
+export const asSystemEntities = (entities?: Entity[]): SystemEntity[] =>
+  (entities as SystemEntity[]) || new Array<SystemEntity>();