From 2847cd82346a1bf5fca77c870a52064cc1fed069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Fri, 17 Dec 2021 10:13:02 +0100
Subject: [PATCH] some final cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/thick-deers-trade.md                        |  2 +-
 .../DismissableBanner/DismissableBanner.stories.tsx    |  2 ++
 .../core-components/src/layout/ErrorPage/ErrorPage.tsx |  9 +++------
 plugins/catalog/src/components/Router.tsx              |  4 +---
 .../src/components/BuildsPage/lib/CITable/CITable.tsx  |  6 ++----
 plugins/cloudbuild/src/components/Cards/Cards.tsx      |  2 +-
 plugins/github-actions/src/components/Cards/Cards.tsx  |  2 +-
 .../src/components/ClusterTable/ClusterTable.tsx       |  2 +-
 .../src/components/BuildsPage/lib/CITable/CITable.tsx  | 10 ++++------
 plugins/jenkins/src/components/Cards/Cards.test.tsx    |  2 +-
 plugins/jenkins/src/components/Cards/Cards.tsx         |  2 +-
 11 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/.changeset/thick-deers-trade.md b/.changeset/thick-deers-trade.md
index 8117b0eeab..9b023d709a 100644
--- a/.changeset/thick-deers-trade.md
+++ b/.changeset/thick-deers-trade.md
@@ -14,4 +14,4 @@
 '@backstage/plugin-sonarqube': patch
 ---
 
-Fixed Link component import and usage. Now using backstage verion of Link
+Prefer using `Link` from `@backstage/core-components` rather than material-UI.
diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx
index b08549539b..449d4a987b 100644
--- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx
+++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.stories.tsx
@@ -94,6 +94,7 @@ export const WithLink = () => (
     </TestApiProvider>
   </div>
 );
