Merge "web: add projects page"

This commit is contained in:
Zuul 2018-12-31 05:28:24 +00:00 committed by Gerrit Code Review
commit afa918bfcd
5 changed files with 132 additions and 4 deletions

View File

@ -59,7 +59,7 @@ it('renders multi tenant', () => {
const topMenuLinks = ReactTestUtils.scryRenderedComponentsWithType(
application, Link)
expect(topMenuLinks[0].props.to).toEqual('/t/openstack/status')
expect(topMenuLinks[1].props.to).toEqual('/t/openstack/jobs')
expect(topMenuLinks[1].props.to).toEqual('/t/openstack/projects')
// Location should be /tenants
expect(location.pathname).toEqual('/tenants')
// Info should tell multi tenants
@ -91,7 +91,7 @@ it('renders single tenant', () => {
const topMenuLinks = ReactTestUtils.scryRenderedComponentsWithType(
application, Link)
expect(topMenuLinks[0].props.to).toEqual('/status')
expect(topMenuLinks[1].props.to).toEqual('/jobs')
expect(topMenuLinks[1].props.to).toEqual('/projects')
// Location should be /status
expect(location.pathname).toEqual('/status')
// Info should tell white label tenant openstack

View File

@ -128,6 +128,9 @@ function fetchBuilds (apiPrefix, queryString) {
}
return Axios.get(apiUrl + apiPrefix + path)
}
function fetchProjects (apiPrefix) {
return Axios.get(apiUrl + apiPrefix + 'projects')
}
function fetchJob (apiPrefix, jobName) {
return Axios.get(apiUrl + apiPrefix + 'job/' + jobName)
}
@ -143,6 +146,7 @@ export {
fetchStatus,
fetchBuild,
fetchBuilds,
fetchProjects,
fetchJob,
fetchJobs,
fetchTenants,

109
web/src/pages/Projects.jsx Normal file
View File

@ -0,0 +1,109 @@
// 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 { Link } from 'react-router-dom'
import { Table } from 'patternfly-react'
import { fetchProjects } from '../api'
class ProjectsPage extends React.Component {
static propTypes = {
tenant: PropTypes.object
}
state = {
projects: null
}
updateData () {
fetchProjects(this.props.tenant.apiPrefix).then(response => {
this.setState({projects: response.data})
})
}
componentDidMount () {
document.title = 'Zuul Projects'
if (this.props.tenant.name) {
this.updateData()
}
}
componentDidUpdate (prevProps) {
if (this.props.tenant.name !== prevProps.tenant.name) {
this.updateData()
}
}
render () {
const { projects } = this.state
if (!projects) {
return (<p>Loading...</p>)
}
const headerFormat = value => <Table.Heading>{value}</Table.Heading>
const cellFormat = (value) => (
<Table.Cell>{value}</Table.Cell>)
const cellProjectFormat = (value) => (
<Table.Cell>
{value}
</Table.Cell>)
const cellBuildFormat = (value) => (
<Table.Cell>
<Link to={this.props.tenant.linkPrefix + '/builds?project=' + value}>
builds
</Link>
</Table.Cell>)
const columns = []
const myColumns = ['name', 'connection', 'type', 'last builds']
myColumns.forEach(column => {
let formatter = cellFormat
let prop = column
if (column === 'name') {
formatter = cellProjectFormat
}
if (column === 'connection') {
prop = 'connection_name'
}
if (column === 'last builds') {
prop = 'name'
formatter = cellBuildFormat
}
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={projects}
rowKey="name"
/>
</Table.PfProvider>)
}
}
export default connect(state => ({tenant: state.tenant}))(ProjectsPage)

View File

@ -47,18 +47,27 @@ class TenantsPage extends Refreshable {
const cellFormat = (value) => (
<Table.Cell>{value}</Table.Cell>)
const columns = []
const myColumns = ['name', 'status', 'jobs', 'builds', 'projects', 'queue']
const myColumns = [
'name', 'status', 'projects', 'jobs', 'builds', 'projects count', 'queue']
myColumns.forEach(column => {
let prop = column
if (column === 'projects count') {
prop = 'projects'
} else if (column === 'projects') {
prop = 'projects_link'
}
columns.push({
header: {label: column,
formatters: [headerFormat]},
property: column,
property: prop,
cell: {formatters: [cellFormat]}
})
})
tenants.forEach(tenant => {
tenant.status = (
<Link to={'/t/' + tenant.name + '/status'}>Status</Link>)
tenant.projects_link = (
<Link to={'/t/' + tenant.name + '/projects'}>Projects</Link>)
tenant.jobs = (
<Link to={'/t/' + tenant.name + '/jobs'}>Jobs</Link>)
tenant.builds = (

View File

@ -14,6 +14,7 @@
import StatusPage from './pages/Status'
import ChangeStatusPage from './pages/ChangeStatus'
import ProjectsPage from './pages/Projects'
import JobPage from './pages/Job'
import JobsPage from './pages/Jobs'
import BuildPage from './pages/Build'
@ -32,6 +33,11 @@ const routes = () => [
to: '/status',
component: StatusPage
},
{
title: 'Projects',
to: '/projects',
component: ProjectsPage
},
{
title: 'Jobs',
to: '/jobs',