@datarailsshared/dr_renderer 1.2.265 → 1.2.268

package/.circleci/config.yml

@@ -1,8 +1,7 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check {{ '/2.0/language-javascript/' | docs_url }} for more details
-#
-version: 2
+version: 2.1
+
+orbs:
+  datarails-cicd-orb: datarails/datarails-cicd-orb@dev:primary
 
 defaults: &defaults
   working_directory: ~/repo
@@ -40,6 +39,11 @@ jobs:
       - run:
           name: Publish package
           command: npm publish . --access=public
+      - datarails-cicd-orb/add-ssh-id:
+          private_key_env_var: bitbucket_deploy_private_encoded
+          public_key_env_var: bitbucket_deploy_pub_encoded
+          is_public_key_encoded: true
+          is_private_key_encoded: true
       - run:
           name: prepare git tag
           command: |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.265",
+  "version": "1.2.268",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -493,6 +493,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (!cols && is_drill_down_pie) {
                     cols = this.point.name;
                 }
+                const row_n_keys = pivotData.getRowKeys();
 
                 if (!lodash.isArray(cols)) {
                     cols = [cols];
@@ -522,8 +523,20 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
 
                     if (labelOptions.show_out_of_data_series) {
-                        const dataSeriesTotal = pivotData.getAggregator(rows, []).value();
-                        const outOfDataSeriesPercentages = dataSeriesTotal ? Math.round(value / dataSeriesTotal * 100) + '%' : '';
+                        let dataSeriesTotal;
+                        let outOfDataSeriesPercentages;
+
+                        if (this.series.options.className === SERIES_CLASSNAMES.WATERFALL_BREAKDOWN) {
+                            dataSeriesTotal = row_n_keys.reduce((a, d) => {
+                                return a + pivotData.getAggregator(d, []).value();
+                            }, 0);
+                            const axisTotal = pivotData.getAggregator([], cols).value();
+                            outOfDataSeriesPercentages = !axisTotal ? Math.round(value / dataSeriesTotal * 100) + '%' : '';
+                        } else {
+                            dataSeriesTotal = pivotData.getAggregator(rows, []).value();
+                            outOfDataSeriesPercentages = dataSeriesTotal ? Math.round(value / dataSeriesTotal * 100) + '%' : '';
+                        }
+
                         outOfDataSeriesPercentages && percentageArray.push(outOfDataSeriesPercentages);
                     }