web: add jobs list filter
This change improves the job list page to enable filtering. Change-Id: I81e12c0c473010f65ccae66d36b43bfcdd531f9e
This commit is contained in:
parent
8f5003da20
commit
0999d5d840
|
@ -16,7 +16,13 @@ import * as React from 'react'
|
||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import { connect } from 'react-redux'
|
import { connect } from 'react-redux'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
import { TreeView } from 'patternfly-react'
|
import {
|
||||||
|
Form,
|
||||||
|
FormGroup,
|
||||||
|
FormControl,
|
||||||
|
Icon,
|
||||||
|
TreeView
|
||||||
|
} from 'patternfly-react'
|
||||||
|
|
||||||
|
|
||||||
class JobsList extends React.Component {
|
class JobsList extends React.Component {
|
||||||
|
@ -25,8 +31,21 @@ class JobsList extends React.Component {
|
||||||
jobs: PropTypes.array,
|
jobs: PropTypes.array,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
state = {
|
||||||
|
filter: null
|
||||||
|
}
|
||||||
|
|
||||||
|
handleKeyPress = (e) => {
|
||||||
|
if (e.charCode === 13) {
|
||||||
|
this.setState({filter: e.target.value})
|
||||||
|
e.preventDefault()
|
||||||
|
e.target.blur()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { jobs } = this.props
|
const { jobs } = this.props
|
||||||
|
const { filter } = this.state
|
||||||
|
|
||||||
const linkPrefix = this.props.tenant.linkPrefix + '/job/'
|
const linkPrefix = this.props.tenant.linkPrefix + '/job/'
|
||||||
|
|
||||||
|
@ -37,7 +56,7 @@ class JobsList extends React.Component {
|
||||||
// visited contains individual node
|
// visited contains individual node
|
||||||
const visited = {}
|
const visited = {}
|
||||||
// getNode returns the tree node and visit each parents
|
// getNode returns the tree node and visit each parents
|
||||||
const getNode = function (job) {
|
const getNode = function (job, filtered) {
|
||||||
if (!visited[job.name]) {
|
if (!visited[job.name]) {
|
||||||
// Collect parents
|
// Collect parents
|
||||||
let parents = []
|
let parents = []
|
||||||
|
@ -62,10 +81,11 @@ class JobsList extends React.Component {
|
||||||
expanded: true,
|
expanded: true,
|
||||||
},
|
},
|
||||||
parents: parents,
|
parents: parents,
|
||||||
|
filtered: filtered,
|
||||||
}
|
}
|
||||||
// Visit parent recursively
|
// Visit parent recursively
|
||||||
for (let parent of parents) {
|
for (let parent of parents) {
|
||||||
getNode(jobMap[parent])
|
getNode(jobMap[parent], filtered)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return visited[job.name]
|
return visited[job.name]
|
||||||
|
@ -74,30 +94,66 @@ class JobsList extends React.Component {
|
||||||
for (let job of jobs) {
|
for (let job of jobs) {
|
||||||
jobMap[job.name] = job
|
jobMap[job.name] = job
|
||||||
}
|
}
|
||||||
|
// filter job
|
||||||
|
let filtered = false
|
||||||
|
if (filter) {
|
||||||
|
filtered = true
|
||||||
|
for (let job of jobs) {
|
||||||
|
if (job.name.indexOf(filter) !== -1 ||
|
||||||
|
(job.description && job.description.indexOf(filter) !== -1)) {
|
||||||
|
getNode(job, !filtered)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// process job list
|
// process job list
|
||||||
for (let job of jobs) {
|
for (let job of jobs) {
|
||||||
const jobNode = getNode(job)
|
const jobNode = getNode(job, filtered)
|
||||||
let attached = false
|
if (!jobNode.filtered) {
|
||||||
// add tree node to each parent and expand the parent
|
let attached = false
|
||||||
for (let parent of jobNode.parents) {
|
// add tree node to each parent and expand the parent
|
||||||
const parentNode = visited[parent]
|
for (let parent of jobNode.parents) {
|
||||||
if (!parentNode) {
|
const parentNode = visited[parent]
|
||||||
console.log('Job ', job.name, ' parent ', parent, ' does not exist!')
|
if (!parentNode) {
|
||||||
continue
|
console.log(
|
||||||
|
'Job ', job.name, ' parent ', parent, ' does not exist!')
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (!parentNode.nodes) {
|
||||||
|
parentNode.nodes = []
|
||||||
|
}
|
||||||
|
parentNode.nodes.push(jobNode)
|
||||||
|
attached = true
|
||||||
}
|
}
|
||||||
if (!parentNode.nodes) {
|
// else add node at the tree root
|
||||||
parentNode.nodes = []
|
if (!attached || jobNode.parents.length === 0) {
|
||||||
|
nodes.push(jobNode)
|
||||||
}
|
}
|
||||||
parentNode.nodes.push(jobNode)
|
|
||||||
attached = true
|
|
||||||
}
|
|
||||||
// else add node at the tree root
|
|
||||||
if (!attached || jobNode.parents.length === 0) {
|
|
||||||
nodes.push(jobNode)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<div className='tree-view-container'>
|
<div className="tree-view-container">
|
||||||
|
<Form inline>
|
||||||
|
<FormGroup controlId='jobs'>
|
||||||
|
<FormControl
|
||||||
|
type='text'
|
||||||
|
placeholder='job name'
|
||||||
|
defaultValue={filter}
|
||||||
|
inputRef={i => this.filter = i}
|
||||||
|
onKeyPress={this.handleKeyPress} />
|
||||||
|
{filter && (
|
||||||
|
<FormControl.Feedback>
|
||||||
|
<span
|
||||||
|
onClick={() => {this.setState({filter: ''})
|
||||||
|
this.filter.value = ''}}
|
||||||
|
style={{cursor: 'pointer', zIndex: 10, pointerEvents: 'auto'}}
|
||||||
|
>
|
||||||
|
<Icon type='pf' title='Clear filter' name='delete' />
|
||||||
|
|
||||||
|
</span>
|
||||||
|
</FormControl.Feedback>
|
||||||
|
)}
|
||||||
|
</FormGroup>
|
||||||
|
</Form>
|
||||||
<TreeView nodes={nodes} />
|
<TreeView nodes={nodes} />
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue