From a96c2d47f8eac232c1cebebd68abf0bad56c0ae2 Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Sat, 2 Dec 2023 20:53:02 -0700
Subject: [PATCH 1/2] feat: display links card for groups by default

Signed-off-by: Kurt King <kurtaking@gmail.com>
---
 .changeset/quick-lions-care.md                               | 5 +++++
 packages/app/src/components/catalog/EntityPage.tsx           | 5 ++++-
 .../packages/app/src/components/catalog/EntityPage.tsx       | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/quick-lions-care.md

diff --git a/.changeset/quick-lions-care.md b/.changeset/quick-lions-care.md
new file mode 100644
index 0000000000..aa5caada05
--- /dev/null
+++ b/.changeset/quick-lions-care.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Include the `<EntityLinksCard />` for group entities by default
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 3bd8869f4f..8c9eab20d9 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -792,13 +792,16 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
+        <Grid item xs={12} md={6}>
+          <EntityLinksCard />
+        </Grid>
         <Grid item xs={12} md={6}>
           <EntityOwnershipCard
             variant="gridItem"
             entityFilterKind={customEntityFilterKind}
           />
         </Grid>
-        <Grid item xs={12}>
+        <Grid item xs={12} md={6}>
           <EntityMembersListCard />
         </Grid>
         <Grid item xs={12}>
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 6722ea2d03..d6ee8c3152 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
@@ -297,10 +297,13 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
+        <Grid item xs={12} md={6}>
+          <EntityLinksCard />
+        </Grid>
         <Grid item xs={12} md={6}>
           <EntityOwnershipCard variant="gridItem" />
         </Grid>
-        <Grid item xs={12}>
+        <Grid item xs={12} md={6}>
           <EntityMembersListCard />
         </Grid>
       </Grid>

From 24eec9f5d5b029db7197fe7ac7f8a6405ce9182d Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Sun, 3 Dec 2023 12:23:56 -0700
Subject: [PATCH 2/2] refactor: put links after members and ownership

Signed-off-by: Kurt King <kurtaking@gmail.com>
---
 packages/app/src/components/catalog/EntityPage.tsx          | 6 +++---
 .../packages/app/src/components/catalog/EntityPage.tsx      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
index 8c9eab20d9..4d5f65cbbe 100644
--- a/packages/app/src/components/catalog/EntityPage.tsx
+++ b/packages/app/src/components/catalog/EntityPage.tsx
@@ -792,9 +792,6 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
-        <Grid item xs={12} md={6}>
-          <EntityLinksCard />
-        </Grid>
         <Grid item xs={12} md={6}>
           <EntityOwnershipCard
             variant="gridItem"
@@ -804,6 +801,9 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityMembersListCard />
         </Grid>
+        <Grid item xs={12} md={6}>
+          <EntityLinksCard />
+        </Grid>
         <Grid item xs={12}>
           <EntityLikeDislikeRatingsCard />
         </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 d6ee8c3152..7c6a71e070 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
@@ -297,15 +297,15 @@ const groupPage = (
         <Grid item xs={12} md={6}>
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
-        <Grid item xs={12} md={6}>
-          <EntityLinksCard />
-        </Grid>
         <Grid item xs={12} md={6}>
           <EntityOwnershipCard variant="gridItem" />
         </Grid>
         <Grid item xs={12} md={6}>
           <EntityMembersListCard />
         </Grid>
+        <Grid item xs={12} md={6}>
+          <EntityLinksCard />
+        </Grid>
       </Grid>
     </EntityLayout.Route>
   </EntityLayout>