@datarailsshared/dr_renderer 1.4.116 → 1.4.121

package/package.json

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

package/src/highcharts_renderer.js

@@ -702,11 +702,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var value = parseFloat(this.y);
 
             if (pivotData) {
+                const isChartWithMultiValues = highchartsRenderer.isChartWithMultiValues(pivotData);
                 let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this);
                 var rows = series_name.split(highchartsRenderer.delimer);
+                var cols = highchartsRenderer.getColsInFormatterContext(this);
 
-                if (is_drill_down_pie && highchartsRenderer.selfStartsWith(series_name, "Series ")) {
+                if (is_drill_down_pie && (highchartsRenderer.selfStartsWith(series_name, "Series ") || isChartWithMultiValues)) {
                     rows = [];
+
+                    if (isChartWithMultiValues) {
+                        cols = pivotData.getColKeys()[0];
+                    }
                 }
 
                 if (pivotData.rowAttrs.length == 0
@@ -715,7 +721,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     rows = [];
                 }
 
-                var cols = highchartsRenderer.getColsInFormatterContext(this);
                 if (typeof (cols) == 'object' && cols && cols.name) {
                     cols = cols.name;
                 }
@@ -740,7 +745,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 try {
                     const percentageArray = [];
 
-                    if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name, "Series ")) {
+                    if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name, "Series ") && !isChartWithMultiValues) {
                         let temp = cols;
                         cols = rows;
                         rows = temp;
@@ -863,18 +868,25 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var y = parseFloat(this.y);
 
             if (pivotData) {
+                const isChartWithMultiValues = highchartsRenderer.isChartWithMultiValues(pivotData);
                 let series_name = highchartsRenderer.getSeriesNameInFormatterContext(this);
                 var rows = series_name.split(highchartsRenderer.delimer);
-                if (is_drill_down_pie && highchartsRenderer.selfStartsWith(series_name,"Series ")) {
+                var cols = highchartsRenderer.getColsInFormatterContext(this);
+                
+                if (is_drill_down_pie && (highchartsRenderer.selfStartsWith(series_name,"Series ") || isChartWithMultiValues)) {
                     rows = [];
+                    
+                    if (isChartWithMultiValues) {
+                        cols = pivotData.getColKeys()[0];
+                    }
                 }
+
                 if (pivotData.rowAttrs.length == 0
                     || this.series.options.className === 'totalSeries'
                     || isTrendSeries) {
                     rows = [];
                 }
 
-                var cols = highchartsRenderer.getColsInFormatterContext(this);
                 if (lodash.isNil(cols) && is_drill_down_pie) {
                     cols = this.name;
                 }
@@ -891,7 +903,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
 
                 try {
-                    if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name,"Series ")) {
+                    if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name,"Series ") && !isChartWithMultiValues) {
                         let temp = cols;
                         cols = rows;
                         rows = temp;
@@ -932,9 +944,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     var aggr = pivotData.getAggregator(rows, cols);
                     
                     let formatted_value_to_return = $.pivotUtilities.getFormattedNumber(y, null, opts);
-                    if (aggr.value() || isWaterfallBreakdown) {
+                    if (aggr.value() || isWaterfallBreakdown || isChartWithMultiValues) {
                         formatted_value_to_return = $.pivotUtilities.getFormattedNumber(
-                            isWaterfallBreakdown || isWaterfallWalkthrough || isTrendSeries ? y : aggr.value(), aggr, opts
+                            isChartWithMultiValues || isWaterfallBreakdown || isWaterfallWalkthrough || isTrendSeries ? y : aggr.value(), aggr, opts
                         );
                     }
 
@@ -2056,17 +2068,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 col_ob.name = highchartsRenderer.getFormattedColKey(col_ob.initialName, pivotData);
                 col_ob.data = [];
                 lodash.forEach(row_n_keys, function (row_n_value) {
-                    // always takes the first key during drilldown,
-                    // we are only supporting one level drilldown but pivot table could have multiple nested row keys
-                    const rowKey = [row_n_value[0]];
-                    var agg = pivotData.getAggregator(rowKey, col_n_value);
+                    var agg = pivotData.getAggregator(row_n_value, col_n_value);
                     var val = agg.value();
-                    if (val != null && rowKey[0]) {
+                    if (val != null && row_n_value.length) {
                         if ($.isNumeric(val)) {
                             val = parseFloat(val);
                         }
 
-                        const row_initial_name = rowKey[0] === highchartsRenderer.DR_OTHERS_KEY ? othersName : rowKey;
+                        const row_initial_name = row_n_value[0] === highchartsRenderer.DR_OTHERS_KEY ? othersName : row_n_value;
                         const row_name = highchartsRenderer.getFormattedRowKey(row_initial_name, pivotData);
                         col_ob.data.push({
                             name: row_name,
@@ -2075,11 +2084,20 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         });
                     }
                 });
+
+                col_ob.data = Object.values(
+                    lodash.reduce(col_ob.data, (acc, item) => {
+                        const key = Array.isArray(item.name) ? item.name[0] : item.name;
+                        const name = key ? [key] : [col_n];
+                        if (!acc[key]) {
+                            acc[key] = { name: name, initialName: name, y: 0 };
+                        }
+                        acc[key].y += item.y;
+                        return acc;
+                    }, {})
+                );
+
                 if (col_ob.data.length) {
-                    // filtering out when there are multiple data series
-                    col_ob.data = lodash.uniqBy(col_ob.data, item =>
-                        Array.isArray(item.name) ? item.name.join(highchartsRenderer.delimer) : item.name
-                    );
                     pie_drill_down_series.push(col_ob);
                 }
             }
@@ -9980,7 +9998,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     // Check if chart has multiple values
     highchartsRenderer.isChartWithMultiValues = function(pivotData) {
-        return lodash.get(pivotData, 'rowAttrs[0]') === 'DR_Values';
+        return lodash.some(lodash.get(pivotData, 'rowAttrs'), attr => attr === 'DR_Values');
     }
 
     highchartsRenderer.checkFormats = function(render_options, widget_values_format) {

package/tests/highcharts_renderer.test.js

@@ -545,6 +545,7 @@ describe('highcharts_renderer', () => {
             mockPivotData = {
                 rowAttrs: ['row1'],
                 colAttrs: ['col1'],
+                getColKeys: jest.fn(() => [['col1'], ['col2']]),
                 getRowKeys: jest.fn(() => [['row1'], ['row2']]),
                 getAggregator: jest.fn(() => ({
                     value: () => 1000
@@ -561,6 +562,7 @@ describe('highcharts_renderer', () => {
             });
             spyOn(highchartsRenderer, 'replaceDrOthersKeys');
             spyOn(highchartsRenderer, 'selfStartsWith').and.returnValue(false);
+            spyOn(highchartsRenderer, 'isChartWithMultiValues').and.returnValue(true);
 
             global.$ = {
                 pivotUtilities: {
@@ -646,15 +648,28 @@ describe('highcharts_renderer', () => {
                 funcContext.y = 500;
             });
 
-            it('should handle drill-down pie when series name starts with "Series "', () => {
+            it('should handle drill-down pie when series name starts with "Series " and chart does not have multi values', () => {
                 highchartsRenderer.selfStartsWith.and.returnValue(true);
                 highchartsRenderer.getSeriesNameInFormatterContext.and.returnValue('Series 1');
+                highchartsRenderer.isChartWithMultiValues.and.returnValue(false);
 
                 opts = { chartOptions: {} };
                 let fn = highchartsRenderer.defaultDataLabelFormatter(mockPivotData, opts, true);
                 let result = fn.call(funcContext);
 
                 expect(highchartsRenderer.selfStartsWith).toHaveBeenCalledWith('Series 1', 'Series ');
+                expect(highchartsRenderer.isChartWithMultiValues).toHaveBeenCalledWith(mockPivotData);
+                expect(result).toBe('500');
+            });
+
+            it('should handle drill-down pie when is a multi values chart', () => {
+                highchartsRenderer.isChartWithMultiValues.and.returnValue(true);
+
+                opts = { chartOptions: {} };
+                let fn = highchartsRenderer.defaultDataLabelFormatter(mockPivotData, opts, true);
+                let result = fn.call(funcContext);
+
+                expect(highchartsRenderer.isChartWithMultiValues).toHaveBeenCalledWith(mockPivotData);
                 expect(result).toBe('500');
             });
 

package/tests/ptCreateDrillDownSeriesToDrilldownChart.test.js

@@ -405,6 +405,26 @@ describe('ptCreateDrillDownSeriesToDrilldownChart', () => {
             );
             expect(highchartsRenderer.getDataLabelsStylesForDrillDown).toHaveBeenCalledWith(mockAdditionOptions);
         });
+
+        it('should merge values when row name is a plain string (not array)', () => {
+            jest.spyOn(highchartsRenderer, 'getFormattedRowKey').mockImplementation(name => name);
+
+            mockPivotData.getRowKeys.mockReturnValue([ 'PLAIN_STRING_NAME' ]);
+            mockPivotData.getColKeys.mockReturnValue([ ['valid-key'] ]);
+            mockPivotData.getAggregator.mockImplementation(() => ({ value: () => 100 }));
+
+            const result = highchartsRenderer.ptCreateDrillDownSeriesToDrilldownChart(
+                mockPivotData,
+                mockChartOptions,
+                mockAdditionOptions,
+                mockOpts
+            );
+
+            expect(result.series).toHaveLength(1);
+            const dataPoint = result.series[0].data[0];
+            expect(dataPoint.name).toEqual(['PLAIN_STRING_NAME']);
+            expect(dataPoint.y).toBe(100);
+        });
     });
 
     describe('edge cases', () => {