diff options
author | Tristan Cacqueray <tdecacqu@redhat.com> | 2018-12-02 06:15:55 +0000 |
---|---|---|
committer | Tristan Cacqueray <tdecacqu@redhat.com> | 2018-12-06 07:21:37 +0000 |
commit | 839fe0cceb9f1fb7cb965004bc33b8f2527d0c4e (patch) | |
tree | b4f029b7a9d28026ca3d46149835ee3d9fab56ba /web/src/pages/Jobs.jsx | |
parent | 833dbd257b8c5dbb4721fc74fa794ab63e4f1557 (diff) | |
download | zuul-839fe0cceb9f1fb7cb965004bc33b8f2527d0c4e.tar.gz |
web: refactor jobs page to use a reducer
This change updates the jobs page component to dispatch reducer
action instead of direct axios call. This enables using the generic
error reducers as well as keeping the jobs list in the store to
avoid repeated query. This change also refactor the Job list into
a container and extends the common refresh component.
Change-Id: I7f44e83d6bea8ee915c81d7ba9afd6d9a4c89d38
Diffstat (limited to 'web/src/pages/Jobs.jsx')
-rw-r--r-- | web/src/pages/Jobs.jsx | 99 |
1 files changed, 25 insertions, 74 deletions
diff --git a/web/src/pages/Jobs.jsx b/web/src/pages/Jobs.jsx index d4ef1553f..edfd4a3fa 100644 --- a/web/src/pages/Jobs.jsx +++ b/web/src/pages/Jobs.jsx @@ -15,94 +15,45 @@ import * as React from 'react' import PropTypes from 'prop-types' import { connect } from 'react-redux' -import { Link } from 'react-router-dom' -import { Table } from 'patternfly-react' -import { fetchJobs } from '../api' +import { fetchJobsIfNeeded } from '../actions/jobs' +import Refreshable from '../containers/Refreshable' +import Jobs from '../containers/jobs/Jobs' -class JobsPage extends React.Component { +class JobsPage extends Refreshable { static propTypes = { - tenant: PropTypes.object + tenant: PropTypes.object, + remoteData: PropTypes.object, + dispatch: PropTypes.func } - state = { - jobs: null - } - - updateData () { - fetchJobs(this.props.tenant.apiPrefix).then(response => { - this.setState({jobs: response.data}) - }) + updateData (force) { + this.props.dispatch(fetchJobsIfNeeded(this.props.tenant, force)) } componentDidMount () { document.title = 'Zuul Jobs' - if (this.props.tenant.name) { - this.updateData() - } - } - - componentDidUpdate (prevProps) { - if (this.props.tenant.name !== prevProps.tenant.name) { - this.updateData() - } + super.componentDidMount() } render () { - const { jobs } = this.state - if (!jobs) { - return (<p>Loading...</p>) - } - - const headerFormat = value => <Table.Heading>{value}</Table.Heading> - const cellFormat = (value) => ( - <Table.Cell>{value}</Table.Cell>) - const cellJobFormat = (value) => ( - <Table.Cell> - <Link to={this.props.tenant.linkPrefix + '/job/' + value}> - {value} - </Link> - </Table.Cell>) - const cellBuildFormat = (value) => ( - <Table.Cell> - <Link to={this.props.tenant.linkPrefix + '/builds?job_name=' + value}> - builds - </Link> - </Table.Cell>) - const columns = [] - const myColumns = ['name', 'description', 'Last builds'] - myColumns.forEach(column => { - let formatter = cellFormat - let prop = column - if (column === 'name') { - formatter = cellJobFormat - } - if (column === 'Last builds') { - prop = 'name' - formatter = cellBuildFormat - } - columns.push({ - header: {label: column, - formatters: [headerFormat]}, - property: prop, - cell: {formatters: [formatter]} - }) - }) + const { remoteData } = this.props + const jobs = remoteData.jobs[this.props.tenant.name] return ( - <Table.PfProvider - striped - bordered - hover - columns={columns} - > - <Table.Header/> - <Table.Body - rows={jobs} - rowKey="name" - /> - </Table.PfProvider>) + <React.Fragment> + <div className="pull-right" style={{display: 'flex'}}> + {this.renderSpinner()} + </div> + {jobs && jobs.length > 0 && + <Jobs + jobs={jobs} + />} + </React.Fragment>) } } -export default connect(state => ({tenant: state.tenant}))(JobsPage) +export default connect(state => ({ + tenant: state.tenant, + remoteData: state.jobs, +}))(JobsPage) |