From 0f5d997d350514865c90d0133dfabf6f6f416c09 Mon Sep 17 00:00:00 2001
From: Chris Langhout <clanghout@bol.com>
Date: Tue, 25 Apr 2023 15:08:58 +0200
Subject: [PATCH] chore: fix tests

Signed-off-by: Chris Langhout <clanghout@bol.com>
---
 .../examples/domains/artists-domain.yaml      |  1 +
 .../components/DomainCard/DomainCard.test.tsx |  5 +++-
 .../src/components/DomainCard/DomainCard.tsx  |  4 +--
 .../components/EntityCard/EntityCard.test.tsx | 26 +++++++++++++++++++
 .../src/components/EntityCard/EntityCard.tsx  |  5 +++-
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/packages/catalog-model/examples/domains/artists-domain.yaml b/packages/catalog-model/examples/domains/artists-domain.yaml
index 2a74425791..0dc1b91cb5 100644
--- a/packages/catalog-model/examples/domains/artists-domain.yaml
+++ b/packages/catalog-model/examples/domains/artists-domain.yaml
@@ -3,6 +3,7 @@ kind: Domain
 metadata:
   name: artists
   description: Everything related to artists
+  title: Artists
   links:
     - url: http://example.com/domain/artists/
       title: Domain Readme
diff --git a/plugins/explore/src/components/DomainCard/DomainCard.test.tsx b/plugins/explore/src/components/DomainCard/DomainCard.test.tsx
index cb0fd8b473..b66e30c652 100644
--- a/plugins/explore/src/components/DomainCard/DomainCard.test.tsx
+++ b/plugins/explore/src/components/DomainCard/DomainCard.test.tsx
@@ -17,6 +17,7 @@
 import { DomainEntity } from '@backstage/catalog-model';
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
+import { screen } from '@testing-library/react';
 import React from 'react';
 import { DomainCard } from './DomainCard';
 
@@ -58,13 +59,14 @@ describe('<DomainCard />', () => {
       kind: 'Domain',
       metadata: {
         name: 'artists',
+        title: 'my Custom Title',
       },
       spec: {
         owner: 'guest',
       },
     };
     const { getByText } = await renderInTestApp(
-      <DomainCard entity={entity} title="my Custom Title" />,
+      <DomainCard entity={entity} />,
       {
         mountedRoutes: {
           '/catalog/:namespace/:kind/:name': entityRouteRef,
@@ -77,5 +79,6 @@ describe('<DomainCard />', () => {
       '/catalog/default/domain/artists',
     );
     expect(getByText('my Custom Title')).toBeInTheDocument();
+    expect(screen.queryByText('artists')).not.toBeInTheDocument();
   });
 });
diff --git a/plugins/explore/src/components/DomainCard/DomainCard.tsx b/plugins/explore/src/components/DomainCard/DomainCard.tsx
index f5327ea4e0..c70df46b1a 100644
--- a/plugins/explore/src/components/DomainCard/DomainCard.tsx
+++ b/plugins/explore/src/components/DomainCard/DomainCard.tsx
@@ -35,7 +35,7 @@ import { LinkButton, ItemCardHeader } from '@backstage/core-components';
 import { useRouteRef } from '@backstage/core-plugin-api';
 
 /** @public */
-export const DomainCard = (props: { entity: DomainEntity; title?: string }) => {
+export const DomainCard = (props: { entity: DomainEntity }) => {
   const { entity } = props;
 
   const catalogEntityRoute = useRouteRef(entityRouteRef);
@@ -54,7 +54,7 @@ export const DomainCard = (props: { entity: DomainEntity; title?: string }) => {
     <Card>
       <CardMedia>
         <ItemCardHeader
-          title={props.title ?? entity.metadata.name}
+          title={entity.metadata.title ?? entity.metadata.name}
           subtitle={owner}
         />
       </CardMedia>
diff --git a/plugins/explore/src/components/EntityCard/EntityCard.test.tsx b/plugins/explore/src/components/EntityCard/EntityCard.test.tsx
index 4b006e347f..cebd5af3d6 100644
--- a/plugins/explore/src/components/EntityCard/EntityCard.test.tsx
+++ b/plugins/explore/src/components/EntityCard/EntityCard.test.tsx
@@ -18,6 +18,7 @@ import { Entity } from '@backstage/catalog-model';
 import { entityRouteRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import React from 'react';
+import { screen } from '@testing-library/react';
 import { EntityCard } from './EntityCard';
 
 describe('<EntityCard />', () => {
@@ -51,4 +52,29 @@ describe('<EntityCard />', () => {
       '/catalog/default/domain/artists',
     );
   });
+
+  it('renders an entity card with display title', async () => {
+    const entity: Entity = {
+      apiVersion: 'backstage.io/v1alpha1',
+      kind: 'Domain',
+      metadata: {
+        name: 'artists',
+        title: 'New Title',
+      },
+      spec: {
+        owner: 'guest',
+      },
+    };
+    const { getByText } = await renderInTestApp(
+      <EntityCard entity={entity} />,
+      {
+        mountedRoutes: {
+          '/catalog/:namespace/:kind/:name': entityRouteRef,
+        },
+      },
+    );
+
+    expect(getByText('New Title')).toBeInTheDocument();
+    expect(screen.queryByText('artists')).not.toBeInTheDocument();
+  });
 });
diff --git a/plugins/explore/src/components/EntityCard/EntityCard.tsx b/plugins/explore/src/components/EntityCard/EntityCard.tsx
index 0a5908df38..9589d4721e 100644
--- a/plugins/explore/src/components/EntityCard/EntityCard.tsx
+++ b/plugins/explore/src/components/EntityCard/EntityCard.tsx
@@ -53,7 +53,10 @@ export const EntityCard = (props: { entity: Entity }) => {
   return (
     <Card>
       <CardMedia>
-        <ItemCardHeader title={entity.metadata.name} subtitle={owner} />
+        <ItemCardHeader
+          title={entity.metadata.title ?? entity.metadata.name}
+          subtitle={owner}
+        />
       </CardMedia>
       <CardContent>
         {entity.metadata.tags?.length ? (