From cb16f9ebfc61caaa65d5c3d3f3fdfe81977c1b97 Mon Sep 17 00:00:00 2001
From: Marek Calus <marek-calus@wp.pl>
Date: Mon, 23 Nov 2020 19:34:15 +0100
Subject: [PATCH] Code review fixes

---
 packages/app/src/App.tsx                      |  2 +-
 .../src/components/ComponentConfigDisplay.tsx | 32 ++++++++++++++++---
 .../src/components/ImportFinished.tsx         |  7 +++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index c02d83841f..28aebeeb79 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -69,7 +69,7 @@ const AppRoutes = () => (
   <Routes>
     <Navigate key="/" to="/catalog" />
     <Route
-      path="/catalog-import"
+      path="/catalog-import/*"
       element={<ImportComponentRouter catalogRouteRef={catalogRouteRef} />}
     />
     <Route
diff --git a/plugins/catalog-import/src/components/ComponentConfigDisplay.tsx b/plugins/catalog-import/src/components/ComponentConfigDisplay.tsx
index 5cb1f42936..f3dda35003 100644
--- a/plugins/catalog-import/src/components/ComponentConfigDisplay.tsx
+++ b/plugins/catalog-import/src/components/ComponentConfigDisplay.tsx
@@ -62,7 +62,7 @@ const getEntityCatalogPath = ({
 };
 
 type Props = {
-  nextStep: () => void;
+  nextStep: (options?: { reset: boolean }) => void;
   configFile: ConfigSpec;
   savePRLink: (PRLink: string) => void;
   catalogRouteRef: RouteRef;
@@ -74,6 +74,7 @@ const ComponentConfigDisplay = ({
   savePRLink,
   catalogRouteRef,
 }: Props) => {
+  const [errorOccured, setErrorOccured] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const errorApi = useApi(errorApiRef);
   const { submitPrToRepo, addLocation } = useGithubRepos();
@@ -91,6 +92,7 @@ const ComponentConfigDisplay = ({
         nextStep();
       }
     } catch (e) {
+      setErrorOccured(true);
       setSubmitting(false);
       errorApi.post(e);
     }
@@ -102,13 +104,25 @@ const ComponentConfigDisplay = ({
         <Typography>
           Following config object will be submitted in a pull request to the
           repository{' '}
-          <Link href={configFile.location}>{configFile.location}</Link> and
-          added as a new location to the backend
+          <Link
+            href={configFile.location}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {configFile.location}
+          </Link>{' '}
+          and added as a new location to the backend
         </Typography>
       ) : (
         <Typography>
           Following config object will be added as a new location to the backend{' '}
-          <Link href={configFile.location}>{configFile.location}</Link>
+          <Link
+            href={configFile.location}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            {configFile.location}
+          </Link>
         </Typography>
       )}
 
@@ -164,6 +178,16 @@ const ComponentConfigDisplay = ({
           >
             Next
           </Button>
+          {errorOccured ? (
+            <Button
+              style={{ marginLeft: '8px' }}
+              variant="outlined"
+              color="primary"
+              onClick={() => nextStep({ reset: true })}
+            >
+              Start again
+            </Button>
+          ) : null}
         </Grid>
       </Grid>
     </Grid>
diff --git a/plugins/catalog-import/src/components/ImportFinished.tsx b/plugins/catalog-import/src/components/ImportFinished.tsx
index 9a06de234b..caba678999 100644
--- a/plugins/catalog-import/src/components/ImportFinished.tsx
+++ b/plugins/catalog-import/src/components/ImportFinished.tsx
@@ -36,7 +36,12 @@ export const ImportFinished = ({ nextStep, PRLink, type }: Props) => {
       </Grid>
       <Grid item>
         {type === 'repo' ? (
-          <Link href={PRLink} style={{ marginRight: '8px' }}>
+          <Link
+            href={PRLink}
+            style={{ marginRight: '8px' }}
+            target="_blank"
+            rel="noopener noreferrer"
+          >
             View pull request on GitHub
           </Link>
         ) : null}