From d0276817123ba131c9211de30d229839f13d7775 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 22:21:21 -0600
Subject: [PATCH 1/3] Add warnings to all entity pages, links to APIs

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/strange-ducks-rhyme.md             |  5 +++
 .../app/src/components/catalog/EntityPage.tsx | 38 ++++++++++++-------
 .../app/src/components/catalog/EntityPage.tsx | 17 ++++++++-
 3 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/strange-ducks-rhyme.md

diff --git a/.changeset/strange-ducks-rhyme.md b/.changeset/strange-ducks-rhyme.md
new file mode 100644
index 0000000000..47e0ee0d09
--- /dev/null
+++ b/.changeset/strange-ducks-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': minor
+---
+
+Updated the default create-app `EntityPage` to include orphan and processing error alerts for all entity types. Previously these were only shown for entities with the `Component` kind. The `EntityPage` in Backstage applications should be updated following [1d517af](https://github.com/backstage/backstage/commit/1d517af7ab1c84dc7d45f6a3a4747d1a44e3ab6c). This also adds the `EntityLinkCard` for API entities.
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index d84a7341bc..4a392e0f05 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -211,20 +211,8 @@ const cicdCard = (
   </EntitySwitch>
 );
 
-const errorsContent = (
-  <EntitySwitch>
-    <EntitySwitch.Case if={isRollbarAvailable}>
-      <EntityRollbarContent />
-    </EntitySwitch.Case>
-
-    <EntitySwitch.Case>
-      <EntitySentryContent />
-    </EntitySwitch.Case>
-  </EntitySwitch>
-);
-
-const overviewContent = (
-  <Grid container spacing={3} alignItems="stretch">
+const entityWarningContent = (
+  <>
     <EntitySwitch>
       <EntitySwitch.Case if={isOrphan}>
         <Grid item xs={12}>
@@ -240,7 +228,24 @@ const overviewContent = (
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
+  </>
+);
 
+const errorsContent = (
+  <EntitySwitch>
+    <EntitySwitch.Case if={isRollbarAvailable}>
+      <EntityRollbarContent />
+    </EntitySwitch.Case>
+
+    <EntitySwitch.Case>
+      <EntitySentryContent />
+    </EntitySwitch.Case>
+  </EntitySwitch>
+);
+
+const overviewContent = (
+  <Grid container spacing={3} alignItems="stretch">
+    {entityWarningContent}
     <Grid item md={8} xs={12}>
       <EntityAboutCard variant="gridItem" />
     </Grid>
@@ -448,6 +453,7 @@ const apiPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12}>
           <EntityAboutCard />
         </Grid>
@@ -478,6 +484,7 @@ const userPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityUserProfileCard variant="gridItem" />
         </Grid>
@@ -493,6 +500,7 @@ const groupPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
@@ -511,6 +519,7 @@ const systemPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
@@ -535,6 +544,7 @@ const domainPage = (
   <EntityLayoutWrapper>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
index a78d1a8f01..4bd5f7fe61 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -82,8 +82,8 @@ const cicdContent = (
   </EntitySwitch>
 );
 
-const overviewContent = (
-  <Grid container spacing={3} alignItems="stretch">
+const entityWarningContent = (
+  <>
     <EntitySwitch>
       <EntitySwitch.Case if={isOrphan}>
         <Grid item xs={12}>
@@ -99,7 +99,12 @@ const overviewContent = (
         </Grid>
       </EntitySwitch.Case>
     </EntitySwitch>
+  </>
+);
 
+const overviewContent = (
+  <Grid container spacing={3} alignItems="stretch">    
+    {entityWarningContent}
     <Grid item md={6}>
       <EntityAboutCard variant="gridItem" />
     </Grid>
@@ -214,9 +219,13 @@ const apiPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard />
         </Grid>
+        <Grid item md={4} xs={12}>
+          <EntityLinksCard />
+        </Grid>
         <Grid container item md={12}>
           <Grid item md={6}>
             <EntityProvidingComponentsCard />
@@ -242,6 +251,7 @@ const userPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityUserProfileCard variant="gridItem" />
         </Grid>
@@ -257,6 +267,7 @@ const groupPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3}>
+        {entityWarningContent}
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
@@ -275,6 +286,7 @@ const systemPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>
@@ -299,6 +311,7 @@ const domainPage = (
   <EntityLayout>
     <EntityLayout.Route path="/" title="Overview">
       <Grid container spacing={3} alignItems="stretch">
+        {entityWarningContent}
         <Grid item md={6}>
           <EntityAboutCard variant="gridItem" />
         </Grid>

From aa8e59f6f9da68a6e19f98f64470000f00745683 Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Thu, 19 Aug 2021 22:31:17 -0600
Subject: [PATCH 2/3] Fix commit reference

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .changeset/strange-ducks-rhyme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/strange-ducks-rhyme.md b/.changeset/strange-ducks-rhyme.md
index 47e0ee0d09..1f75593d04 100644
--- a/.changeset/strange-ducks-rhyme.md
+++ b/.changeset/strange-ducks-rhyme.md
@@ -2,4 +2,4 @@
 '@backstage/create-app': minor
 ---
 
-Updated the default create-app `EntityPage` to include orphan and processing error alerts for all entity types. Previously these were only shown for entities with the `Component` kind. The `EntityPage` in Backstage applications should be updated following [1d517af](https://github.com/backstage/backstage/commit/1d517af7ab1c84dc7d45f6a3a4747d1a44e3ab6c). This also adds the `EntityLinkCard` for API entities.
+Updated the default create-app `EntityPage` to include orphan and processing error alerts for all entity types. Previously these were only shown for entities with the `Component` kind. The `EntityPage` in Backstage applications should be updated following [d027681](https://github.com/backstage/backstage/pull/6899/commits/d0276817123ba131c9211de30d229839f13d7775). This also adds the `EntityLinkCard` for API entities.

From 0f92df640aa77ddfd081e7d34196d4dcda48d32f Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Fri, 20 Aug 2021 10:25:36 -0600
Subject: [PATCH 3/3] Prettier

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../packages/app/src/components/catalog/EntityPage.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
index 4bd5f7fe61..d3b4b786a0 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -103,7 +103,7 @@ const entityWarningContent = (
 );
 
 const overviewContent = (
-  <Grid container spacing={3} alignItems="stretch">    
+  <Grid container spacing={3} alignItems="stretch">
     {entityWarningContent}
     <Grid item md={6}>
       <EntityAboutCard variant="gridItem" />