Merge pull request apache#6 in DATA-PLATFORM/caravel from dev to master

* commit 'ffc86fb7209084b8d0e78edbc9c4fe3b7f37ca7b':
  fix csv button
  stop and remove pm2 entry during run_prod.sh
  Fix bar value markers
  Fix annotatinos for stacked bar chart

caravel/assets/visualizations/nvd3_vis.js

@@ -8,7 +8,6 @@ const nv = require('nvd3');
 require('../node_modules/nvd3/build/nv.d3.min.css');
 require('./nvd3_vis.css');
 
-const minBarWidth = 15;
 const animationTime = 1000;
 
 const addTotalBarValues = function (containerId, chart, data, stacked) {
@@ -43,10 +42,11 @@ const addTotalBarValues = function (containerId, chart, data, stacked) {
       const xPos = parseFloat(rectObj.attr('x'));
       const rectWidth = parseFloat(rectObj.attr('width'));
       const t = groupLabels.append('text')
-        .attr('x', xPos) // rough position first, fine tune later
-        .attr('y', yPos - 5)
+        .attr('x', xPos + 5) // rough position first, fine tune later
+        .attr('y', yPos)
+        .style('font-size', '10px')
         .text(format(stacked ? totalStackedValues[index] : d.y))
-        .attr('transform', transformAttr)
+        .attr('transform', transformAttr + 'rotate(-45,' + xPos + ',' + yPos +')')
         .attr('class', 'bar-chart-label');
       const labelWidth = t.node().getBBox().width;
       t.attr('x', xPos + rectWidth / 2 - labelWidth / 2); // fine tune
@@ -239,11 +239,15 @@ function nvd3Vis(slice) {
 
       const barchartWidth = function () {
         let bars;
+        let minBarWidth = 0;
         if (fd.bar_stacked) {
           bars = d3.max(payload.data, function (d) { return d.values.length; });
         } else {
           bars = d3.sum(payload.data, function (d) { return d.values.length; });
         }
+        if (fd.show_bar_value) {
+          minBarWidth = 10;
+        }
         if (bars * minBarWidth > width) {
           return bars * minBarWidth;
         }
@@ -299,25 +303,28 @@ function nvd3Vis(slice) {
             chart.stacked(stacked);
 
             if (fd.enable_annotations) {
-              const chartData = payload.data[0].values;
-              const latestDataDate = chartData[chartData.length - 1].x;
-
-              const dateValues = {};
-              chartData.forEach(function (barData) {
-                dateValues[barData.x] = true;
-              });
-
               let yMax = 0;
-              payload.annotations.forEach(function (annotation) {
-                const annotationTimestamp = annotation.timestamp;
-                if (!(annotationTimestamp in dateValues)) {
-                  if (annotationTimestamp > latestDataDate) {
-                    chartData.push({ x: annotationTimestamp, y: 0 });
+
+              payload.data.forEach(function (data) {
+                const chartData = data.values;
+                const latestDataDate = chartData[chartData.length - 1].x;
+
+                const dateValues = {};
+                chartData.forEach(function (barData) {
+                  dateValues[barData.x] = true;
+                });
+
+                payload.annotations.forEach(function (annotation) {
+                  const annotationTimestamp = annotation.timestamp;
+                  if (!(annotationTimestamp in dateValues)) {
+                    if (annotationTimestamp > latestDataDate) {
+                      chartData.push({x: annotationTimestamp, y: 0});
+                    }
                   }
-                }
 
-                yMax = yMax > annotation.value ?
-                  yMax : annotation.value;
+                  yMax = yMax > annotation.value ?
+                    yMax : annotation.value;
+                });
               });
               chart.forceY([0, yMax]);
 

caravel/viz.py

@@ -354,7 +354,7 @@ def json_dumps(self, obj):
     def data(self):
         """This is the data object serialized to the js layer"""
         content = {
-            'csv_end*point': self.csv_endpoint,
+            'csv_endpoint': self.csv_endpoint,
             'form_data': self.form_data,
             'json_endpoint': self.json_endpoint,
             'standalone_endpoint': self.standalone_endpoint,

run_prod.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/bash
+/root/node_modules/pm2/bin/pm2 stop caravel
+/root/node_modules/pm2/bin/pm2 delete caravel
 
 python setup.py develop