@datarailsshared/dr_renderer 1.2.125 → 1.2.128

package/.circleci/config.yml

@@ -29,7 +29,17 @@ jobs:
       - run:
           name: Publish package
           command: npm publish . --access=public
-
+      - run:
+          name: prepare git tag
+          command: |
+            VERSION="1.2.$CIRCLE_BUILD_NUM"
+            git config --global user.email noreplay@circleci.com
+            git config --global user.name circleci
+            git config --global -l
+            git tag -a "$CIRCLE_BRANCH/$VERSION" -m "circleci build"
+            ssh -o "StrictHostKeyChecking no" -T git@bitbucket.org
+            git push --tags origin
+            echo 555
 workflows:
   version: 2
   npm-publish:

package/package.json

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

package/src/highcharts_renderer.js

@@ -422,6 +422,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         const labelOptions = lodash.get(opts.chartOptions, 'label') || lodash.get(opts.chartOptions, 'label_pie');
+        const othersName = opts.total_value_options ?
+            lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others' :
+            undefined;
+        var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && (keys.includes('DR_Others') || keys.includes(othersName)));
 
         var func = function () {
             var value = parseFloat(this.y);
@@ -447,8 +451,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     cols = this.point.name;
                 }
                 
-                var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && lodash.includes(keys, 'DR_Others')) || [];
-                if (!lodash.isArray(cols) && drOthersInColumn[0] !== 'DR_Others') {
+                if (drOthersInColumn) {
+                    if (!lodash.isArray(cols) && othersName === cols) {
+                        cols = ['DR_Others'];
+                    } else if (lodash.isArray(cols)) {
+                        var index = cols.indexOf(othersName);
+
+                        if (index !== -1) {
+                            cols[index] = 'DR_Others';
+                        }
+                    }
+                }
+
+                if (!lodash.isArray(cols)) {
                     cols = [cols];
                 }
 
@@ -1109,7 +1124,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             ob.dataLabels = {
                 allowOverlap: additionOptions && additionOptions.label ? additionOptions.label.overlap : false,
                 enabled: additionOptions && additionOptions.label ? additionOptions.label.show : true,
-                formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions}),
+                formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions, total_value_options: opts.total_value_options}),
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions)
             }
 
@@ -7895,13 +7910,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         // another code for charts and tables
+        let default_show = lodash.get(widget_obj.options, 'chartOptions.default_show.value', 'chart');
 
         let subopts = null;
+        let is_table = false;
 
-        subopts = highchartsRenderer.getSupOptionsForPivot(widget_obj, pivot, true);
-        subopts.onlyOptions = true;
+        if (default_show == "table"){
+            subopts = highchartsRenderer.getOptionsForTable(widget_obj, pivot);
+            is_table = true;
+        }
+        else{
+            subopts = highchartsRenderer.getSupOptionsForPivot(widget_obj, pivot, true);
+            subopts.onlyOptions = true;
+        }
 
-        let hc_options = highchartsRenderer.rhPivotView(res, subopts, false);
+        let hc_options = highchartsRenderer.rhPivotView(res, subopts, is_table);
 
         return hc_options;
     }