Merge branch 'master' of github.com:huboard/huboard-web

Author: rauhryan

ember-app/app/controllers/index.js

@@ -10,7 +10,8 @@ var IndexController = Ember.Controller.extend({
     {"qps.repoParams": "repo"},
     {"qps.assigneeParams": "assignee"},
     {"qps.milestoneParams": "milestone"},
-    {"qps.labelParams": "label"}
+    {"qps.labelParams": "label"},
+    {"qps.cardParams": "card"}
   ],
   applyUrlFilters: function(){
     var self = this;

ember-app/app/controllers/milestones.js

@@ -12,7 +12,8 @@ var MilestonesController = Ember.Controller.extend({
     {"qps.repoParams": "repo"},
     {"qps.assigneeParams": "assignee"},
     {"qps.milestoneParams": "milestone"},
-    {"qps.labelParams": "label"}
+    {"qps.labelParams": "label"},
+    {"qps.cardParams": "card"}
   ],
   applyUrlFilters: function(){
     var self = this;

ember-app/app/mixins/issue-filters.js

@@ -29,11 +29,12 @@ var IssueFiltersMixin = Ember.Mixin.create({
 
     this.mergeUserAndMemberGroups(filter_groups, strategy);
 
-    _.each(filter_groups[strategy], (function(value){
-      filters_active.push(value.length);
-      results.push(strategy_function(value, item));
+    _.each(filter_groups[strategy], (function(group){
+      if(group.length){
+        filters_active.push(group.length);
+        results.push(strategy_function(group, item));
+      }
     }));
-    filters_active = filters_active.filter(function(count){ return count > 0;});
 
     return this.compareFilterResults(results, filters_active);
   },

ember-app/app/services/filter-groups.js

@@ -7,8 +7,9 @@ var FilterGroups = Ember.Service.extend({
   user: Ember.inject.service("filter_groups/user"),
   member: Ember.inject.service("filter_groups/member"),
   search: Ember.inject.service("filter_groups/search"),
+  card: Ember.inject.service("filter_groups/card"),
 
-  groups: ["board", "milestone", "label", "user", "member", "search"],
+  groups: ["board", "milestone", "label", "user", "member", "search", "card"],
   setGroups: function(model){
     var self = this;
     this.get("groups").forEach(function(group){
@@ -26,8 +27,9 @@ var FilterGroups = Ember.Service.extend({
             .concat(this.get("board.filters"))
             .concat(this.get("label.filters"))
             .concat(this.get("member.filters"))
-            .concat(this.get("search.filters"));
-  }.property("{board,milestone,label,user,member,search}.filters.@each.mode"),
+            .concat(this.get("search.filters"))
+            .concat(this.get("card.filters"));
+  }.property("{board,milestone,label,user,member,search,card}.filters.@each.mode"),
 
   active: function(){
     return this.get("allFilters").any(function(f){

ember-app/app/services/filter_groups/card.js

@@ -0,0 +1,31 @@
+import Ember from "ember";
+
+var CardFilters = Ember.Service.extend({
+  filters: [],
+  strategy: "grouping",
+
+  create: function(){
+    this.set("filters", [
+      Ember.Object.create({
+        name: "Issues only",
+        queryParam: "card",
+        mode: 0,
+        condition: function(i){
+          return !i.pull_request;
+        }
+      }),
+      Ember.Object.create({
+        name: "Pull requests only",
+        queryParam: "card",
+        mode: 0,
+        condition: function(i){
+          return i.pull_request;
+        }
+      })
+    ]);
+
+    return this.get("filters");
+  }
+});
+
+export default CardFilters;

ember-app/app/services/filters.js

@@ -136,6 +136,15 @@ var FiltersService = Ember.Service.extend({
       });
     }
   }.observes("filterGroups.milestone.filters.@each.mode"),
+  forceOnlyOneActiveCard: function(){
+    var filters = this.get("cardFilters");
+    if (filters && filters.length){
+      var active = filters.filter(function(f){
+        return f.mode === 1 || f.mode === 2;
+      });
+      if(active.length > 1){ filters.setEach("mode", 0); }
+    }
+  }.observes("filterGroups.card.filters.@each.mode"),
   groupActive: function(filters){
     if (!filters || !filters.length){ return false;}
     return filters.any(function(f){

ember-app/app/services/query-params.js

@@ -5,35 +5,40 @@ var queryParamsService = Ember.Service.extend({
 
   clear: function(){
     var self = this;
-    var params = ["repo", "assignee", "milestone", "label"];
-    params.forEach(function(param){
+    this.get("filterNames").forEach(function(param){
       return self.set(`${param}Params`, []);
     });
     this.set("filterParamsBuffer", {});
     this.set("searchParams", "");
     this.set("searchParamsBuffer", "");
   },
+  clearOnEmpty: function(){
+    if(!this.get("filters.hideFilters.length")){
+      this.clear();
+    };
+  }.observes("filters.hideFilters.[]"),
 
   ////Query Params for Filters
   repoParams: [],
   assigneeParams: [],
   milestoneParams: [],
   labelParams: [],
-  filterNames: ["repo", "assignee", "milestone", "label"],
+  cardParams: [],
+  filterNames: ["repo", "assignee", "milestone", "label", "card"],
   allFilterParams: function(){
     var self = this;
     var filters = this.get("filterNames").map(function(param){
       return self.get(`${param}Params`);
     });
     return _.flatten(filters);
-  }.property("{repo,assignee,milestone,label}Params"),
+  }.property("{repo,assignee,milestone,label,card}Params"),
 
-  //Push board, label and milestone filters to the URL
+  //Push board, label, card and milestone filters to the URL
   updateFilterParams: function(){
     if(!this.get("filters.filterGroups.created")){return;}
     var self = this;
     var filters_object = this.get("filters.allFiltersObject");
-    ["board", "label", "milestone"].forEach(function(param){
+    ["board", "label", "milestone", "card"].forEach(function(param){
       var hidden_filters = filters_object[param].filter(function(f){
         return f.mode === 2;
       }).map(function(f){return f.name; });
@@ -74,7 +79,8 @@ var queryParamsService = Ember.Service.extend({
         repo: this.get("repoParams"),
         assignee: this.get("assigneeParams"),
         milestone: this.get("milestoneParams"),
-        label: this.get("labelParams")
+        label: this.get("labelParams"),
+        card: this.get("cardParams")
       });
     }
   }.observes("allFilterParams.[]"),
@@ -86,6 +92,7 @@ var queryParamsService = Ember.Service.extend({
       this.set("assigneeParams", buffer.assignee);
       this.set("milestoneParams", buffer.milestone);
       this.set("labelParams", buffer.label);
+      this.set("cardParams", buffer.card);
       this.set("filterParamsBuffer", {});
     }
   },

ember-app/app/templates/filters.hbs

@@ -4,6 +4,11 @@
     {{hb-filter name=filter.name mode=filter.mode color=filter.color tagType="colored" queryParam="repo"}}
   {{/each}}
 
+  <h5>Cards</h5>
+  {{#each filters.cardFilters as |filter|}}
+    {{hb-filter name=filter.name mode=filter.mode color=filter.color}}
+  {{/each}}
+
   <h5>Assignment</h5>
   {{#each filters.userFilters as |filter|}}
     {{hb-filter name=filter.name mode=filter.mode color=filter.color queryParam="member"}}