Merge "web: add nodes page"
This commit is contained in:
commit
144ab10ba7
|
@ -143,6 +143,9 @@ function fetchJobs (apiPrefix) {
|
||||||
function fetchLabels (apiPrefix) {
|
function fetchLabels (apiPrefix) {
|
||||||
return Axios.get(apiUrl + apiPrefix + 'labels')
|
return Axios.get(apiUrl + apiPrefix + 'labels')
|
||||||
}
|
}
|
||||||
|
function fetchNodes (apiPrefix) {
|
||||||
|
return Axios.get(apiUrl + apiPrefix + 'nodes')
|
||||||
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
getHomepageUrl,
|
getHomepageUrl,
|
||||||
|
@ -157,6 +160,7 @@ export {
|
||||||
fetchJob,
|
fetchJob,
|
||||||
fetchJobs,
|
fetchJobs,
|
||||||
fetchLabels,
|
fetchLabels,
|
||||||
|
fetchNodes,
|
||||||
fetchTenants,
|
fetchTenants,
|
||||||
fetchInfo
|
fetchInfo
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,110 @@
|
||||||
|
// 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 React from 'react'
|
||||||
|
import PropTypes from 'prop-types'
|
||||||
|
import { connect } from 'react-redux'
|
||||||
|
import { Table } from 'patternfly-react'
|
||||||
|
import * as moment from 'moment'
|
||||||
|
|
||||||
|
import { fetchNodes } from '../api'
|
||||||
|
|
||||||
|
|
||||||
|
class NodesPage extends React.Component {
|
||||||
|
static propTypes = {
|
||||||
|
tenant: PropTypes.object
|
||||||
|
}
|
||||||
|
|
||||||
|
state = {
|
||||||
|
nodes: null
|
||||||
|
}
|
||||||
|
|
||||||
|
updateData () {
|
||||||
|
fetchNodes(this.props.tenant.apiPrefix).then(response => {
|
||||||
|
this.setState({nodes: response.data})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidMount () {
|
||||||
|
document.title = 'Zuul Nodes'
|
||||||
|
if (this.props.tenant.name) {
|
||||||
|
this.updateData()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate (prevProps) {
|
||||||
|
if (this.props.tenant.name !== prevProps.tenant.name) {
|
||||||
|
this.updateData()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render () {
|
||||||
|
const { nodes } = this.state
|
||||||
|
if (!nodes) {
|
||||||
|
return (<p>Loading...</p>)
|
||||||
|
}
|
||||||
|
|
||||||
|
const headerFormat = value => <Table.Heading>{value}</Table.Heading>
|
||||||
|
const cellFormat = value => <Table.Cell>{value}</Table.Cell>
|
||||||
|
const cellPreFormat = value => (
|
||||||
|
<Table.Cell style={{fontFamily: 'Menlo,Monaco,Consolas,monospace'}}>
|
||||||
|
{value}
|
||||||
|
</Table.Cell>)
|
||||||
|
const cellAgeFormat = value => (
|
||||||
|
<Table.Cell style={{fontFamily: 'Menlo,Monaco,Consolas,monospace'}}>
|
||||||
|
{moment.unix(value).fromNow()}
|
||||||
|
</Table.Cell>)
|
||||||
|
|
||||||
|
const columns = []
|
||||||
|
const myColumns = [
|
||||||
|
'id', 'label', 'connection', 'server', 'provider', 'state',
|
||||||
|
'age', 'comment'
|
||||||
|
]
|
||||||
|
myColumns.forEach(column => {
|
||||||
|
let formatter = cellFormat
|
||||||
|
let prop = column
|
||||||
|
if (column === 'label') {
|
||||||
|
prop = 'type'
|
||||||
|
} else if (column === 'connection') {
|
||||||
|
prop = 'connection_type'
|
||||||
|
} else if (column === 'server') {
|
||||||
|
prop = 'external_id'
|
||||||
|
formatter = cellPreFormat
|
||||||
|
} else if (column === 'age') {
|
||||||
|
prop = 'state_time'
|
||||||
|
formatter = cellAgeFormat
|
||||||
|
}
|
||||||
|
columns.push({
|
||||||
|
header: {label: column, formatters: [headerFormat]},
|
||||||
|
property: prop,
|
||||||
|
cell: {formatters: [formatter]}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return (
|
||||||
|
<Table.PfProvider
|
||||||
|
striped
|
||||||
|
bordered
|
||||||
|
hover
|
||||||
|
columns={columns}
|
||||||
|
>
|
||||||
|
<Table.Header/>
|
||||||
|
<Table.Body
|
||||||
|
rows={nodes}
|
||||||
|
rowKey="id"
|
||||||
|
/>
|
||||||
|
</Table.PfProvider>)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default connect(state => ({tenant: state.tenant}))(NodesPage)
|
|
@ -19,6 +19,7 @@ import ProjectsPage from './pages/Projects'
|
||||||
import JobPage from './pages/Job'
|
import JobPage from './pages/Job'
|
||||||
import JobsPage from './pages/Jobs'
|
import JobsPage from './pages/Jobs'
|
||||||
import LabelsPage from './pages/Labels'
|
import LabelsPage from './pages/Labels'
|
||||||
|
import NodesPage from './pages/Nodes'
|
||||||
import BuildPage from './pages/Build'
|
import BuildPage from './pages/Build'
|
||||||
import BuildsPage from './pages/Builds'
|
import BuildsPage from './pages/Builds'
|
||||||
import ConfigErrorsPage from './pages/ConfigErrors'
|
import ConfigErrorsPage from './pages/ConfigErrors'
|
||||||
|
@ -50,6 +51,11 @@ const routes = () => [
|
||||||
to: '/labels',
|
to: '/labels',
|
||||||
component: LabelsPage
|
component: LabelsPage
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: 'Nodes',
|
||||||
|
to: '/nodes',
|
||||||
|
component: NodesPage
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: 'Builds',
|
title: 'Builds',
|
||||||
to: '/builds',
|
to: '/builds',
|
||||||
|
|
Loading…
Reference in New Issue