Check if baseUrl is missing, update storyshots

This commit is contained in:
Florian Scholdei
2020-07-28 12:36:21 +02:00
parent 858699a3b0
commit d462addbf1
4 changed files with 22 additions and 14 deletions

View File

@@ -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"
/>
));

View File

@@ -31,6 +31,7 @@ type Props = WithTranslation &
DiffObjectProps & {
diff: File[];
changesetId?: string;
baseUrl?: string;
};
class Diff extends React.Component<Props> {

View File

@@ -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")}>