Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 00:45:44 +01:00
Code Issues Packages Projects Releases Activity

Check if baseUrl is missing, update storyshots

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
View File

@@ -38383,7 +38383,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" 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]} onClick={[Function]}
> >
<i <i
@@ -39002,7 +39002,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" 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]} onClick={[Function]}
> >
<i <i
@@ -39958,7 +39958,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" 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]} onClick={[Function]}
> >
<i <i
@@ -40485,7 +40485,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" 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]} onClick={[Function]}
> >
<i <i
@@ -41012,7 +41012,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" 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]} onClick={[Function]}
> >
<i <i
@@ -42229,7 +42229,7 @@ exports[`Storyshots Diff WithLinkToFile 1`] = `
<a <a
aria-label="diff.jumpToFile" aria-label="diff.jumpToFile"
className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button" className="JumpToFileButton__Button-sc-72e4b2-0 iuoeHJ button"
href="/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/Main.java/" href="/repo/hitchhiker/heartOfGold/code/sources/0b92307029a2a171e3b467a1502f392c733e3e8f/Main.java/"
onClick={[Function]} onClick={[Function]}
> >
<i <i

8
scm-ui/ui-components/src/repos/Diff.stories.tsx
View File

@@ -126,4 +126,10 @@ storiesOf("Diff", module)
}); });
return <Diff diff={filesWithLanguage} />; return <Diff diff={filesWithLanguage} />;
}) })
.add("WithLinkToFile", () => <Diff diff={diffFiles} changesetId="0b92307029a2a171e3b467a1502f392c733e3e8f" />); .add("WithLinkToFile", () => (
<Diff
diff={diffFiles}
changesetId="0b92307029a2a171e3b467a1502f392c733e3e8f"
baseUrl="/repo/hitchhiker/heartOfGold/code/changeset"
/>
));

1
scm-ui/ui-components/src/repos/Diff.tsx
View File

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

15
scm-ui/ui-components/src/repos/DiffFile.tsx
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 collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit" /> : null;
const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null; const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
const jumpToFile = changesetId ? ( const jumpToFile =
<JumpToFileButton changesetId && baseUrl ? (
link={`${baseUrl.substr(0, baseUrl.lastIndexOf("/"))}/sources/${changesetId}/${ <JumpToFileButton
file.type !== "delete" ? file.newPath : file.oldPath.substr(0, file.oldPath.lastIndexOf("/")) link={`${baseUrl.substr(0, baseUrl.lastIndexOf("/"))}/sources/${changesetId}/${
}/`} file.type !== "delete" ? file.newPath : file.oldPath.substr(0, file.oldPath.lastIndexOf("/"))
/> }/`}
) : null; />
) : null;
const sideBySideToggle = const sideBySideToggle =
file.hunks && file.hunks.length > 0 ? ( file.hunks && file.hunks.length > 0 ? (
<ButtonWrapper className={classNames("level-right", "is-flex")}> <ButtonWrapper className={classNames("level-right", "is-flex")}>