Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-26 01:09:10 +01:00
Code Issues Packages Projects Releases Activity

merged

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-09-19 11:23:33 +02:00
parent 1e5c5d907a cdfecca1f5
commit ba89eff0e9
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-ui/src/repos/containers/ChangesetsRoot.js
View File

@@ -43,8 +43,29 @@ type Props = {
class ChangesetsRoot extends React.Component<Props> {
componentDidMount() {
this.props.fetchBranches(this.props.repository);
this.redirectToDefaultBranch();
}
redirectToDefaultBranch = () => {
if (this.shouldRedirectToDefaultBranch()) {
const defaultBranches = this.props.branches.filter(
b => b.defaultBranch === true
);
if (defaultBranches.length > 0) {
this.branchSelected(defaultBranches[0]);
}
}
};
shouldRedirectToDefaultBranch = () => {
return (
this.props.branches &&
this.props.branches.length > 0 &&
this.props.selected !==
this.props.branches.filter(b => b.defaultBranch === true)[0]
);
};
stripEndingSlash = (url: string) => {
if (url.endsWith("/")) {
return url.substring(0, url.length - 1);

11
scm-ui/src/repos/sources/containers/Sources.js
View File

@@ -80,20 +80,17 @@ class Sources extends React.Component<Props, State> {
}
redirectToDefaultBranch = () => {
const { branches, baseUrl } = this.props;
if (this.shouldRedirect()) {
const { branches } = this.props;
if (this.shouldRedirectToDefaultBranch()) {
const defaultBranches = branches.filter(b => b.defaultBranch);
if (defaultBranches.length > 0) {
this.props.history.push(
`${baseUrl}/${encodeURIComponent(defaultBranches[0].name)}/`
);
this.setState({ selectedBranch: defaultBranches[0] });
this.branchSelected(defaultBranches[0]);
}
}
};
shouldRedirect = () => {
shouldRedirectToDefaultBranch = () => {
const { branches, revision } = this.props;
return branches && !revision;
};