Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-30 18:15:52 +01:00
Code Issues Packages Projects Releases Activity

merge changeset view

Browse Source
This commit is contained in:
Maren Süwer
2018-09-18 11:32:10 +02:00
parent e24c3e14a3 a34dad585e
commit 7759d91ed2
16 changed files with 883 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -7,9 +7,15 @@ import {
getRepository,
isFetchRepoPending
} from "../modules/repos";
<<<<<<< working copy
import { connect } from "react-redux";
import { Route, Switch } from "react-router-dom";
import type { Repository } from "@scm-manager/ui-types";
=======
import {connect} from "react-redux";
import {Route} from "react-router-dom";
import type {Repository} from "@scm-manager/ui-types";
>>>>>>> merge rev
import {
Page,
Loading,
@@ -18,14 +24,18 @@ import {
NavLink,
Section
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import {translate} from "react-i18next";
import RepositoryDetails from "../components/RepositoryDetails";
import DeleteNavAction from "../components/DeleteNavAction";
import Edit from "../containers/Edit";
import type { History } from "history";
import type {History} from "history";
import EditNavLink from "../components/EditNavLink";
<<<<<<< working copy
import ChangesetView from "../changesets/containers/ChangesetView";
=======
import Changesets from "../../changesets/containers/Changesets";
>>>>>>> merge rev
type Props = {
namespace: string,
@@ -46,7 +56,7 @@ type Props = {
class RepositoryRoot extends React.Component<Props> {
componentDidMount() {
const { fetchRepo, namespace, name } = this.props;
const {fetchRepo, namespace, name} = this.props;
fetchRepo(namespace, name);
}
@@ -71,7 +81,7 @@ class RepositoryRoot extends React.Component<Props> {
};
render() {
const { loading, error, repository, t } = this.props;
const {loading, error, repository, t} = this.props;
if (error) {
return (
@@ -84,7 +94,7 @@ class RepositoryRoot extends React.Component<Props> {
}
if (!repository || loading) {
return <Loading />;
return <Loading/>;
}
const url = this.matchedUrl();
@@ -96,11 +106,21 @@ class RepositoryRoot extends React.Component<Props> {
<Route
path={url}
exact
component={() => <RepositoryDetails repository={repository} />}
component={() => <RepositoryDetails repository={repository}/>}
/>
<Route
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
component={() => <Edit repository={repository}/>}
/>
<Route
exact
path={`${url}/history`}
component={() => <Changesets repository={repository}/>}
/>
<Route
exact
path={`${url}/history/:branch`}
component={() => <Changesets repository={repository}/>}
/>
<Route
path={`${url}/changesets`}
@@ -110,12 +130,13 @@ class RepositoryRoot extends React.Component<Props> {
<div className="column">
<Navigation>
<Section label={t("repository-root.navigation-label")}>
<NavLink to={url} label={t("repository-root.information")} />
<EditNavLink repository={repository} editUrl={`${url}/edit`} />
<NavLink to={url} label={t("repository-root.information")}/>
<NavLink activeOnlyWhenExact={false} to={`${url}/history`} label={t("repository-root.history")}/>
<EditNavLink repository={repository} editUrl={`${url}/edit`}/>
</Section>
<Section label={t("repository-root.actions-label")}>
<DeleteNavAction repository={repository} delete={this.delete} />
<NavLink to="/repos" label={t("repository-root.back-label")} />
<DeleteNavAction repository={repository} delete={this.delete}/>
<NavLink to="/repos" label={t("repository-root.back-label")}/>
</Section>
</Navigation>
</div>
@@ -126,7 +147,7 @@ class RepositoryRoot extends React.Component<Props> {
}
const mapStateToProps = (state, ownProps) => {
const { namespace, name } = ownProps.match.params;
const {namespace, name} = ownProps.match.params;
const repository = getRepository(state, namespace, name);
const loading = isFetchRepoPending(state, namespace, name);
const error = getFetchRepoFailure(state, namespace, name);