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

Author: rauhryan

ember-app/app/models/board.js

@@ -24,7 +24,7 @@ var Board = Ember.Object.extend({
     return _.union.apply(_,[this.other_labels]
                     .concat(this.linkedRepos.map(function (r){return r.other_labels; })));
 
-  }.property("linkedRepos.@each.issues.length", "issues.length"),
+  }.property("linkedRepos.@each.issues.[]", "issues.[]"),
   filterLabels: function () {
     var labels = this.get("combinedLabels");
 
@@ -35,21 +35,21 @@ var Board = Ember.Object.extend({
             }).value().sort(function (a,b){
                return a.name.localeCompare(b.name);
             });
-  }.property(),
+  }.property("combinedLabels", "combinedLabels.[]"),
   filterMilestones: function () {
     return _.chain(this.get("combinedMilestones"))
             .map(function (g) {
               return _.first(g);
             })
             .value();
-  }.property("combinedMilestones"),
+  }.property("combinedMilestones.[]"),
   combinedMilestones: function(){
     var milestones = _.union.apply(_,[this.milestones]
                     .concat(this.linkedRepos.map(function (r){return r.milestones; })));
     return _.chain(milestones)
             .groupBy(function(l){return l.title.toLocaleLowerCase(); })
             .value();
-  }.property("milestones.length","linkedRepos.@each.milestones.length"),
+  }.property("milestones.[]","linkedRepos.@each.milestones.[]"),
   combinedAssignees: function(){
     var assignees = this.get("assignees");
     var linked = this.get("linkedRepos").map(function(repo){

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

@@ -12,7 +12,9 @@ var FilterGroups = Ember.Service.extend({
   setGroups: function(model){
     var self = this;
     this.get("groups").forEach(function(group){
-      self.get(group).create(model);
+      var group = self.get(group);
+      group.set('model', model);
+      group.create(model);
     });
     this.set("created", true);
   },

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

@@ -1,33 +1,59 @@
 import Ember from 'ember';
 
+function attr(modelProp, map) {
+  return Ember.computed("model." + modelProp, "model." + modelProp + ".[]", {
+    get: function(key){
+      var model = this.get('model');
+
+      var filters = this.get("model." + modelProp).map(map);
+
+      filters.insertAt(0, Ember.Object.create({
+      name: model.get('repo.name'),
+      queryParam: "repo",
+      mode:0,
+      color: "7965cc",
+      condition:function(i){
+        return i.repo.name === model.get('repo.name');
+      }
+    }));
+      if(this._filters){
+        this._filters.forEach(function(f){
+          var newOne = filters.findBy('name', f.name);
+          if(newOne){
+            newOne.set('mode', f.mode);
+          }
+        });
+      }
+      this._filters = filters;
+
+      return filters;
+    },
+    set: function(key, value){
+      this.set("model." + key, value);
+      return value;
+    }
+  });
+}
+
 var BoardFilters = Ember.Service.extend({
   filters: [],
   strategy: "inclusive",
 
   create: function(model){
     var owner = model.get("full_name").split("/")[0];
 
-    this.set("filters", model.get("link_labels").map(function(l){
-       var name = owner === l.user ? l.repo : l.user + "/" + l.repo;
+    this.set("filters", attr("linkedRepos", function(l){
+       var name = owner === l.repo.owner.login ? l.repo.name : l.repo.full_name;
        return Ember.Object.create({
         name: name,
         queryParam: "repo",
         mode:0,
-        color: l.color,
+        color: l.repo.color,
         condition:function(i){
-          return i.repo.name === l.repo && i.repo.owner.login === l.user;
+          return i.repo.name === l.repo.name && i.repo.owner.login === l.repo.owner.login;
         }
        });
     }));
-    this.get("filters").insertAt(0, Ember.Object.create({
-      name: model.get('repo.name'),
-      queryParam: "repo",
-      mode:0,
-      color: "7965cc",
-      condition:function(i){
-        return i.repo.name === model.get('repo.name');
-      }
-    }));
 
     return this.get("filters");
   }

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

@@ -1,11 +1,36 @@
 import Ember from 'ember';
 
+function attr(modelProp, map) {
+  return Ember.computed("model." + modelProp, "model." + modelProp + ".[]", {
+    get: function(key){
+
+      var filters = this.get("model." + modelProp).map(map);
+
+      if(this._filters){
+        this._filters.forEach(function(f){
+          var newOne = filters.findBy('name', f.name);
+          if(newOne){
+            newOne.set('mode', f.mode);
+          }
+        });
+      }
+      this._filters = filters;
+
+      return filters;
+    },
+    set: function(key, value){
+      this.set("model." + key, value);
+      return value;
+    }
+  });
+}
+
 var LabelFilters = Ember.Service.extend({
   filters: [],
   strategy: "grouping",
 
   create: function(model){
-    this.set("filters", model.get("filterLabels").map(function(l){
+    this.set("filters", attr("filterLabels", function(l){
        return Ember.Object.create({
         name: l.name,
         queryParam: "label",

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

@@ -16,7 +16,7 @@ var MemberFilters = Ember.Service.extend({
   },
 
   filters : function () {
-     return this.get("avatars").map(function(a){
+     var filters = this.get("avatars").map(function(a){
        return Ember.Object.create({
          name: a.login,
          avatar : a,
@@ -26,6 +26,16 @@ var MemberFilters = Ember.Service.extend({
          }
        });
      });
+      if(this._filters){
+        this._filters.forEach(function(f){
+          var newOne = filters.findBy('name', f.name);
+          if(newOne){
+            newOne.set('mode', f.mode);
+          }
+        });
+      }
+      this._filters = filters;
+      return filters;
   }.property("avatars"),
 
   avatars : function () {

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

@@ -1,29 +1,50 @@
 import Ember from 'ember';
 
+function attr(modelProp, map) {
+  return Ember.computed("model." + modelProp, {
+    get: function(key){
+      var filters = this.get("model." + modelProp).map(map);
+      filters.insertAt(0, Ember.Object.create({
+        name: 'No milestone',
+        queryParam: "milestone",
+        mode:0,
+        condition:function(i){
+          return i.milestone == null;
+        }
+      }));
+      if(this._filters){
+        this._filters.forEach(function(f){
+          var newOne = filters.findBy('name', f.name);
+          if(newOne){
+            newOne.set('mode', f.mode);
+          }
+        });
+      }
+      this._filters = filters;
+      return filters;
+    },
+    set: function(key, value){
+      this.set("model." + key, value);
+      return value;
+    }
+  });
+}
+
 var MilestoneFilters = Ember.Service.extend({
   filters: [],
   strategy: "inclusive",
 
   create: function(model){
-    this.set("filters", model.get("filterMilestones").map(function(m){
-       return Ember.Object.create({
+    this.set("filters", attr("filterMilestones", function(m){
+      return Ember.Object.create({
         name: m.title,
         queryParam: "milestone",
         mode:0,
         condition:function(i){
-         return i.milestone && i.milestone.title.toLocaleLowerCase() === m.title.toLocaleLowerCase();
+          return i.milestone && i.milestone.title.toLocaleLowerCase() === m.title.toLocaleLowerCase();
         }
-       });
-    }));
-    this.get("filters").insertAt(0, Ember.Object.create({
-      name: 'No milestone',
-      queryParam: "milestone",
-      mode:0,
-      condition:function(i){
-        return i.milestone == null;
-      }
+      });
     }));
-
     return this.get("filters");
   }
 });

ember-app/app/services/filters.js

@@ -1,5 +1,13 @@
 import Ember from "ember";
 
+function attr(group) {
+  return Ember.computed('filterGroups.' + group + ".filters", {
+    get: function(key){
+      return this.get('filterGroups.' + group + ".filters");
+    }
+  });
+}
+
 var FiltersService = Ember.Service.extend({
   //filterGroups requires setGroups(model) before it yields
   //anything meaningful to the FiltersService
@@ -11,7 +19,8 @@ var FiltersService = Ember.Service.extend({
     if (!this.get("filterGroups.created")){ return; }
     key = key.replace("Filters", "");
     if (this.get("filterGroups." + key + ".filters")){
-      return this.get("filterGroups." + key + ".filters");
+      this.set(key+ "Filters", attr(key));
+      return this.get(key + "Filters");
     }
   },
 

ember-app/app/views/issue/create.js

@@ -33,10 +33,10 @@ var IssuesCreateView = ModalView.extend(KeyPressHandlingMixin, {
     return false;
   },
   focusTitleField: function(){
-      Ember.run.schedule("afterRender", this, "focusTextbox");
+    Ember.run.schedule("afterRender", this, "focusTextbox");
   }.on("init"),
   focusTextbox: function(){
-    var input = this.$("input");
+    var input = this.$("input").first();
     input.focus();
   }
 });

lib/bridge/github/board.rb

@@ -47,6 +47,7 @@ def linked?(user, repo)
     def linked(user, repo)
       label = link_labels.find{|l| l['user'] == user && l['repo'] == repo}
       board = Board.new(user, repo, @connection_factory).meta
+      board[:repo][:color] = label['color']
       board[:issues] = board[:issues].map {|i| i.merge({ color: label['color'] })}
       board
     end