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

redirect missing branch to default branch if available on sourcesView

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-09-04 10:17:57 +02:00
parent 46781bd465
commit 7f2c7ffda7
1 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +1,25 @@
// @flow
import React from "react";
import {connect} from "react-redux";
import {withRouter} from "react-router-dom";
import type {Branch, Repository} from "@scm-manager/ui-types";
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 {translate} from "react-i18next";
import {
BranchSelector,
Breadcrumb,
ErrorNotification,
Loading
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import {
fetchBranches,
getBranches,
getFetchBranchesFailure,
isFetchBranchesPending
} from "../../branches/modules/branches";
import {compose} from "redux";
import { compose } from "redux";
import Content from "./Content";
import {fetchSources, isDirectory} from "../modules/sources";
import { fetchSources, isDirectory } from "../modules/sources";
type Props = {
repository: Repository,
@@ -33,6 +38,7 @@ type Props = {
// Context props
history: any,
match: any,
location: any,
t: string => string
};
@@ -55,31 +61,62 @@ 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) => {
const { baseUrl, history, path } = this.props;
let url;
if (branch) {
this.setState({selectedBranch: branch});
this.setState({ selectedBranch: branch });
if (path) {
url = `${baseUrl}/${encodeURIComponent(branch.name)}/${path}`;
} else {
url = `${baseUrl}/${encodeURIComponent(branch.name)}/`;
}
} else {
this.setState({selectedBranch: null});
this.setState({ selectedBranch: null });
url = `${baseUrl}/`;
}
history.push(url);
@@ -97,7 +134,7 @@ class Sources extends React.Component<Props, State> {
currentFileIsDirectory
} = this.props;
const {selectedBranch} = this.state;
const { selectedBranch } = this.state;
if (error) {
return <ErrorNotification error={error} />;