Merge pull request #140 from 10gen/INT-647_ns-filter

🐛 INT-647 collection filterable mixing got lost at some point

Author: kangas

src/models/mongodb-instance.js

@@ -1,22 +1,23 @@
 var MongoDBInstance = require('mongodb-instance-model');
 var MongoDBCollection = require('./mongodb-collection');
 var scoutClientMixin = require('./scout-client-mixin');
+var filterableMixin = require('ampersand-collection-filterable');
 var selectableMixin = require('./selectable-collection-mixin');
 var toNS = require('mongodb-ns');
 
 /**
  * A user selectable collection of `MongoDBCollection`'s with `specialish`
   * collections filtered out.
  */
-var MongoDBCollectionOnInstanceCollection = MongoDBCollection.Collection.extend(selectableMixin, {
+var MongoDBCollectionOnInstanceCollection = MongoDBCollection.Collection.extend({
   namespace: 'MongoDBCollectionOnInstanceCollection',
   model: MongoDBCollection,
   parse: function(res) {
     return res.filter(function(d) {
       return !toNS(d._id).specialish;
     });
   }
-});
+}, filterableMixin, selectableMixin);
 
 /**
  * Metadata for a MongoDB Instance, such as a `db.hostInfo()`, `db.listDatabases()`,

src/sidebar/collection-filter.js

@@ -1,4 +1,5 @@
 var View = require('ampersand-view');
+var debug = require('debug')('scout:sidebar:collection-filter');
 
 var CollectionFilterView = View.extend({
   template: require('./collection-filter.jade'),
@@ -22,7 +23,9 @@ var CollectionFilterView = View.extend({
     this.search = this.input.value.trim();
   },
   applyFilter: function() {
+    debug('applying filter for `%s`', this.search);
     this.parent.filterCollections(this.search);
+    debug('filter applied');
   }
 });
 module.exports = CollectionFilterView;

src/sidebar/index.js

@@ -1,16 +1,8 @@
 var View = require('ampersand-view');
-var _ = require('lodash');
 var mousetrap = require('mousetrap');
 var CollectionFilterView = require('./collection-filter');
 var CollectionListView = require('./collection-list');
 
-function fast_filter_collection(collection, pattern) {
-  var re = new RegExp(pattern || '.*');
-  collection.filter(function(model) {
-    return re.test(model.getId());
-  });
-}
-
 var SidebarView = View.extend({
   props: {
     open: {
@@ -63,7 +55,11 @@ var SidebarView = View.extend({
     }
   },
   filterCollections: function(pattern) {
-    _.defer(fast_filter_collection, this.collection, pattern);
+    var re = new RegExp(pattern);
+
+    this.collection.filter(function(model) {
+      return re.test(model.getId());
+    });
   }
 });