web: refactor labels page to use a reducer

This change updates the labels page to dispatch reducer action instead
of direct axios call. This enables using the generic error reducers as
well as keeping the tenant labels in the store to avoid repeated query.

Change-Id: I6f8d63a710155b9df3abe3cdbd1271f7b3e02ac2
This commit is contained in:
Tristan Cacqueray 2018-12-14 05:15:44 +00:00
parent 8f8658a3fe
commit 4b32dda707
4 changed files with 142 additions and 34 deletions

60
web/src/actions/labels.js Normal file
View File

@ -0,0 +1,60 @@
// Copyright 2018 Red Hat, Inc
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License. You may obtain
// a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations
// under the License.
import * as API from '../api'
export const LABELS_FETCH_REQUEST = 'LABELS_FETCH_REQUEST'
export const LABELS_FETCH_SUCCESS = 'LABELS_FETCH_SUCCESS'
export const LABELS_FETCH_FAIL = 'LABELS_FETCH_FAIL'
export const requestLabels = () => ({
type: LABELS_FETCH_REQUEST
})
export const receiveLabels = (tenant, json) => ({
type: LABELS_FETCH_SUCCESS,
tenant: tenant,
labels: json,
receivedAt: Date.now()
})
const failedLabels = error => ({
type: LABELS_FETCH_FAIL,
error
})
const fetchLabels = (tenant) => dispatch => {
dispatch(requestLabels())
return API.fetchLabels(tenant.apiPrefix)
.then(response => dispatch(receiveLabels(tenant.name, response.data)))
.catch(error => dispatch(failedLabels(error)))
}
const shouldFetchLabels = (tenant, state) => {
const labels = state.labels.labels[tenant.name]
if (!labels || labels.length === 0) {
return true
}
if (labels.isFetching) {
return false
}
return false
}
export const fetchLabelsIfNeeded = (tenant, force) => (
dispatch, getState) => {
if (force || shouldFetchLabels(tenant, getState())) {
return dispatch(fetchLabels(tenant))
}
}

View File

@ -17,39 +17,30 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { Table } from 'patternfly-react'
import { fetchLabels } from '../api'
import { fetchLabelsIfNeeded } from '../actions/labels'
import Refreshable from '../containers/Refreshable'
class LabelsPage extends React.Component {
class LabelsPage extends Refreshable {
static propTypes = {
tenant: PropTypes.object
tenant: PropTypes.object,
remoteData: PropTypes.object,
dispatch: PropTypes.func
}
state = {
labels: null
}
updateData () {
fetchLabels(this.props.tenant.apiPrefix).then(response => {
this.setState({labels: response.data})
})
updateData (force) {
this.props.dispatch(fetchLabelsIfNeeded(this.props.tenant, force))
}
componentDidMount () {
document.title = 'Zuul Labels'
if (this.props.tenant.name) {
this.updateData()
}
}
componentDidUpdate (prevProps) {
if (this.props.tenant.name !== prevProps.tenant.name) {
this.updateData()
}
super.componentDidMount()
}
render () {
const { labels } = this.state
const { remoteData } = this.props
const labels = remoteData.labels[this.props.tenant.name]
if (!labels) {
return (<p>Loading...</p>)
}
@ -68,19 +59,27 @@ class LabelsPage extends React.Component {
})
})
return (
<Table.PfProvider
striped
bordered
hover
columns={columns}
>
<Table.Header/>
<Table.Body
rows={labels}
rowKey="name"
/>
</Table.PfProvider>)
<React.Fragment>
<div style={{float: 'right'}}>
{this.renderSpinner()}
</div>
<Table.PfProvider
striped
bordered
hover
columns={columns}
>
<Table.Header/>
<Table.Body
rows={labels}
rowKey="name"
/>
</Table.PfProvider>
</React.Fragment>)
}
}
export default connect(state => ({tenant: state.tenant}))(LabelsPage)
export default connect(state => ({
tenant: state.tenant,
remoteData: state.labels,
}))(LabelsPage)

View File

@ -20,6 +20,7 @@ import errors from './errors'
import info from './info'
import job from './job'
import jobs from './jobs'
import labels from './labels'
import project from './project'
import projects from './projects'
import status from './status'
@ -31,6 +32,7 @@ const reducers = {
info,
job,
jobs,
labels,
project,
projects,
configErrors,

View File

@ -0,0 +1,47 @@
// Copyright 2018 Red Hat, Inc
//
// Licensed under the Apache License, Version 2.0 (the "License"); you may
// not use this file except in compliance with the License. You may obtain
// a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations
// under the License.
import {
LABELS_FETCH_FAIL,
LABELS_FETCH_REQUEST,
LABELS_FETCH_SUCCESS
} from '../actions/labels'
import update from 'immutability-helper'
export default (state = {
isFetching: false,
labels: {},
}, action) => {
switch (action.type) {
case LABELS_FETCH_REQUEST:
return {
isFetching: true,
labels: state.labels,
}
case LABELS_FETCH_SUCCESS:
return {
isFetching: false,
labels: update(
state.labels, {$merge: {[action.tenant]: action.labels}}),
}
case LABELS_FETCH_FAIL:
return {
isFetching: false,
labels: state.labels,
}
default:
return state
}
}