Merge "web: refactor build page using a container"
This commit is contained in:
commit
972f91962c
|
@ -0,0 +1,89 @@
|
|||
// 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 { Panel } from 'react-bootstrap'
|
||||
|
||||
|
||||
class Build extends React.Component {
|
||||
static propTypes = {
|
||||
build: PropTypes.object,
|
||||
tenant: PropTypes.object,
|
||||
}
|
||||
|
||||
render () {
|
||||
const { build } = this.props
|
||||
const rows = []
|
||||
const myColumns = [
|
||||
'job_name', 'result', 'voting',
|
||||
'pipeline', 'start_time', 'end_time', 'duration',
|
||||
'project', 'branch', 'change', 'patchset', 'oldrev', 'newrev',
|
||||
'ref', 'new_rev', 'ref_url', 'log_url']
|
||||
|
||||
myColumns.forEach(column => {
|
||||
let label = column
|
||||
let value = build[column]
|
||||
if (column === 'job_name') {
|
||||
label = 'job'
|
||||
value = (
|
||||
<Link to={this.props.tenant.linkPrefix + '/job/' + value}>
|
||||
{value}
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
if (column === 'voting') {
|
||||
if (value) {
|
||||
value = 'true'
|
||||
} else {
|
||||
value = 'false'
|
||||
}
|
||||
}
|
||||
if (value && (column === 'log_url' || column === 'ref_url')) {
|
||||
value = <a href={value}>{value}</a>
|
||||
}
|
||||
if (column === 'log_url') {
|
||||
label = 'log url'
|
||||
}
|
||||
if (column === 'ref_url') {
|
||||
label = 'ref url'
|
||||
}
|
||||
if (value) {
|
||||
rows.push({key: label, value: value})
|
||||
}
|
||||
})
|
||||
return (
|
||||
<Panel>
|
||||
<Panel.Heading>Build result {build.uuid}</Panel.Heading>
|
||||
<Panel.Body>
|
||||
<table className="table table-striped table-bordered">
|
||||
<tbody>
|
||||
{rows.map(item => (
|
||||
<tr key={item.key}>
|
||||
<td>{item.key}</td>
|
||||
<td>{item.value}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</Panel.Body>
|
||||
</Panel>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export default connect(state => ({tenant: state.tenant}))(Build)
|
|
@ -15,11 +15,10 @@
|
|||
import * as React from 'react'
|
||||
import { connect } from 'react-redux'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Link } from 'react-router-dom'
|
||||
import { Panel } from 'react-bootstrap'
|
||||
|
||||
import { fetchBuildIfNeeded } from '../actions/build'
|
||||
import Refreshable from '../containers/Refreshable'
|
||||
import Build from '../containers/build/Build'
|
||||
|
||||
|
||||
class BuildPage extends Refreshable {
|
||||
|
@ -42,67 +41,12 @@ class BuildPage extends Refreshable {
|
|||
render () {
|
||||
const { remoteData } = this.props
|
||||
const build = remoteData.builds[this.props.match.params.buildId]
|
||||
if (!build) {
|
||||
return (<p>Loading...</p>)
|
||||
}
|
||||
const rows = []
|
||||
const myColumns = [
|
||||
'job_name', 'result', 'voting',
|
||||
'pipeline', 'start_time', 'end_time', 'duration',
|
||||
'project', 'branch', 'change', 'patchset', 'oldrev', 'newrev',
|
||||
'ref', 'new_rev', 'ref_url', 'log_url']
|
||||
|
||||
myColumns.forEach(column => {
|
||||
let label = column
|
||||
let value = build[column]
|
||||
if (column === 'job_name') {
|
||||
label = 'job'
|
||||
value = (
|
||||
<Link to={this.props.tenant.linkPrefix + '/job/' + value}>
|
||||
{value}
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
if (column === 'voting') {
|
||||
if (value) {
|
||||
value = 'true'
|
||||
} else {
|
||||
value = 'false'
|
||||
}
|
||||
}
|
||||
if (value && (column === 'log_url' || column === 'ref_url')) {
|
||||
value = <a href={value}>{value}</a>
|
||||
}
|
||||
if (column === 'log_url') {
|
||||
label = 'log url'
|
||||
}
|
||||
if (column === 'ref_url') {
|
||||
label = 'ref url'
|
||||
}
|
||||
if (value) {
|
||||
rows.push({key: label, value: value})
|
||||
}
|
||||
})
|
||||
return (
|
||||
<React.Fragment>
|
||||
<div style={{float: 'right'}}>
|
||||
{this.renderSpinner()}
|
||||
</div>
|
||||
<Panel>
|
||||
<Panel.Heading>Build result {build.uuid}</Panel.Heading>
|
||||
<Panel.Body>
|
||||
<table className="table table-striped table-bordered">
|
||||
<tbody>
|
||||
{rows.map(item => (
|
||||
<tr key={item.key}>
|
||||
<td>{item.key}</td>
|
||||
<td>{item.value}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</Panel.Body>
|
||||
</Panel>
|
||||
{build && <Build build={build}/>}
|
||||
</React.Fragment>
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue