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

Merge with 2.0.0-m3

Browse Source
This commit is contained in:
Florian Scholdei
2019-10-10 10:59:04 +02:00
parent a91295de14 36d89af286
commit 2a3e5e4ded
94 changed files with 2176 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-ui/ui-components/src/repos/Diff.js
View File

@@ -4,7 +4,8 @@ import DiffFile from "./DiffFile";
import type {DiffObjectProps, File} from "./DiffTypes";
type Props = DiffObjectProps & {
diff: File[]
diff: File[],
defaultCollapse?: boolean
};
class Diff extends React.Component<Props> {
@@ -17,7 +18,7 @@ class Diff extends React.Component<Props> {
return (
<>
{diff.map((file, index) => (
<DiffFile key={index} file={file} {...fileProps} />
<DiffFile key={index} file={file} {...fileProps} {...this.props} />
))}
</>
);

3
scm-ui/ui-components/src/repos/LoadingDiff.js
View File

@@ -9,7 +9,8 @@ import Diff from "./Diff";
import type {DiffObjectProps, File} from "./DiffTypes";
type Props = DiffObjectProps & {
url: string
url: string,
defaultCollapse?: boolean
};
type State = {

5
scm-ui/ui-components/src/repos/changesets/ChangesetDiff.js
View File

@@ -7,6 +7,7 @@ import {translate} from "react-i18next";
type Props = {
changeset: Changeset,
defaultCollapse?: boolean,
// context props
t: string => string
@@ -23,12 +24,12 @@ class ChangesetDiff extends React.Component<Props> {
}
render() {
const { changeset, t } = this.props;
const { changeset, defaultCollapse, t } = this.props;
if (!this.isDiffSupported(changeset)) {
return <Notification type="danger">{t("changeset.diffNotSupported")}</Notification>;
} else {
const url = this.createUrl(changeset);
return <LoadingDiff url={url} />;
return <LoadingDiff url={url} defaultCollapse={defaultCollapse} />;
}
}