made sampling message dynamic

Author: Thomas Rueckstiess

src/models/sampled-schema.js

@@ -123,6 +123,7 @@ module.exports = Schema.extend({
     };
     var start = new Date();
     var timeAtFirstDoc;
+    var avgTimePerDoc = 0;
     var erroredOnDocs = [];
 
     // No results found
@@ -143,6 +144,7 @@ module.exports = Schema.extend({
       if (!timeAtFirstDoc) {
         timeAtFirstDoc = new Date();
       }
+      var timePerDoc = new Date();
       try {
         model.parse(doc);
       } catch (err) {
@@ -152,6 +154,9 @@ module.exports = Schema.extend({
           schema: model.serialize()
         });
       }
+      timePerDoc = new Date() - timePerDoc;
+      avgTimePerDoc += timePerDoc;
+      debug('avg time', timePerDoc);
       cb(null, doc);
     };
 
@@ -170,12 +175,13 @@ module.exports = Schema.extend({
       metrics.track('Schema: Complete', {
         Duration: new Date() - start,
         'Total Document Count': model.total,
-        'Document Count': model.documents,
+        'Sample Size': model.documents.length,
         'Errored Document Count': erroredOnDocs.length,
         'Time to First Doc': timeAtFirstDoc - start,
-        'Schema Height': model.height, // # of top level keys
-        'Schema Width': model.width, // max nesting depth
-        'Schema Sparsity': model.sparsity // lots of fields missing or consistent
+        'Average Time Per Doc': avgTimePerDoc / model.documents.length
+        // 'Schema Height': model.height, // # of top level keys
+        // 'Schema Width': model.width, // max nesting depth
+        // 'Schema Sparsity': model.sparsity // lots of fields missing or consistent
       });
       options.success({});
     };

src/refine-view/index.less

@@ -20,7 +20,7 @@
     }
   }
   .sampling-message {
-    font-size: 14px;
+    font-size: 12px;
     font-weight: 200;
     padding: 5px 25px;
     border-bottom: 2px solid @gray7

src/sampling-message/index.jade

@@ -1,5 +1,12 @@
 .sampling-message
-  span(data-hook='is_sample') Query returned ### documents. This report is based on a sample of 
-  span(data-hook='is_query') Query returned 
-  span(data-hook='sample_size_message')
-  |.
+  if is_sample
+    | Query returned 
+    b #{formatted_total_count}
+    |  #{total_count_document}.
+    | This report is based on a sample of 
+    b #{formatted_sample_size}
+    |  #{sample_size_document}.
+  else
+    | Query returned 
+    b #{formatted_sample_size}
+    |  #{sample_size_document}.

src/sampling-message/index.js

@@ -2,71 +2,83 @@ var View = require('ampersand-view');
 var pluralize = require('pluralize');
 var format = require('util').format;
 var app = require('ampersand-app');
+var numeral = require('numeral');
 var debug = require('debug')('scout:sampling-message:index');
 
 var SamplingMessageView = View.extend({
+  template: require('./index.jade'),
   session: {
     parent: 'state'
   },
-  bindings: {
-    visible: {
-      type: 'booleanClass',
-      no: 'hidden'
-    },
-    sample_size_message: {
-      hook: 'sample_size_message'
-    },
-    is_sample: [
-      {
-        hook: 'is_sample',
-        type: 'booleanClass',
-        no: 'hidden'
-      },
-      {
-        hook: 'is_query',
-        type: 'booleanClass',
-        yes: 'hidden'
-      }
-    ]
-  },
   props: {
-    schema_sample_size: {
+    sample_size: {
+      type: 'number',
+      default: 0
+    },
+    total_count: {
       type: 'number',
       default: 0
     }
   },
   derived: {
     visible: {
-      deps: ['schema_sample_size'],
+      deps: ['sample_size'],
       fn: function() {
-        return this.schema_sample_size > 0;
+        return this.sample_size > 0;
       }
     },
     is_sample: {
-      deps: ['schema_sample_size'],
+      deps: ['sample_size'],
+      fn: function() {
+        return this.sample_size === app.queryOptions.size;
+      }
+    },
+    formatted_total_count: {
+      deps: ['total_count'],
       fn: function() {
-        return this.schema_sample_size === app.queryOptions.size;
+        return numeral(this.total_count).format('0,0');
       }
     },
-    sample_size_message: {
-      deps: ['schema_sample_size'],
+    formatted_sample_size: {
+      deps: ['sample_size'],
       fn: function() {
-        return format('%d %s', this.parent.parent.schema.sample_size,
-          pluralize('document', this.parent.parent.schema.sample_size));
+        return numeral(this.sample_size).format('0,0');
+      }
+    },
+    total_count_document: {
+      deps: ['total_count'],
+      fn: function() {
+        return pluralize('document', this.total_count);
+      }
+    },
+    sample_size_document: {
+      deps: ['sample_size'],
+      fn: function() {
+        return pluralize('document', this.sample_size);
       }
     }
   },
-  template: require('./index.jade'),
+  bindings: {
+    visible: {
+      type: 'booleanClass',
+      no: 'hidden'
+    }
+  },
   initialize: function() {
     this.listenTo(this.parent.parent.schema, 'request', this.hide.bind(this));
     this.listenTo(this.parent.parent.schema, 'sync', this.show.bind(this));
   },
   hide: function() {
-    this.schema_sample_size = 0;
+    this.sample_size = 0;
+    this.total_count = 0;
   },
   show: function() {
-    debug('actual count', this.parent.parent.schema.total);
-    this.schema_sample_size = this.parent.parent.schema.sample_size;
+    this.sample_size = this.parent.parent.schema.sample_size;
+    this.total_count = this.parent.parent.schema.total;
+    this.render();
+  },
+  render: function() {
+    this.renderWithTemplate(this);
   }
 });
 module.exports = SamplingMessageView;