From 847bd2c2ff6d4fd205b6b9d8be7223a68199c554 Mon Sep 17 00:00:00 2001
From: Yousif Al-Raheem <yousifalraheem@gmail.com>
Date: Wed, 17 Nov 2021 17:06:54 +0100
Subject: [PATCH 1/3] use email links instead of text in members list

Signed-off-by: Yousif Al-Raheem <yousifalraheem@gmail.com>
---
 .changeset/khaki-lies-burn.md                          |  5 +++++
 .../Cards/Group/MembersList/MembersListCard.tsx        | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/khaki-lies-burn.md

diff --git a/.changeset/khaki-lies-burn.md b/.changeset/khaki-lies-burn.md
new file mode 100644
index 0000000000..e89a36a37a
--- /dev/null
+++ b/.changeset/khaki-lies-burn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': minor
+---
+
+Use email links in the catalog's members list instead of text to display a member's email
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 0642e80a7b..7cc7ed88f5 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -99,7 +99,15 @@ const MemberComponent = ({ member }: { member: UserEntity }) => {
                 {displayName}
               </Link>
             </Typography>
-            <Typography variant="caption">{profile?.email}</Typography>
+            {profile?.email && (
+              <Link
+                href={`mailto:${profile.email}`}
+                target="_blank"
+                rel="noreferrer noopener"
+              >
+                {profile.email}
+              </Link>
+            )}
           </Box>
         </Box>
       </Box>

From db7227e659a32509306d3b233517116efb3dafa1 Mon Sep 17 00:00:00 2001
From: Yousif Al-Raheem <yousifalraheem@gmail.com>
Date: Mon, 22 Nov 2021 11:19:54 +0100
Subject: [PATCH 2/3] use backstage link instead of react router link in
 memberslistcard

Signed-off-by: Yousif Al-Raheem <yousifalraheem@gmail.com>
---
 .changeset/three-flowers-push.md                    |  5 +++++
 .../Cards/Group/MembersList/MembersListCard.tsx     | 13 +++----------
 2 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/three-flowers-push.md

diff --git a/.changeset/three-flowers-push.md b/.changeset/three-flowers-push.md
new file mode 100644
index 0000000000..5457c0fd15
--- /dev/null
+++ b/.changeset/three-flowers-push.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-org': minor
+---
+
+use backstage link instead of react router link in MembersListCard
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 7cc7ed88f5..7a15bd2122 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -28,14 +28,13 @@ import {
   Box,
   createStyles,
   Grid,
-  Link,
   makeStyles,
   Theme,
   Typography,
 } from '@material-ui/core';
 import Pagination from '@material-ui/lab/Pagination';
 import React from 'react';
-import { generatePath, Link as RouterLink } from 'react-router-dom';
+import { generatePath } from 'react-router-dom';
 import { useAsync } from 'react-use';
 
 import {
@@ -43,6 +42,7 @@ import {
   InfoCard,
   Progress,
   ResponseErrorPanel,
+  Link,
 } from '@backstage/core-components';
 import { useApi } from '@backstage/core-plugin-api';
 
@@ -90,7 +90,6 @@ const MemberComponent = ({ member }: { member: UserEntity }) => {
           <Box pt={2} textAlign="center">
             <Typography variant="h5">
               <Link
-                component={RouterLink}
                 to={generatePath(
                   `/catalog/:namespace/user/${metaName}`,
                   entityRouteParams(member),
@@ -100,13 +99,7 @@ const MemberComponent = ({ member }: { member: UserEntity }) => {
               </Link>
             </Typography>
             {profile?.email && (
-              <Link
-                href={`mailto:${profile.email}`}
-                target="_blank"
-                rel="noreferrer noopener"
-              >
-                {profile.email}
-              </Link>
+              <Link to={`mailto:${profile.email}`}>{profile.email}</Link>
             )}
           </Box>
         </Box>

From 2f4a686411a0287065038821b67889a6d01e3f98 Mon Sep 17 00:00:00 2001
From: Yousif Al-Raheem <yousifalraheem@gmail.com>
Date: Thu, 25 Nov 2021 10:04:45 +0100
Subject: [PATCH 3/3] changed minor to patch release

Signed-off-by: Yousif Al-Raheem <yousifalraheem@gmail.com>
---
 .../{khaki-lies-burn.md => eleven-starfishes-exist.md}       | 2 +-
 .changeset/three-flowers-push.md                             | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 rename .changeset/{khaki-lies-burn.md => eleven-starfishes-exist.md} (76%)
 delete mode 100644 .changeset/three-flowers-push.md

diff --git a/.changeset/khaki-lies-burn.md b/.changeset/eleven-starfishes-exist.md
similarity index 76%
rename from .changeset/khaki-lies-burn.md
rename to .changeset/eleven-starfishes-exist.md
index e89a36a37a..a3139e1d3f 100644
--- a/.changeset/khaki-lies-burn.md
+++ b/.changeset/eleven-starfishes-exist.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-org': minor
+'@backstage/plugin-org': patch
 ---
 
 Use email links in the catalog's members list instead of text to display a member's email
diff --git a/.changeset/three-flowers-push.md b/.changeset/three-flowers-push.md
deleted file mode 100644
index 5457c0fd15..0000000000
--- a/.changeset/three-flowers-push.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@backstage/plugin-org': minor
----
-
-use backstage link instead of react router link in MembersListCard