improve tag filtering in builder page

+tag means all tags with + must be present in the builder tags
-tag means no tags with - must be present in the builder tags
tag means at least one of the filtered tag might be present

master/docs/relnotes/index.rst

@@ -20,6 +20,8 @@ Master
 Features
 ~~~~~~~~
 
+* Builders ui page has improved tag filtering capabilities
+
 Fixes
 ~~~~~
 

www/base/src/app/builders/builders.controller.coffee

@@ -31,28 +31,64 @@ class Builders extends Controller
 
         $scope.tags_filter = $location.search()["tags"]
         $scope.tags_filter ?= []
-        $log.debug "params", $location.search()
+        if not angular.isArray($scope.tags_filter)
+            $scope.tags_filter = [$scope.tags_filter]
 
         $scope.$watch  "tags_filter", (tags, old) ->
             if old?
-                $log.debug "go", tags
                 $location.search("tags", tags)
         , true
+
         $scope.isBuilderFiltered = (builder, index) ->
+
+            # filter out inactive builders
             if not $scope.settings.show_old_builders.value and not $scope.hasActiveMaster(builder)
                 return false
-            if $scope.tags_filter.length == 0
+
+            pluses = _.filter($scope.tags_filter, (tag) -> tag.indexOf("+") == 0)
+            minuses = _.filter($scope.tags_filter, (tag) -> tag.indexOf("-") == 0)
+
+            # First enforce that we have no tag marked '-'
+            for tag in minuses
+                if builder.tags.indexOf(tag.slice(1)) >= 0
+                    return false
+
+            # if only minuses or no filter
+            if $scope.tags_filter.length == minuses.length
                 return true
-            for tag in builder.tags
-                if $scope.tags_filter.indexOf(tag) >= 0
+
+            # Then enforce that we have all the tags marked '+'
+            for tag in pluses
+                if builder.tags.indexOf(tag.slice(1)) < 0
+                    return false
+
+            # Then enforce that we have at least one of the tag (marked '+' or not)
+            for tag in $scope.tags_filter
+                if tag.indexOf("+") == 0
+                    tag = tag.slice(1)
+                if builder.tags.indexOf(tag) >= 0
                     return true
             return false
+
         $scope.isTagFiltered = (tag) ->
-            return $scope.tags_filter.length == 0 or $scope.tags_filter.indexOf(tag) >= 0
+            return $scope.tags_filter.length == 0 or $scope.tags_filter.indexOf(tag) >= 0 or
+                $scope.tags_filter.indexOf('+' + tag) >= 0 or $scope.tags_filter.indexOf('-' + tag) >= 0
 
         $scope.toggleTag = (tag) ->
+            if tag.indexOf('+') == 0
+                tag = tag.slice(1)
+            if tag.indexOf('-') == 0
+                tag = tag.slice(1)
             i = $scope.tags_filter.indexOf(tag)
-            if i < 0
+            iplus = $scope.tags_filter.indexOf("+" + tag)
+            iminus = $scope.tags_filter.indexOf("-" + tag)
+            if i < 0 and iplus < 0 and iminus < 0
+                $scope.tags_filter.push("+" + tag)
+            else if iplus >= 0
+                $scope.tags_filter.splice(iplus, 1)
+                $scope.tags_filter.push('-' + tag)
+            else if iminus >= 0
+                $scope.tags_filter.splice(iminus, 1)
                 $scope.tags_filter.push(tag)
             else
                 $scope.tags_filter.splice(i, 1)

www/base/src/app/builders/builders.tpl.jade

@@ -5,6 +5,27 @@
           th Builder Name
           th Builds
           th
+            span(ng-init="help=false", ng-click="help=!help")
+                i.fa.fa-question-circle(style="position:relative")
+                    .popover.bottom.anim-popover(ng-if="help",
+                       style="display:block;min-width:600px;left:-300px;top:30px")
+                        h5.popover-title
+                            | Tags filtering
+                        .popover-content
+                            p
+                              b
+                                  pre +{tag}
+                              | all tags with '+' must be present in the builder tags
+                            p
+                              b
+                                  pre -{tag}
+                              | no tags with '-' must be present in the builder tags
+                            p
+                              b
+                                  pre {tag}
+                              | at least one of the filtered tag should be present
+                            p url bar is updated with you filter configuration, so you can bookmark your filters!
+                        .arrow
             span(ng-show="tags_filter.length==0") Tags
             span(ng-show="tags_filter.length < 5", ng-repeat="tag in tags_filter")
                 span.label.label-success(ng-click="toggleTag(tag)")