Merge branch 'dev' into minichart-fixes

Author: rueckstiess

scout-data/contacts-boolean.json

@@ -0,0 +1,8 @@
+{
+  "_id": "{{ObjectID()}}",
+  "contacts": ["{{_$config}}", {}, {
+    "name": "{{chance.name()}}",
+    "email": "{{chance.email()}}",
+    "invitation_accepted": "{{Boolean(chance.bool())}}"
+  }]
+}

scout-data/contacts-number.json

@@ -0,0 +1,8 @@
+{
+  "_id": "{{ObjectID()}}",
+  "contacts": ["{{_$config}}", {}, {
+    "name": "{{chance.name()}}",
+    "email": "{{chance.email()}}",
+    "invitation_accepted": "{{Number(chance.bool())}}"
+  }]
+}

scout-data/contacts-string.json

@@ -0,0 +1,8 @@
+{
+  "_id": "{{ObjectID()}}",
+  "contacts": ["{{_$config}}", {}, {
+    "name": "{{chance.name()}}",
+    "email": "{{chance.email()}}",
+    "invitation_accepted": "{{chance.bool()}}"
+  }]
+}

scout-data/index.js

@@ -14,26 +14,51 @@ var createUsers = function(opts) {
   })).pipe(dest);
 };
 
-var createPaymentMethods = function(opts) {
+var createContactsNumber = function(opts) {
   var dest = new MongoWritableStream({
     url: opts.url,
-    collection: 'payment_methods'
+    collection: 'contacts'
   });
-  var src = fs.createReadStream(__dirname + '/payment-methods.json');
+  var src = fs.createReadStream(__dirname + '/contacts-number.json');
+  return src.pipe(datasets.createGeneratorStream({
+    size: 1000
+  })).pipe(dest);
+};
+var createContactsString = function(opts) {
+  var dest = new MongoWritableStream({
+    url: opts.url,
+    collection: 'contacts'
+  });
+  var src = fs.createReadStream(__dirname + '/contacts-string.json');
+  return src.pipe(datasets.createGeneratorStream({
+    size: 1000
+  })).pipe(dest);
+};
+var createContactsBoolean = function(opts) {
+  var dest = new MongoWritableStream({
+    url: opts.url,
+    collection: 'contacts'
+  });
+  var src = fs.createReadStream(__dirname + '/contacts-boolean.json');
   return src.pipe(datasets.createGeneratorStream({
     size: 1000
   })).pipe(dest);
 };
-
 module.exports = function(opts, done) {
   opts = opts || {};
   opts.url = opts.url || 'mongodb://localhost:27017/datasets';
   async.parallel({
     users: function(cb) {
       createUsers(opts).on('end', cb);
     },
-    payment_methods: function(cb) {
-      createPaymentMethods(opts).on('end', cb);
+    contacts_string: function(cb) {
+      createContactsString(opts).on('end', cb);
+    },
+    contacts_number: function(cb) {
+      createContactsNumber(opts).on('end', cb);
+    },
+    contacts_boolean: function(cb) {
+      createContactsBoolean(opts).on('end', cb);
     }
   }, done);
 };

scout-data/payment-methods.json

@@ -22,15 +22,15 @@ module.exports.create = function() {
 };
 
 app.on('ready', function() {
-  var height = 600;
+  var height = 700;
   if (process.platform === 'win32') {
     height += 60;
   } else if (process.platform === 'linux') {
     height += 30;
   }
   debug('loading main window', DEFAULT_URL);
   main = module.exports.main = new BrowserWindow({
-    width: 800,
+    width: 1024,
     height: height,
     'web-preferences': {
       'subpixel-font-scaling': true,

scout-electron/lib/window-manager.js

@@ -35,7 +35,10 @@ function prepare(socket, req, done) {
 
     var tasks = {};
     tasks.token = function(next) {
-      brain.loadToken(socket.decoded_token, req, next);
+      brain.loadToken(socket.decoded_token, req, function() {
+        debug('load token returned', arguments);
+        next();
+      });
     };
 
     if (req.params.ns) {

scout-server/lib/io.js

@@ -51,23 +51,23 @@
     "ampersand-view": "^7.0.1",
     "ampersand-view-switcher": "^2.0.0",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.2.tar.gz",
+    "d3": "^3.5.5",
+    "d3-tip": "^0.6.7",
     "debug": "^2.0.0",
     "domready": "^1.0.7",
     "event-stream": "^3.3.0",
     "flatnest": "^0.2.2",
     "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.3.0.tar.gz",
     "jade": "^1.9.2",
     "jquery": "^2.1.1",
+    "lodash": "^3.8.0",
     "moment": "^2.8.2",
+    "mongodb-schema": "git://github.com/mongodb-js/mongodb-schema.git#ampersand",
     "numeral": "^1.5.3",
     "octicons": "https://github.com/github/octicons/archive/v2.2.0.tar.gz",
     "phantomjs-polyfill": "0.0.1",
     "qs": "^2.2.4",
-    "underscore": "^1.6.0",
-    "mongodb-schema": "git://github.com/mongodb-js/mongodb-schema.git#ampersand",
-    "d3": "^3.5.5",
-    "d3-tip": "^0.6.7",
-    "lodash": "^3.8.0"
+    "underscore": "^1.6.0"
   },
   "devDependencies": {
     "browserify": "^9.0.3",

scout-ui/package.json

@@ -4,13 +4,22 @@ var MinichartView = require('../minicharts');
 var FieldCollection = require('mongodb-schema').FieldCollection;
 var ViewSwitcher = require('ampersand-view-switcher');
 var _ = require('lodash');
-var debug = require('debug')('scout-ui:field-list');
 
 var BasicFieldView = View.extend({
   bindings: {
-    'model._id': {
-      hook: 'name'
-    }
+    'model._id': [
+      {
+        hook: 'name'
+      },
+      {
+        hook: 'name',
+        type: function(el) {
+          if (this.model._id === '__basic__') {
+            el.classList.add('hidden');
+          }
+        }
+      }
+    ]
   },
   template: require('./basic-field.jade'),
   subviews: {
@@ -28,10 +37,10 @@ var BasicFieldView = View.extend({
   initialize: function() {
     var that = this;
     // the debounce cuts down computation time by a factor of 5-10 here
-    this.model.on('change', _.debounce(function(model) {
+    this.model.types.on('sync', _.debounce(function() {
       // for now pick first type, @todo: make the type bars clickable and toggle chart
-      that.switchView(model.types.at(0));
-    }, 100));
+      that.switchView(that.model.types.at(0));
+    }, 300));
   },
   render: function() {
     this.renderWithTemplate(this);

scout-ui/src/field-list/index.js

@@ -1,6 +1,8 @@
 var AmpersandView = require('ampersand-view');
 var $ = require('jquery');
 var format = require('util').format;
+var _ = require('underscore');
+var numeral = require('numeral');
 
 require('bootstrap/js/tooltip');
 
@@ -21,18 +23,27 @@ module.exports = AmpersandView.extend({
       {
         hook: 'bar',
         type: function(el) {
-          var percent = Math.min(this.model.probability * 100, 100);
           $(el).css({
-            width: percent + '%'
+            width: Math.floor(this.model.probability * 100) + '%'
           });
-          if (percent) {
-            $(el).tooltip({
-              title: format('%s (%d%)', this.model.getId(), percent)
-            });
-          }
         }
       }
     ]
   },
+  derived: {
+    percent: {
+      deps: ['model.probability'],
+      fn: function() {
+        return this.model.probability;
+      }
+    }
+  },
+  initialize: function() {
+    this.listenTo(this.model, 'change:probability', _.debounce(function() {
+      $(this.el).tooltip({
+        title: format('%s (%s)', this.model.getId(), numeral(this.model.probability).format('%'))
+      });
+    }.bind(this), 300));
+  },
   template: require('./type-list-item.jade')
 });