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

Added displaying of errors in changesets

Browse Source
This commit is contained in:
Philipp Czora
2018-09-18 09:22:08 +02:00
parent b1ffb0a562
commit a34dad585e
2 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
import React from "react" import React from "react"
import {connect} from "react-redux"; import {connect} from "react-redux";
import {Loading} from "@scm-manager/ui-components"; import {ErrorNotification, Loading} from "@scm-manager/ui-components";
import { import {
fetchChangesetsByNamespaceAndName, fetchChangesetsByNamespaceNameAndBranch, fetchChangesetsByNamespaceAndName, fetchChangesetsByNamespaceNameAndBranch,
getChangesets, isFetchChangesetsPending, getChangesets, getFetchChangesetsFailure, isFetchChangesetsPending,
} from "../modules/changesets"; } from "../modules/changesets";
import type {History} from "history"; import type {History} from "history";
import {fetchBranchesByNamespaceAndName, getBranchNames} from "../../repos/modules/branches"; import {fetchBranchesByNamespaceAndName, getBranchNames} from "../../repos/modules/branches";
@@ -24,8 +24,7 @@ type Props = {
class Changesets extends React.Component<State, Props> { class Changesets extends React.Component<State, Props> {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {};
};
} }
componentDidMount() { componentDidMount() {
@@ -40,22 +39,33 @@ class Changesets extends React.Component<State, Props> {
} }
render() { render() {
const {changesets, branchNames, loading} = this.props; const {changesets, loading, error} = this.props;
const branch = this.props.match.params.branch;
if (loading || !changesets) { if (loading || !changesets) {
return <Loading/> return <Loading/>
} }
if (branchNames) {
return <div> return <div>
<DropDown options={branchNames} preselectedOption={branch} optionSelected={branch => this.branchChanged(branch)}/> <ErrorNotification error={error}/>
<ChangesetTable changesets={changesets}/> {this.renderContent()}
</div>; </div>
} else {
return <ChangesetTable changesets={changesets}/>
}
} }
renderContent = () => {
const branch = this.props.match.params.branch;
const {changesets, branchNames} = this.props;
if (branchNames) {
return <div>
<DropDown options={branchNames} preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}/>
<ChangesetTable changesets={changesets}/>
</div>;
}
return <ChangesetTable changesets={changesets}/>
};
branchChanged = (branchName: string) => { branchChanged = (branchName: string) => {
const {history, repository} = this.props; const {history, repository} = this.props;
history.push(`/repo/${repository.namespace}/${repository.name}/history/${branchName}`); history.push(`/repo/${repository.namespace}/${repository.name}/history/${branchName}`);
@@ -68,7 +78,8 @@ const mapStateToProps = (state, ownProps: Props) => {
return { return {
loading: isFetchChangesetsPending(namespace, name, state), 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) branchNames: getBranchNames(namespace, name, state),
error: getFetchChangesetsFailure(state, namespace, name, ownProps.match.params.branch)
} }
}; };

2
scm-ui/src/changesets/modules/changesets.js
View File

@@ -119,7 +119,7 @@ export function getChangesetsForNamespaceAndNameFromState(namespace: string, nam
return Object.values(state.changesets[key].byId); return Object.values(state.changesets[key].byId);
} }
export function getChangesets(namespace: string, name: string, branch: string, state: Object) { export function getChangesets(state: Object, namespace: string, name: string, branch: string) {
const key = createItemId(namespace, name, branch); const key = createItemId(namespace, name, branch);
if (!state.changesets[key]) { if (!state.changesets[key]) {
return null; return null;