zuul
/
zuul
Code Issues Proposed changes

Merge "web: support more than one job in the filter"

This commit is contained in:
Zuul 2019-03-15 15:15:43 +00:00 committed by Gerrit Code Review
parent c91335b527 a88aad3423
commit a095e41e91
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/containers/jobs/Jobs.jsx
View File

@ -102,11 +102,15 @@ class JobsList extends React.Component {
let filtered = false let filtered = false
if (filter) { if (filter) {
filtered = true filtered = true
let filters = filter.replace(/ +/, ',').split(',')
for (let job of jobs) { for (let job of jobs) {
if (job.name.indexOf(filter) !== -1 || filters.forEach(jobFilter => {
(job.description && job.description.indexOf(filter) !== -1)) { if (jobFilter && (
getNode(job, !filtered) (job.name.indexOf(jobFilter) !== -1) ||
} (job.description && job.description.indexOf(jobFilter) !== -1))) {
getNode(job, !filtered)
}
})
} }
} }
// process job list // process job list

2
web/src/containers/status/Pipeline.jsx
View File

@ -90,7 +90,7 @@ class Pipeline extends React.Component {
filterQueue(queue, filter) { filterQueue(queue, filter) {
let found = false let found = false
let filters = filter.replace(' ', ',').split(',') let filters = filter.replace(/ +/, ',').split(',')
queue.heads.forEach(changes => { queue.heads.forEach(changes => {
changes.forEach(change => { changes.forEach(change => {
filters.forEach(changeFilter => { filters.forEach(changeFilter => {