From f11e50ea712e939039a3dc5ccd0b50b4a903f9f8 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Mon, 28 Jun 2021 21:05:11 +0530
Subject: [PATCH 1/6] feat: open external tools in new tab

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/fair-falcons-scream.md                    | 5 +++++
 plugins/explore/src/components/ToolCard/ToolCard.tsx | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fair-falcons-scream.md

diff --git a/.changeset/fair-falcons-scream.md b/.changeset/fair-falcons-scream.md
new file mode 100644
index 0000000000..5ce4b40265
--- /dev/null
+++ b/.changeset/fair-falcons-scream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-explore': patch
+---
+
+Enhanced tools card to open external tools in new tab
diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
index 2baa0cffda..00c9851865 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -63,6 +63,7 @@ export const ToolCard = ({ card, objectFit }: Props) => {
   const classes = useStyles();
 
   const { title, description, url, image, lifecycle, tags } = card;
+  const isExternalUrl = url.startsWith('https://') || url.startsWith('http://');
 
   return (
     <Card key={title}>
@@ -97,7 +98,12 @@ export const ToolCard = ({ card, objectFit }: Props) => {
         )}
       </CardContent>
       <CardActions>
-        <Button color="primary" href={url} disabled={!url}>
+        <Button
+          {...(isExternalUrl ? { target: '_blank' } : {})}
+          color="primary"
+          href={url}
+          disabled={!url}
+        >
           Explore
         </Button>
       </CardActions>

From bbdeb50ba7671a0f2bd93d5800fc36760cfaea9d Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Wed, 30 Jun 2021 21:53:09 +0530
Subject: [PATCH 2/6] Replaced material button to core-components

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 packages/core-components/src/components/Link/Link.tsx | 10 +++++++++-
 plugins/explore/src/components/ToolCard/ToolCard.tsx  |  7 +++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index dd169390a5..89f5a69245 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -29,6 +29,7 @@ export const isExternalUri = (uri: string) => /^([a-z+.-]+):/.test(uri);
 export type LinkProps = MaterialLinkProps &
   RouterLinkProps & {
     component?: ElementType<any>;
+    externalLinkTarget?: undefined | '_blank';
   };
 
 /**
@@ -39,7 +40,14 @@ export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
   const to = String(props.to);
   return isExternalUri(to) ? (
     // External links
-    <MaterialLink ref={ref} href={to} {...props} />
+    <MaterialLink
+      ref={ref}
+      href={to}
+      {...(props.externalLinkTarget
+        ? { target: props.externalLinkTarget }
+        : {})}
+      {...props}
+    />
   ) : (
     // Interact with React Router for internal links
     <MaterialLink ref={ref} component={RouterLink} {...props} />
diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
index 00c9851865..584d0a54a6 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -18,7 +18,6 @@ import { ExploreTool } from '@backstage/plugin-explore-react';
 import { BackstageTheme } from '@backstage/theme';
 import {
   Box,
-  Button,
   Card,
   CardActions,
   CardContent,
@@ -27,6 +26,7 @@ import {
   makeStyles,
   Typography,
 } from '@material-ui/core';
+import { Button } from '@backstage/core-components';
 import classNames from 'classnames';
 import React from 'react';
 
@@ -63,7 +63,6 @@ export const ToolCard = ({ card, objectFit }: Props) => {
   const classes = useStyles();
 
   const { title, description, url, image, lifecycle, tags } = card;
-  const isExternalUrl = url.startsWith('https://') || url.startsWith('http://');
 
   return (
     <Card key={title}>
@@ -99,9 +98,9 @@ export const ToolCard = ({ card, objectFit }: Props) => {
       </CardContent>
       <CardActions>
         <Button
-          {...(isExternalUrl ? { target: '_blank' } : {})}
+          externalLinkTarget="_blank"
           color="primary"
-          href={url}
+          to={url}
           disabled={!url}
         >
           Explore

From fbfc9e4d0ffb0770cc28ceb6e57bdbd376299e9c Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Wed, 30 Jun 2021 21:56:13 +0530
Subject: [PATCH 3/6] Included rel:noopener for _blank target

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 packages/core-components/src/components/Link/Link.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index 89f5a69245..4cd18e9334 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -44,7 +44,7 @@ export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
       ref={ref}
       href={to}
       {...(props.externalLinkTarget
-        ? { target: props.externalLinkTarget }
+        ? { target: props.externalLinkTarget, rel: 'noopener' }
         : {})}
       {...props}
     />

From 80b42d7137b80c3e04f60828aa653d04d60a723f Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 1 Jul 2021 19:09:03 +0530
Subject: [PATCH 4/6] Open external links in new window by default

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 .changeset/fair-falcons-scream.md                     | 4 +++-
 packages/core-components/src/components/Link/Link.tsx | 5 +----
 plugins/explore/src/components/ToolCard/ToolCard.tsx  | 7 +------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.changeset/fair-falcons-scream.md b/.changeset/fair-falcons-scream.md
index 5ce4b40265..1f2f095c81 100644
--- a/.changeset/fair-falcons-scream.md
+++ b/.changeset/fair-falcons-scream.md
@@ -1,5 +1,7 @@
 ---
+'@backstage/core-components': patch
 '@backstage/plugin-explore': patch
 ---
 
-Enhanced tools card to open external tools in new tab
+- Enhanced core `Button` component to open external links in new tab.
+- Replaced the use of `Button` component from material by `core-components` in tools card.
diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index 4cd18e9334..67a5a4994b 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -29,7 +29,6 @@ export const isExternalUri = (uri: string) => /^([a-z+.-]+):/.test(uri);
 export type LinkProps = MaterialLinkProps &
   RouterLinkProps & {
     component?: ElementType<any>;
-    externalLinkTarget?: undefined | '_blank';
   };
 
 /**
@@ -43,9 +42,7 @@ export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
     <MaterialLink
       ref={ref}
       href={to}
-      {...(props.externalLinkTarget
-        ? { target: props.externalLinkTarget, rel: 'noopener' }
-        : {})}
+      {...{ target: '_blank', rel: 'noopener' }}
       {...props}
     />
   ) : (
diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
index 584d0a54a6..904db0c00b 100644
--- a/plugins/explore/src/components/ToolCard/ToolCard.tsx
+++ b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -97,12 +97,7 @@ export const ToolCard = ({ card, objectFit }: Props) => {
         )}
       </CardContent>
       <CardActions>
-        <Button
-          externalLinkTarget="_blank"
-          color="primary"
-          to={url}
-          disabled={!url}
-        >
+        <Button color="primary" to={url} disabled={!url}>
           Explore
         </Button>
       </CardActions>

From 9bb672c06a7af41d976b76f7d34581c6abb9ca88 Mon Sep 17 00:00:00 2001
From: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
Date: Thu, 1 Jul 2021 19:39:37 +0530
Subject: [PATCH 5/6] Open http external links in new window by default

Signed-off-by: Deepak Bhardwaj <deepak.bhardwaj@outlook.com>
---
 packages/core-components/src/components/Link/Link.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index 67a5a4994b..7853c4f52f 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -37,12 +37,14 @@ export type LinkProps = MaterialLinkProps &
  */
 export const Link = React.forwardRef<any, LinkProps>((props, ref) => {
   const to = String(props.to);
-  return isExternalUri(to) ? (
+  const external = isExternalUri(to);
+  const newWindow = external && !!/^https?:/.exec(to);
+  return external ? (
     // External links
     <MaterialLink
       ref={ref}
       href={to}
-      {...{ target: '_blank', rel: 'noopener' }}
+      {...(newWindow ? { target: '_blank', rel: 'noopener' } : {})}
       {...props}
     />
   ) : (

From 6494c09b0914255179fcf2872cf9ba11d0bb3558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 1 Jul 2021 16:56:37 +0200
Subject: [PATCH 6/6] manually patch snapshot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/git-release-manager/src/features/Features.test.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git-release-manager/src/features/Features.test.tsx b/plugins/git-release-manager/src/features/Features.test.tsx
index ac3004f690..b5404a21d9 100644
--- a/plugins/git-release-manager/src/features/Features.test.tsx
+++ b/plugins/git-release-manager/src/features/Features.test.tsx
@@ -69,6 +69,7 @@ describe('Features', () => {
           <a
             class="MuiTypography-root MuiLink-root MuiLink-underlineHover MuiTypography-colorPrimary"
             href="https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository"
+            rel="noopener"
             target="_blank"
             to="https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository"
           >