+
 export const Fixed = () => (
   <div style={containerStyle}>
     <TestApiProvider apis={apis}>
@@ -106,6 +107,7 @@ export const Fixed = () => (
     </TestApiProvider>
   </div>
 );
+
 export const Warning = () => (
   <div style={containerStyle}>
     <TestApiProvider apis={apis}>
diff --git a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
index db747e3808..991c419dc3 100644
--- a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
+++ b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
@@ -80,14 +80,11 @@ export function ErrorPage(props: IErrorPageProps) {
           Looks like someone dropped the mic!
         </Typography>
         <Typography variant="h6">
-          <Link to=".." data-testid="go-back-link">
+          <Link to="#" data-testid="go-back-link" onClick={() => navigate(-1)}>
             Go back
           </Link>
-          ... or please{' '}
-          <Link to={support.url} rel="noopener noreferrer">
-            contact support
-          </Link>{' '}
-          if you think this is a bug.
+          ... or please <Link to={support.url}>contact support</Link> if you
+          think this is a bug.
         </Typography>
       </Grid>
     </Grid>
diff --git a/plugins/catalog/src/components/Router.tsx b/plugins/catalog/src/components/Router.tsx
index fc70297b70..e8b00d8513 100644
--- a/plugins/catalog/src/components/Router.tsx
+++ b/plugins/catalog/src/components/Router.tsx
@@ -38,9 +38,7 @@ const DefaultEntityPage = () => (
           <Typography variant="body1">
             To override this component with your custom implementation, read
             docs on{' '}
-            <Link target="_blank" to="https://backstage.io/docs">
-              backstage.io/docs
-            </Link>
+            <Link to="https://backstage.io/docs">backstage.io/docs</Link>
           </Typography>
         </Content>
       }
diff --git a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
index caf54a4fe4..adc8a569bb 100644
--- a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -121,9 +121,7 @@ const SourceInfo = ({ build }: { build: CITableBuildInfo }) => {
         <Typography variant="button">{source?.branchName}</Typography>
         <Typography variant="body1">
           {source?.commit?.url !== undefined ? (
-            <Link to={source?.commit?.url} target="_blank">
-              {source?.commit.shortHash}
-            </Link>
+            <Link to={source?.commit?.url}>{source?.commit.shortHash}</Link>
           ) : (
             source?.commit.shortHash
           )}
@@ -169,7 +167,7 @@ const generatedColumns: TableColumn[] = [
     field: 'buildName',
     highlight: true,
     render: (row: Partial<CITableBuildInfo>) => (
-      <Link to={row?.buildUrl!} target="_blank">
+      <Link to={row?.buildUrl ?? ''}>
         <Box display="flex" alignItems="center">
           <LaunchIcon fontSize="small" color="disabled" />
           <Box mr={1} />
diff --git a/plugins/cloudbuild/src/components/Cards/Cards.tsx b/plugins/cloudbuild/src/components/Cards/Cards.tsx
index b016518b1c..dad1f7d38f 100644
--- a/plugins/cloudbuild/src/components/Cards/Cards.tsx
+++ b/plugins/cloudbuild/src/components/Cards/Cards.tsx
@@ -63,7 +63,7 @@ const WidgetContent = ({
         ),
         message: lastRun.message,
         url: (
-          <Link to={lastRun.googleUrl ?? ''} target="_blank">
+          <Link to={lastRun.googleUrl ?? ''}>
             See more on Google{' '}
             <ExternalLinkIcon className={classes.externalLinkIcon} />
           </Link>
diff --git a/plugins/github-actions/src/components/Cards/Cards.tsx b/plugins/github-actions/src/components/Cards/Cards.tsx
index 0cb5d1e089..cb4b2190fc 100644
--- a/plugins/github-actions/src/components/Cards/Cards.tsx
+++ b/plugins/github-actions/src/components/Cards/Cards.tsx
@@ -71,7 +71,7 @@ const WidgetContent = ({
         ),
         message: lastRun.message,
         url: (
-          <Link to={lastRun.githubUrl ?? ''} target="_blank">
+          <Link to={lastRun.githubUrl ?? ''}>
             See more on GitHub{' '}
             <ExternalLinkIcon className={classes.externalLinkIcon} />
           </Link>
diff --git a/plugins/gitops-profiles/src/components/ClusterTable/ClusterTable.tsx b/plugins/gitops-profiles/src/components/ClusterTable/ClusterTable.tsx
index 3230f8500c..9ac93a6d6c 100644
--- a/plugins/gitops-profiles/src/components/ClusterTable/ClusterTable.tsx
+++ b/plugins/gitops-profiles/src/components/ClusterTable/ClusterTable.tsx
@@ -24,7 +24,7 @@ const columns: TableColumn[] = [
     field: 'name',
     highlight: true,
     render: (componentData: any) => (
-      <Link to={`/gitops-cluster/${componentData.name}`}>
+      <Link to={`/gitops-cluster/${encodeURIComponent(componentData.name)}`}>
         {componentData.name}
       </Link>
     ),
diff --git a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
index a7a0686593..2c464491c2 100644
--- a/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
+++ b/plugins/jenkins/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Progress, Table, TableColumn } from '@backstage/core-components';
+import { Link, Progress, Table, TableColumn } from '@backstage/core-components';
 import { alertApiRef, useApi, useRouteRef } from '@backstage/core-plugin-api';
-import { Box, IconButton, Link, Tooltip, Typography } from '@material-ui/core';
+import { Box, IconButton, Tooltip, Typography } from '@material-ui/core';
 import RetryIcon from '@material-ui/icons/Replay';
 import { default as React, useState } from 'react';
-import { Link as RouterLink } from 'react-router-dom';
 import { Project } from '../../../../api/JenkinsApi';
 import JenkinsLogo from '../../../../assets/JenkinsLogo.svg';
 import { buildRouteRef } from '../../../../plugin';
@@ -107,7 +106,6 @@ const generatedColumns: TableColumn[] = [
 
         return (
           <Link
-            component={RouterLink}
             to={routeLink({
               jobFullName: encodeURIComponent(row.fullName),
               buildNumber: String(row.lastBuild?.number),
@@ -127,7 +125,7 @@ const generatedColumns: TableColumn[] = [
     render: (row: Partial<Project>) => (
       <>
         <p>
-          <Link to={row.lastBuild?.source?.url || ''} target="_blank">
+          <Link to={row.lastBuild?.source?.url ?? ''}>
             {row.lastBuild?.source?.branchName}
           </Link>
         </p>
@@ -154,7 +152,7 @@ const generatedColumns: TableColumn[] = [
         <>
           <p>
             {row.lastBuild?.tests && (
-              <Link to={row.lastBuild?.tests.testUrl || ''} target="_blank">
+              <Link to={row.lastBuild?.tests.testUrl ?? ''}>
                 {row.lastBuild?.tests.passed} / {row.lastBuild?.tests.total}{' '}
                 passed
                 <FailSkippedWidget
diff --git a/plugins/jenkins/src/components/Cards/Cards.test.tsx b/plugins/jenkins/src/components/Cards/Cards.test.tsx
index 0af91da179..97b920e666 100644
--- a/plugins/jenkins/src/components/Cards/Cards.test.tsx
+++ b/plugins/jenkins/src/components/Cards/Cards.test.tsx
@@ -35,7 +35,7 @@ describe('<LatestRunCard />', () => {
   const jenkinsApi: Partial<JenkinsApi> = {
     getProjects: () =>
       Promise.resolve([
-        { lastBuild: { timestamp: 0, status: 'success' } },
+        { lastBuild: { timestamp: 0, status: 'success', url: 'foo' } },
       ] as Project[]),
   };
 
diff --git a/plugins/jenkins/src/components/Cards/Cards.tsx b/plugins/jenkins/src/components/Cards/Cards.tsx
index 158be5a8e0..cb84964124 100644
--- a/plugins/jenkins/src/components/Cards/Cards.tsx
+++ b/plugins/jenkins/src/components/Cards/Cards.tsx
@@ -67,7 +67,7 @@ const WidgetContent = ({
         'latest run': displayDate,
         duration: displayDuration,
         link: (
-          <Link to={latestRun.lastBuild.url} target="_blank">
+          <Link to={latestRun.lastBuild.url}>
             See more on Jenkins{' '}
             <ExternalLinkIcon className={classes.externalLinkIcon} />
           </Link>