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

Move <hr> to correct file

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-18 16:51:31 +02:00
parent 03bfb92ec7
commit dc59d1a5ce
2 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-ui/src/changesets/components/ChangesetTable.js
View File

@@ -13,12 +13,7 @@ class ChangesetTable extends React.Component<Props> {
const content = changesets.map((changeset, index) => {
return <ChangesetRow key={index} changeset={changeset} />;
});
return (
<div>
<hr />
{content}
</div>
);
return <div>{content}</div>;
}
}

117
scm-ui/src/changesets/containers/Changesets.js
View File

@@ -1,25 +1,34 @@
import React from "react"
import {connect} from "react-redux";
import {ErrorNotification, Loading} from "@scm-manager/ui-components";
import React from "react";
import { connect } from "react-redux";
import { ErrorNotification, Loading } from "@scm-manager/ui-components";
import {
fetchChangesetsByNamespaceAndName, fetchChangesetsByNamespaceNameAndBranch,
getChangesets, getFetchChangesetsFailure, isFetchChangesetsPending,
fetchChangesetsByNamespaceAndName,
fetchChangesetsByNamespaceNameAndBranch,
getChangesets,
getFetchChangesetsFailure,
isFetchChangesetsPending
} from "../modules/changesets";
import type {History} from "history";
import {fetchBranchesByNamespaceAndName, getBranchNames} from "../../repos/modules/branches";
import type {Repository} from "@scm-manager/ui-types";
import type { History } from "history";
import {
fetchBranchesByNamespaceAndName,
getBranchNames
} from "../../repos/modules/branches";
import type { Repository } from "@scm-manager/ui-types";
import ChangesetTable from "../components/ChangesetTable";
import DropDown from "../components/DropDown";
import {withRouter} from "react-router-dom";
import { withRouter } from "react-router-dom";
type Props = {
repository: Repository,
branchName: string,
history: History,
fetchChangesetsByNamespaceNameAndBranch: (namespace: string, name: string, branch: string) => void
}
fetchChangesetsByNamespaceNameAndBranch: (
namespace: string,
name: string,
branch: string
) => void
};
class Changesets extends React.Component<State, Props> {
constructor(props) {
@@ -28,9 +37,13 @@ class Changesets extends React.Component<State, Props> {
}
componentDidMount() {
const {namespace, name} = this.props.repository;
const { namespace, name } = this.props.repository;
const branchName = this.props.match.params.branch;
const {fetchChangesetsByNamespaceNameAndBranch, fetchChangesetsByNamespaceAndName, fetchBranchesByNamespaceAndName} = this.props;
const {
fetchChangesetsByNamespaceNameAndBranch,
fetchChangesetsByNamespaceAndName,
fetchBranchesByNamespaceAndName
} = this.props;
if (branchName) {
fetchChangesetsByNamespaceNameAndBranch(namespace, name, branchName);
} else {
@@ -40,48 +53,66 @@ class Changesets extends React.Component<State, Props> {
}
render() {
const {changesets, loading, error} = this.props;
const { changesets, loading, error } = this.props;
if (loading || !changesets) {
return <Loading />
return <Loading />;
}
return <div>
<ErrorNotification error={error}/>
return (
<div>
<ErrorNotification error={error} />
{this.renderContent()}
</div>
);
}
renderContent = () => {
const branch = this.props.match.params.branch;
const {changesets, branchNames} = this.props;
const { changesets, branchNames } = this.props;
if (branchNames && branchNames.length > 0) {
return <div>
<label className="label">Branch: </label><DropDown options={branchNames} preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}/>
<ChangesetTable changesets={changesets}/>
</div>;
return (
<div>
<label className="label">Branch: </label>
<DropDown
options={branchNames}
preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}
/>
<hr />
<ChangesetTable changesets={changesets} />
</div>
);
}
return <ChangesetTable changesets={changesets}/>
return <ChangesetTable changesets={changesets} />;
};
branchChanged = (branchName: string) => {
const {history, repository} = this.props;
history.push(`/repo/${repository.namespace}/${repository.name}/history/${branchName}`);
const { history, repository } = this.props;
history.push(
`/repo/${repository.namespace}/${repository.name}/history/${branchName}`
);
};
}
const mapStateToProps = (state, ownProps: Props) => {
const {namespace, name} = ownProps.repository;
const { namespace, name } = ownProps.repository;
return {
loading: isFetchChangesetsPending(namespace, name, state),
changesets: getChangesets(state, namespace, name, ownProps.match.params.branch),
changesets: getChangesets(
state,
namespace,
name,
ownProps.match.params.branch
),
branchNames: getBranchNames(namespace, name, state),
error: getFetchChangesetsFailure(state, namespace, name, ownProps.match.params.branch)
}
error: getFetchChangesetsFailure(
state,
namespace,
name,
ownProps.match.params.branch
)
};
};
const mapDispatchToProps = dispatch => {
@@ -89,16 +120,24 @@ const mapDispatchToProps = dispatch => {
fetchChangesetsByNamespaceAndName: (namespace: string, name: string) => {
dispatch(fetchChangesetsByNamespaceAndName(namespace, name));
},
fetchChangesetsByNamespaceNameAndBranch: (namespace: string, name: string, branch: string) => {
dispatch(fetchChangesetsByNamespaceNameAndBranch(namespace, name, branch));
fetchChangesetsByNamespaceNameAndBranch: (
namespace: string,
name: string,
branch: string
) => {
dispatch(
fetchChangesetsByNamespaceNameAndBranch(namespace, name, branch)
);
},
fetchBranchesByNamespaceAndName: (namespace: string, name: string) => {
dispatch(fetchBranchesByNamespaceAndName(namespace, name));
}
}
};
};
export default withRouter(connect(
export default withRouter(
connect(
mapStateToProps,
mapDispatchToProps
)(Changesets));
)(Changesets)
);