From d462addbf1cdb9bac29ae7d9de087b72c632878e Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Tue, 28 Jul 2020 12:36:21 +0200
Subject: [PATCH] Check if baseUrl is missing, update storyshots

---
 .../src/__snapshots__/storyshots.test.ts.snap     | 12 ++++++------
 scm-ui/ui-components/src/repos/Diff.stories.tsx   |  8 +++++++-
 scm-ui/ui-components/src/repos/Diff.tsx           |  1 +
 scm-ui/ui-components/src/repos/DiffFile.tsx       | 15 ++++++++-------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index e1e29e4537..f1a2e7fce8 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -38383,7 +38383,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/java/com/cloudogu/scm/review/events/EventListener.java/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/java/com/cloudogu/scm/review/events/EventListener.java/"
                   onClick={[Function]}
                 >
                   <i
@@ -39002,7 +39002,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/js/ChangeNotification.tsx/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/js/ChangeNotification.tsx/"
                   onClick={[Function]}
                 >
                   <i
@@ -39958,7 +39958,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/resources/locales/de/plugins.json/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/resources/locales/de/plugins.json/"
                   onClick={[Function]}
                 >
                   <i
@@ -40485,7 +40485,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/resources/locales/en/plugins.json/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/main/resources/locales/en/plugins.json/"
                   onClick={[Function]}
                 >
                   <i
@@ -41012,7 +41012,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/test/java/com/cloudogu/scm/review/events/ClientTest.java/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/src/test/java/com/cloudogu/scm/review/events/ClientTest.java/"
                   onClick={[Function]}
                 >
                   <i
@@ -42229,7 +42229,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
                 <a
                   aria-label="diff.jumpToFile"
                   className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
-                  href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/Main.java/"
+                  href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/Main.java/"
                   onClick={[Function]}
                 >
                   <i
diff --git a/scm-ui/ui-components/src/repos/Diff.stories.tsx b/scm-ui/ui-components/src/repos/Diff.stories.tsx
index f9fc019d9e..e221d5ccd8 100644
--- a/scm-ui/ui-components/src/repos/Diff.stories.tsx
+++ b/scm-ui/ui-components/src/repos/Diff.stories.tsx
@@ -126,4 +126,10 @@ storiesOf("Diff", module)
     });
     return <Diff diff={filesWithLanguage} />;
   })
-  .add("WithLinkToFile", () => <Diff diff={diffFiles} changesetId="0b92307029a2a171e3b467a1502f392c733e3e8f" />);
+  .add("WithLinkToFile", () => (
+    <Diff
+      diff={diffFiles}
+      changesetId="0b92307029a2a171e3b467a1502f392c733e3e8f"
+      baseUrl="/repo/hitchhiker/heartOfGold/code/changeset"
+    />
+  ));
diff --git a/scm-ui/ui-components/src/repos/Diff.tsx b/scm-ui/ui-components/src/repos/Diff.tsx
index 46913c6f4f..f666174476 100644
--- a/scm-ui/ui-components/src/repos/Diff.tsx
+++ b/scm-ui/ui-components/src/repos/Diff.tsx
@@ -31,6 +31,7 @@ type Props = WithTranslation &
   DiffObjectProps & {
     diff: File[];
     changesetId?: string;
+    baseUrl?: string;
   };
 
 class Diff extends React.Component<Props> {
diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx
index 261f200f2b..457541d5e9 100644
--- a/scm-ui/ui-components/src/repos/DiffFile.tsx
+++ b/scm-ui/ui-components/src/repos/DiffFile.tsx
@@ -417,13 +417,14 @@ class DiffFile extends React.Component<Props, State> {
     }
     const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit" /> : null;
     const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
-    const jumpToFile = changesetId ? (
-      <JumpToFileButton
-        link={`${baseUrl.substr(0, baseUrl.lastIndexOf("/"))}/sources/${changesetId}/${
-          file.type !== "delete" ? file.newPath : file.oldPath.substr(0, file.oldPath.lastIndexOf("/"))
-        }/`}
-      />
-    ) : null;
+    const jumpToFile =
+      changesetId && baseUrl ? (
+        <JumpToFileButton
+          link={`${baseUrl.substr(0, baseUrl.lastIndexOf("/"))}/sources/${changesetId}/${
+            file.type !== "delete" ? file.newPath : file.oldPath.substr(0, file.oldPath.lastIndexOf("/"))
+          }/`}
+        />
+      ) : null;
     const sideBySideToggle =
       file.hunks && file.hunks.length > 0 ? (
         <ButtonWrapper className={classNames("level-right", "is-flex")}>