From ac4a29320738e07e6d466ab3323235d46d4990f8 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Thu, 6 Dec 2018 08:04:06 +0000 Subject: [PATCH] web: refactor tenants page to use a reducer This change updates the tenants page component to dispatch reducer action instead of direct axios call. This enables using the generic error reducers as well as keeping the tenants list in the store to avoid repeated query. Change-Id: Ie1e16ce417f4ba6785b2f9efceddd2004e2203b0 --- web/src/actions/tenants.js | 58 +++++++++++++++++++++++++++++++++ web/src/pages/Tenants.jsx | 64 +++++++++++++++++++++---------------- web/src/reducers/index.js | 2 ++ web/src/reducers/tenants.js | 44 +++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 27 deletions(-) create mode 100644 web/src/actions/tenants.js create mode 100644 web/src/reducers/tenants.js diff --git a/web/src/actions/tenants.js b/web/src/actions/tenants.js new file mode 100644 index 0000000000..33b0dcbf37 --- /dev/null +++ b/web/src/actions/tenants.js @@ -0,0 +1,58 @@ +// 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 TENANTS_FETCH_REQUEST = 'TENANTS_FETCH_REQUEST' +export const TENANTS_FETCH_SUCCESS = 'TENANTS_FETCH_SUCCESS' +export const TENANTS_FETCH_FAIL = 'TENANTS_FETCH_FAIL' + +export const requestTenants = () => ({ + type: TENANTS_FETCH_REQUEST +}) + +export const receiveTenants = json => ({ + type: TENANTS_FETCH_SUCCESS, + tenants: json, + receivedAt: Date.now() +}) + +const failedTenants = error => ({ + type: TENANTS_FETCH_FAIL, + error +}) + +const fetchTenants = () => dispatch => { + dispatch(requestTenants()) + return API.fetchTenants() + .then(response => dispatch(receiveTenants(response.data))) + .catch(error => dispatch(failedTenants(error))) +} + +const shouldFetchTenants = state => { + const tenants = state.tenants + if (tenants.tenants.length > 0) { + return false + } + if (tenants.isFetching) { + return false + } + return true +} + +export const fetchTenantsIfNeeded = (force) => (dispatch, getState) => { + if (force || shouldFetchTenants(getState())) { + return dispatch(fetchTenants()) + } +} diff --git a/web/src/pages/Tenants.jsx b/web/src/pages/Tenants.jsx index 4b6a03efea..f3646cf5db 100644 --- a/web/src/pages/Tenants.jsx +++ b/web/src/pages/Tenants.jsx @@ -13,32 +13,36 @@ // under the License. import * as React from 'react' +import { connect } from 'react-redux' +import PropTypes from 'prop-types' import { Link } from 'react-router-dom' import { Table } from 'patternfly-react' -import { fetchTenants } from '../api' +import Refreshable from '../containers/Refreshable' +import { fetchTenantsIfNeeded } from '../actions/tenants' -class TenantsPage extends React.Component { - constructor () { - super() - this.state = { - tenants: [] - } +class TenantsPage extends Refreshable { + static propTypes = { + remoteData: PropTypes.object, + dispatch: PropTypes.func + } + + updateData = (force) => { + this.props.dispatch(fetchTenantsIfNeeded(force)) } componentDidMount () { document.title = 'Zuul Tenants' - fetchTenants().then(response => { - this.setState({tenants: response.data}) - }) + this.updateData() } + // TODO: fix Refreshable class to work with tenant less page. + componentDidUpdate () { } + render () { - const { tenants } = this.state - if (tenants.length === 0) { - return (

Loading...

) - } + const { remoteData } = this.props + const tenants = remoteData.tenants const headerFormat = value => {value} const cellFormat = (value) => ( {value}) @@ -61,19 +65,25 @@ class TenantsPage extends React.Component { Builds) }) return ( - - - - ) + +
+ {this.renderSpinner()} +
+ + + + + + ) } } -export default TenantsPage +export default connect(state => ({remoteData: state.tenants}))(TenantsPage) diff --git a/web/src/reducers/index.js b/web/src/reducers/index.js index ccc08a0694..fd7014844a 100644 --- a/web/src/reducers/index.js +++ b/web/src/reducers/index.js @@ -21,6 +21,7 @@ import job from './job' import jobs from './jobs' import status from './status' import tenant from './tenant' +import tenants from './tenants' const reducers = { info, @@ -30,6 +31,7 @@ const reducers = { errors, status, tenant, + tenants, } export default combineReducers(reducers) diff --git a/web/src/reducers/tenants.js b/web/src/reducers/tenants.js new file mode 100644 index 0000000000..c97bda7818 --- /dev/null +++ b/web/src/reducers/tenants.js @@ -0,0 +1,44 @@ +// 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 { + TENANTS_FETCH_FAIL, + TENANTS_FETCH_REQUEST, + TENANTS_FETCH_SUCCESS +} from '../actions/tenants' + +export default (state = { + isFetching: false, + tenants: [] +}, action) => { + switch (action.type) { + case TENANTS_FETCH_REQUEST: + return { + isFetching: true, + tenants: state.tenants + } + case TENANTS_FETCH_SUCCESS: + return { + isFetching: false, + tenants: action.tenants, + } + case TENANTS_FETCH_FAIL: + return { + isFetching: false, + tenants: state.tenants, + } + default: + return state + } +}