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

refactor code section

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-01-14 18:07:57 +01:00
parent e0e2ccec02
commit 0888006a74
5 changed files with 208 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
scm-ui/ui-webapp/src/repos/codeSection/containers/CodeOverview.tsx
View File

@@ -1,11 +1,9 @@
import React from "react";
import styled from "styled-components";
import { Route, RouteComponentProps, withRouter } from "react-router-dom";
import Sources from "../../sources/containers/Sources";
import ChangesetsRoot from "../../containers/ChangesetsRoot";
import { Branch, Repository } from "@scm-manager/ui-types";
import { BranchSelector, ErrorPage, Level, Loading } from "@scm-manager/ui-components";
import CodeViewSwitcher from "../components/CodeViewSwitcher";
import { ErrorPage, Loading } from "@scm-manager/ui-components";
import { compose } from "redux";
import { WithTranslation, withTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -31,56 +29,12 @@ type Props = RouteComponentProps &
fetchBranches: (p: Repository) => void;
};
const CodeActionBar = styled.div.attrs(() => ({}))`
background-color: whitesmoke;
border: 1px solid #dbdbdb;
border-radius: 4px;
color: #363636;
font-size: 1.25em;
font-weight: 300;
line-height: 1.25;
padding: 0.5em 0.75em;
margin-bottom: 1em;
`;
class CodeOverview extends React.Component<Props> {
componentDidMount() {
const { repository, branches } = this.props;
new Promise(() => {
this.props.fetchBranches(repository);
}).then(() => {
if (this.props.branches?.length > 0) {
const defaultBranch = branches.filter((branch: Branch) => branch.defaultBranch === true)[0];
this.branchSelected(defaultBranch);
}
});
const { repository } = this.props;
this.props.fetchBranches(repository);
}
findSelectedBranch = () => {
const { selectedBranch, branches } = this.props;
return branches?.find((branch: Branch) => branch.name === selectedBranch);
};
branchSelected = (branch?: Branch) => {
let splittedUrl = this.props.location.pathname.split("/");
if (
this.props.location.pathname.includes("/code/sources") ||
this.props.location.pathname.includes("/code/branch")
) {
if (branch) {
splittedUrl[6] = encodeURIComponent(branch.name);
}
this.props.history.push(splittedUrl.join("/"));
}
if (this.props.location.pathname.includes("/code/changesets")) {
this.props.history.push(
`${splittedUrl[0]}/${splittedUrl[1]}/${splittedUrl[2]}/${splittedUrl[3]}/${
splittedUrl[4]
}/branch/${encodeURIComponent(branch.name)}/${splittedUrl[5]}/`
);
}
};
render() {
const { repository, baseUrl, branches, selectedBranch, error, loading, t } = this.props;
const url = baseUrl;
@@ -97,39 +51,29 @@ class CodeOverview extends React.Component<Props> {
return (
<div>
<CodeActionBar>
<Level
left={
<BranchSelector
label={t("code.branchSelector")}
branches={branches}
selectedBranch={selectedBranch}
onSelectBranch={this.branchSelected}
/>
}
right={<CodeViewSwitcher baseUrl={url} currentUrl={this.props.location.pathname} branches={branches} selectedBranch={selectedBranch}/>}
/>
</CodeActionBar>
<Route
path={`${url}/sources`}
exact={true}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
render={() => <Sources repository={repository} baseUrl={`${url}`} branches={branches} />}
/>
<Route
path={`${url}/sources/:revision/:path*`}
render={() => <Sources repository={repository} baseUrl={`${url}/sources`} branches={branches} />}
render={() => (
<Sources repository={repository} baseUrl={`${url}`} branches={branches} selectedBranch={selectedBranch} />
)}
/>
<Route
path={`${url}/changesets`}
render={() => <ChangesetsRoot repository={repository} baseUrl={`${url}/changesets`} />}
render={() => <ChangesetsRoot repository={repository} baseUrl={`${url}`} branches={branches} />}
/>
<Route
path={`${url}/branch/:branch/changesets/`}
render={() => (
<ChangesetsRoot
repository={repository}
baseUrl={`${url}/changesets`}
selectedBranch={branches && branches.filter(b => b.name === this.props.selectedBranch)[0]}
baseUrl={`${url}`}
branches={branches}
selectedBranch={selectedBranch}
/>
)}
/>