Merge pull request apache#5 in DATA-PLATFORM/caravel from annotation-…

…stacked to dev

* commit '49659d816569dd5a82430d52d3f85adfd023a173':
  fix csv button
  stop and remove pm2 entry during run_prod.sh
  Fix bar value markers

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;
         }

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