@datarailsshared/dr_renderer 1.2.255 → 1.2.256

package/package.json

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

package/src/highcharts_renderer.js

@@ -93,6 +93,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         WATERFALL_VARIANCE: 'DR_WATERFALL_BREAKDOWN_VARIANCE',
     };
 
+    highchartsRenderer.DR_OTHERS_KEY = 'DR_Others';
+
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -464,13 +466,8 @@ 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 ?
-            highchartsRenderer.getOthersName(opts) :
-            undefined;
-        var drOthersInColumn = lodash.find(
-            pivotData.getColKeys(),
-            keys => keys.length && (lodash.includes(keys, 'DR_Others') || lodash.includes(keys, othersName))
-        );
+        const othersName = opts.total_value_options ? highchartsRenderer.getOthersName(opts) : undefined;
+        const drOthersInAxis = highchartsRenderer.getDrOthersInAxisState(pivotData, othersName);
 
         var func = function () {
             var value = parseFloat(this.y);
@@ -497,17 +494,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     cols = this.point.name;
                 }
 
-                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';
-                        }
-                    }
-                }
+                highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
 
                 if (!lodash.isArray(cols)) {
                     cols = [cols];
@@ -619,6 +606,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             percentageLabels = opts.chartLabels;
         }
 
+        const othersName = opts.total_value_options ? highchartsRenderer.getOthersName(opts) : undefined;
+        const drOthersInAxis = highchartsRenderer.getDrOthersInAxisState(pivotData, othersName);
+
         var func = function () {
             const isWaterfallBreakdown = this.series.options.className === SERIES_CLASSNAMES.WATERFALL_BREAKDOWN;
             const isWaterfallWalkthrough = this.series.options.className === SERIES_CLASSNAMES.WATERFALL_WALKTHROUGH;
@@ -659,6 +649,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         rows = temp;
                     }
 
+                    highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
+
                     var category_text = `<span style="font-weight: bold;">
                         ${ lodash.get(this, 'point.options.colsForTotal') ? isWaterfallWalkthrough ? this.key : cols[0] : cols } ${ isWaterfallBreakdown ? ': ' : ' ' }
                     </span>`;
@@ -1040,13 +1032,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             let squareXSum = 0;
             ob.data = [];
             if (row_n_value && row_n_value.length > 0) {
-                ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
+                ob.name = row_n_value.join(highchartsRenderer.delimer)
+                    .replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
             }
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
 
