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

page numbers for Changesets are now present in the URL

Browse Source
This commit is contained in:
Philipp Czora
2018-09-20 16:28:41 +02:00
parent 11c1497ace
commit 8fefe5ff74
4 changed files with 112 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,9 +7,9 @@ import {
getRepository,
isFetchRepoPending
} from "../modules/repos";
import {connect} from "react-redux";
import {Route} 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";
import {
Page,
Loading,
@@ -18,12 +18,12 @@ 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";
import Changesets from "./Changesets";
@@ -46,7 +46,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 +71,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 +84,7 @@ class RepositoryRoot extends React.Component<Props> {
}
if (!repository || loading) {
return <Loading/>;
return <Loading />;
}
const url = this.matchedUrl();
@@ -96,33 +96,47 @@ 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}/>}
component={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/history/:branch`}
component={() => <Changesets repository={repository}/>}
path={`${url}/history/:page`}
component={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/:branch/history`}
component={() => <Changesets repository={repository} />}
/>
<Route
exact
path={`${url}/:branch/history/:page`}
component={() => <Changesets repository={repository} />}
/>
</div>
<div className="column">
<Navigation>
<Section label={t("repository-root.navigation-label")}>
<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`}/>
<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>
@@ -133,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);