mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-11 16:05:44 +01:00
redirect missing branch to default branch if available on sourcesView
This commit is contained in:
@@ -4,7 +4,12 @@ import {connect} from "react-redux";
|
||||
import { withRouter } from "react-router-dom";
|
||||
import type { Branch, Repository } from "@scm-manager/ui-types";
|
||||
import FileTree from "../components/FileTree";
|
||||
import {BranchSelector, Breadcrumb, ErrorNotification, Loading} from "@scm-manager/ui-components";
|
||||
import {
|
||||
BranchSelector,
|
||||
Breadcrumb,
|
||||
ErrorNotification,
|
||||
Loading
|
||||
} from "@scm-manager/ui-components";
|
||||
import { translate } from "react-i18next";
|
||||
import {
|
||||
fetchBranches,
|
||||
@@ -33,6 +38,7 @@ type Props = {
|
||||
// Context props
|
||||
history: any,
|
||||
match: any,
|
||||
location: any,
|
||||
t: string => string
|
||||
};
|
||||
|
||||
@@ -55,17 +61,48 @@ class Sources extends React.Component<Props, State> {
|
||||
repository,
|
||||
revision,
|
||||
path,
|
||||
branches,
|
||||
baseUrl,
|
||||
fetchSources
|
||||
} = this.props;
|
||||
|
||||
fetchBranches(repository);
|
||||
fetchSources(repository, revision, path);
|
||||
|
||||
if (branches) {
|
||||
const defaultBranches = branches.filter(b => b.defaultBranch);
|
||||
|
||||
if (defaultBranches.length > 0)
|
||||
this.setState({ selectedBranch: defaultBranches[0] });
|
||||
this.props.history.push(`${baseUrl}/${defaultBranches[0].name}/`);
|
||||
}
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
const { fetchSources, repository, revision, path } = this.props;
|
||||
const {
|
||||
fetchSources,
|
||||
repository,
|
||||
revision,
|
||||
path,
|
||||
branches,
|
||||
baseUrl
|
||||
} = this.props;
|
||||
if (prevProps.revision !== revision || prevProps.path !== path) {
|
||||
fetchSources(repository, revision, path);
|
||||
}
|
||||
|
||||
const currentUrl = this.props.location.pathname;
|
||||
|
||||
if (
|
||||
branches &&
|
||||
(currentUrl.endsWith("sources") || currentUrl.endsWith("sources/"))
|
||||
) {
|
||||
const defaultBranches = branches.filter(b => b.defaultBranch);
|
||||
|
||||
if (defaultBranches.length > 0)
|
||||
this.setState({ selectedBranch: defaultBranches[0] });
|
||||
this.props.history.push(`${baseUrl}/${defaultBranches[0].name}/`);
|
||||
}
|
||||
}
|
||||
|
||||
branchSelected = (branch?: Branch) => {
|
||||
|
||||
Reference in New Issue
Block a user