web: fix support for comma/space separated status filter
This change restores support for comma/space separated status filters. Story: 2004029 Task: 27024 Change-Id: I58c6b406f8225f6bfe2d2c5b88c304633a523fa3
This commit is contained in:
parent
8b0a30ce3d
commit
de046ce005
|
@ -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) => (
|
||||
|
|
Loading…
Reference in New Issue