Merge "web: fix support for comma/space separated status filter"

This commit is contained in:
Zuul 2018-10-10 10:53:15 +00:00 committed by Gerrit Code Review
commit 505bd517f3
1 changed files with 11 additions and 4 deletions

View File

@ -88,11 +88,18 @@ class Pipeline extends React.Component {
filterQueue(queue, filter) {
let found = false
let filters = filter.replace(' ', ',').split(',')
queue.heads.forEach(changes => {
changes.forEach(change => {
if ((change.project && change.project.indexOf(filter) !== -1) ||
(change.id && change.id.indexOf(filter) !== -1)) {
found = true
filters.forEach(changeFilter => {
if (changeFilter && (
(change.project && change.project.indexOf(changeFilter) !== -1) ||
(change.id && change.id.indexOf(changeFilter) !== -1))) {
found = true
return
}
})
if (found) {
return
}
})
@ -117,7 +124,7 @@ class Pipeline extends React.Component {
</div>
{pipeline.change_queues.filter(item => item.heads.length > 0)
.filter(item => (!filter || (
pipeline.name.indexOf(filter) !== -1 ||
filter.indexOf(pipeline.name) !== -1 ||
this.filterQueue(item, filter)
)))
.map((changeQueue, idx) => (