Moved DiffView into ChangesetDetails

This commit is contained in:
Philipp Czora
2018-10-19 10:22:21 +02:00
parent bcd6d708c8
commit db7e3b0d2e
3 changed files with 7 additions and 46 deletions

View File

@@ -19,7 +19,6 @@ import EditNavLink from "../components/EditNavLink";
import BranchRoot from "./BranchRoot";
import ChangesetView from "./ChangesetView";
import PermissionsNavLink from "../components/PermissionsNavLink";
import ScmDiff from "./ScmDiff";
type Props = {
namespace: string,
@@ -64,11 +63,6 @@ class RepositoryRoot extends React.Component<Props> {
this.props.deleteRepo(repository, this.deleted);
};
matchChangeset = (route: any) => {
const url = this.matchedUrl();
return route.location.pathname.match(`${url}/changeset/`);
};
matches = (route: any) => {
const url = this.matchedUrl();
const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
@@ -141,16 +135,6 @@ class RepositoryRoot extends React.Component<Props> {
/>
)}
/>
<Route
path={`${url}/diff`}
component={() => (
<ScmDiff
repository={repository}
revision={"a801749dc445d9d71e3fe4c50241433a2adfba6a"} // TODO: this is hardcoded only for dev purposes.
sideBySide={false}
/>
)}
/>
</Switch>
</div>
<div className="column">
@@ -173,9 +157,6 @@ class RepositoryRoot extends React.Component<Props> {
<DeleteNavAction repository={repository} delete={this.delete} />
<NavLink to="/repos" label={t("repository-root.back-label")} />
</Section>
<Section label="Diff">
<NavLink to={`${url}/diff`} label="Diff" />
</Section>
</Navigation>
</div>
</div>