Merge pull request #209 from jeyrschabu/fix_project_search

Fixing a bug where search returned everything even on no match
spinnaker · Mar 1, 2017 · a8a3d0a · a8a3d0a
2 parents 5ae31d8 + 7b2e040
commit a8a3d0a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...eb/src/main/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.groovy b/...eb/src/main/groovy/com/netflix/spinnaker/front50/controllers/v2/ProjectsController.groovy
@@ -130,15 +130,18 @@ public class ProjectsController {
   }
 
   Set<Project> filter(Collection<Project> projects, Map<String, String> attributes) {
-    attributes = attributes.collect { k,v -> [ k.toLowerCase(), v ] }.collectEntries()
+    attributes = attributes.collect {
+      k,v -> [ k.toLowerCase(), v ]
+    }.findAll { k, v -> v }.collectEntries()
+
     Set<Project> items = new HashSet<>()
 
     if (attributes.containsKey("applications")) {
       List<String> applications = attributes.applications.split(",")
       items = projects.findAll { project ->
         project.config.applications?.find { app -> applications.any { app.toLowerCase().contains(it.toLowerCase()) } } ||
           project.config.clusters?.find { cluster ->
-            cluster.applications?.collect { app -> applications.any { app.toLowerCase().contains(it.toLowerCase()) } }
+            cluster.applications?.find { app -> applications.any { app.toLowerCase().contains(it.toLowerCase()) } }
           }
       }
       attributes.remove("applications")