-                if (col_n_value[0] === 'DR_Others') {
+                if (col_n_value[0] === highchartsRenderer.DR_OTHERS_KEY) {
                     col_n_value[0] = othersName;
                 }
 
@@ -1187,7 +1180,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var ob = {};
             ob.data = [];
             if (row_n_value && row_n_value.length > 0) {
-                ob.name = lodash.unescape(row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName));
+                ob.name = lodash.unescape(row_n_value.join(highchartsRenderer.delimer)
+                    .replace(highchartsRenderer.DR_OTHERS_KEY, othersName));
             }
 
             ob.dataLabels = {
@@ -1227,7 +1221,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 tmoobj.name = lodash.unescape(key);
 
                 if (tmoobj.name) {
-                    tmoobj.name = tmoobj.name.replace('DR_Others', othersName);
+                    tmoobj.name = tmoobj.name.replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
                 }
 
                 if (lodash.isEmpty(String(tmoobj.name))) {
@@ -1372,7 +1366,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             const totalColumnValue = pivotData.getAggregator([], col_n_value).value();
             resultObject.data.push({
                 y: totalColumnValue,
-                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                name: lodash.unescape(col_n_value)
+                    .replace(highchartsRenderer.DR_OTHERS_KEY, highchartsRenderer.getOthersName(opts)),
                 isSum: !!col_index,
                 isTotal: true,
                 color: colorOptions.total,
@@ -1390,7 +1385,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         tmoobj.name = lodash.unescape(key);
 
                         if (tmoobj.name) {
-                            tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
+                            tmoobj.name = tmoobj.name
+                                .replace(highchartsRenderer.DR_OTHERS_KEY, highchartsRenderer.getOthersName(opts));
                         }
 
                         if (lodash.isEmpty(String(tmoobj.name))) {
@@ -1496,7 +1492,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             resultObject.data.push({
                 y: val,
-                name: lodash.replace(lodash.unescape(name), 'DR_Others', highchartsRenderer.getOthersName(opts)),
+                name: lodash.replace(
+                    lodash.unescape(name), highchartsRenderer.DR_OTHERS_KEY, highchartsRenderer.getOthersName(opts)
+                ),
                 totalIndex: value.trend === 'total' ? index : undefined,
                 isSum: value.trend === 'total',
                 isTotal: value.trend === 'total',
@@ -1634,7 +1632,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
 
-        const isOthersIncludedInRow = num_rows === 1 && lodash.includes(row_n_keys[0], 'DR_Others');
+        const isOthersIncludedInRow = num_rows === 1 && lodash.includes(row_n_keys[0], highchartsRenderer.DR_OTHERS_KEY);
         const othersName = highchartsRenderer.getOthersName(opts);
 
         lodash.forEach(col_n_keys, function (col_n_value) {
@@ -1654,7 +1652,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 ob.name = "[blank]";
             }
 
-            if (ob.name === 'DR_Others') {
+            if (ob.name === highchartsRenderer.DR_OTHERS_KEY) {
                 ob.name = othersName;
             }
 
@@ -1689,7 +1687,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var col_n = col_n_value[0];
             if (col_n != undefined) {
                 col_ob.id = !isNaN(col_n) ? Number(col_n) : col_n;
-                col_ob.name = col_n === 'DR_Others' ? othersName : col_n;
+                col_ob.name = col_n === highchartsRenderer.DR_OTHERS_KEY ? othersName : col_n;
                 col_ob.data = [];
                 lodash.forEach(row_n_keys, function (row_n_value) {
                     var agg = pivotData.getAggregator(row_n_value, col_n_value);
@@ -1704,7 +1702,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             // }
                         }
 
-                        const row_name = row_n_value[0] === 'DR_Others' ? othersName : row_n_value[0];
+                        const row_name = row_n_value[0] === highchartsRenderer.DR_OTHERS_KEY ? othersName : row_n_value[0];
                         col_ob.data.push([row_name, val]);
                     }
                 });
@@ -8688,7 +8686,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if ($.pivotUtilities && !$.pivotUtilities.additionalFieldsList) {
             $.pivotUtilities.additionalFieldsList = [
                 {key: 'DR_Average', name: 'DR_Average'},
-                {key: 'DR_Others', name: highchartsRenderer.getOthersName(widget.options)}
+                {key: highchartsRenderer.DR_OTHERS_KEY, name: highchartsRenderer.getOthersName(widget.options)}
             ];
         }
 
@@ -9196,7 +9194,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.transformRowsAndColsForBreakdown = function(rows, cols, point, opts) {
         const othersIndex = cols.indexOf(highchartsRenderer.getOthersName(opts));
         if (othersIndex !== -1) {
-            cols[othersIndex] = 'DR_Others';
+            cols[othersIndex] = highchartsRenderer.DR_OTHERS_KEY;
         }
         if (point.options.isTotal) {
             rows = [];
@@ -9254,23 +9252,46 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.buildFilterValuesFromWalkthroughColKey = function(widget, field, filter, colKey) {
         const isTotal = lodash.isArray(colKey);
-        colKey = isTotal ? colKey : [colKey];
-
-        lodash.forEach(colKey, function (colValue) {
-            let value = colValue;
-            if (field.type === 'Date' && !isTotal) {
-                value = highchartsRenderer.createDateFromString(
-                    value,
-                    highchartsRenderer.getDateFieldFormat(widget, field)
-                );
-            }
-            if (!filter.values) {
-                filter.values = [];
-            }
-            filter.values.push(value);
+        if (!filter.values) {
+            filter.values = [];
+        }
+        if (isTotal) {
+            lodash.forEach(colKey, colValue => {
+                filter.values.push(colValue);
+            });
+        } else {
+            filter.values = field.type === 'Date'
+                ? highchartsRenderer.createDateTypeFromValue(colKey, highchartsRenderer.getDateFieldFormat(widget, field))
+                : [colKey];
+            filter.value_to_show = colKey;
+        }
+    }
 
-            if (!isTotal) {
-                filter.value_to_show = colKey[0];
+    highchartsRenderer.getDrOthersInAxisState = function(pivotData, othersName) {
+        const drOthersInAxis = { cols: false, rows: false };
+        lodash.forEach(lodash.keys(drOthersInAxis), axisName => {
+            drOthersInAxis[axisName] = lodash.some(
+                axisName === 'cols' ? pivotData.getColKeys() : pivotData.getRowKeys(),
+                keys => keys.length && (lodash.includes(keys, highchartsRenderer.DR_OTHERS_KEY) || lodash.includes(keys, othersName))
+            );
+        });
+        return drOthersInAxis;
+    }
+
+    highchartsRenderer.replaceDrOthersKeys = function(cols, rows, drOthersInAxis, othersName) {
+        lodash.forEach(lodash.keys(drOthersInAxis), axisName => {
+            if (drOthersInAxis[axisName]) {
+                const isCols = axisName === 'cols';
+                const axisKeys = isCols ? cols : rows;
+
+                if (!lodash.isArray(axisKeys) && othersName === axisKeys) {
+                    isCols ? cols = [highchartsRenderer.DR_OTHERS_KEY] : rows = [highchartsRenderer.DR_OTHERS_KEY];
+                } else if (lodash.isArray(axisKeys)) {
+                    const index = axisKeys.indexOf(othersName);
+                    if (index !== -1) {
+                        axisKeys[index] = highchartsRenderer.DR_OTHERS_KEY;
+                    }
+                }
             }
         });
     }