@datarailsshared/dr_renderer 1.2.444 → 1.2.446

package/package.json

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

package/src/highcharts_renderer.js

@@ -1567,6 +1567,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             totalSeries.className = 'totalSeries';
             totalSeries.name = 'Total';
             totalSeries.data = [];
+            
+            // DEV_FF: DR-31422
+            if (opts.devFixDrollDownByTotal) {
+                totalSeries.initialName = 'Total';
+                totalSeries.isTotal = true;
+            }
 
             if (colors && colors[i]) {
                 totalSeries.color = colors[i];
@@ -8263,11 +8269,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (fieldFilter && fieldFilter.type && fieldFilter.type === 'Date' && fieldFilter.datetypevalues) {
                 if (fieldFilter.datetypevalues.datetype === "frame") {
                     const timeframeLabel = highchartsRenderer.DATE_FILTER_TIMEFRAME_LABELS[fieldFilter.datetypevalues.val.timeframe] || highchartsRenderer.getDateFilterCustomTimeframeLabel(fieldFilter.datetypevalues.val);
-                    if (isPermissionOrGlobalFilter) {
+                    if (isGlobalFilter) {
                         return {
                             label: displayname + separator + highchartsRenderer.getGlobalFilterValueHighlighter(timeframeLabel),
                             tooltip: displayname + separator + timeframeLabel,
                         }
+                    } else if (isPermissionFilter) {
+                        const value =  `${displayname} ${highchartsRenderer.getGlobalFilterValueHighlighter( `(${ timeframeLabel })`)}`;
+                        return {
+                            label: value,
+                            tooltip: value
+                        };
                     }
                     displayname += ` (${ timeframeLabel })`;
                 } else if (fieldFilter.datetypevalues.datetype === "range") {
@@ -8288,12 +8300,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 .toLocaleDateString();
                         }
                     });
-                    if (isPermissionOrGlobalFilter) {
+                    if (isGlobalFilter) {
                         displayname += `${separator}${ highchartsRenderer.getGlobalFilterValueHighlighter(dates.from.displayedValue + '-' + dates.to.displayedValue) }`;
                         return {
                             label: displayname,
                             tooltip: dates.from.displayedValue + '-' + dates.to.displayedValue,
                         }
+                    } else if (isPermissionFilter) {
+                        const value =  `${displayname} ${highchartsRenderer.getGlobalFilterValueHighlighter( `(${ dates.from.displayedValue } - ${ dates.to.displayedValue })`)}`;
+                        return {
+                            label: value,
+                            tooltip: value,
+                        };
                     }
                     displayname += ` (${ dates.from.displayedValue }-${ dates.to.displayedValue })`;
                 } else {

package/tests/highcharts_renderer.test.js

@@ -6882,7 +6882,174 @@ describe('highcharts_renderer', () => {
                     color: '#b3060e'
                 }
             ]);
-        })
+        });
+
+        describe("DR-31214 - Fix drilldown by total", () => {
+            const originResponse = [{
+                color: '#ff0202',
+                data: [
+                    {
+                        drilldown: true,
+                        initialName: 'col 1',
+                        name: 'col 1',
+                        y: 12345
+                    },
+                    {
+                        drilldown: true,
+                        initialName: 'col 2',
+                        name: 'col 2',
+                        y: 54321
+                    },
+                    {
+                        drilldown: true,
+                        initialName: 'Others',
+                        name: 'Others',
+                        y: 99999
+                    }
+                ],
+                dataLabels: {
+                    allowOverlap: false,
+                    color: '#151a41',
+                    enabled: true,
+                    formatter: expect.any(Function),
+                    style: {
+                        fontFamily: 'Poppins',
+                        fontSize: '11',
+                        fontWeight: 'normal'
+                    }
+                },
+                initialName: 'row 1',
+                name: 'row 1'
+            },
+            {
+                color: '#b3060e',
+                data: [
+                    {
+                        drilldown: true,
+                        initialName: 'col 1',
+                        name: 'col 1',
+                        y: 123450
+                    },
+                    {
+                        drilldown: true,
+                        initialName: 'col 2',
+                        name: 'col 2',
+                        y: 11111
+                    },
+                    {
+                        drilldown: true,
+                        initialName: 'Others',
+                        name: 'Others',
+                        y: 99991
+                    }
+                ],
+                dataLabels: {
+                    allowOverlap: false,
+                    color: '#151a41',
+                    enabled: true,
+                    formatter: expect.any(Function),
+                    style: {
+                        fontFamily: 'Poppins',
+                        fontSize: '11',
+                        fontWeight: 'normal'
+                    }
+                },
+                initialName: 'row 2',
+                name: 'row 2'
+            },
+            {
+                className: 'totalSeries',
+                color: '#70000a',
+                data: [
+                    {
+                        initialName: 'col 1',
+                        name: 'col 1',
+                        y: 123450
+                    },
+                    {
+                        initialName: 'col 2',
+                        name: 'col 2',
+                        y: 123451
+                    },
+                    {
+                        initialName: 'DR_Others',
+                        name: 'DR_Others',
+                        y: 123452
+                    }
+                ],
+                dataLabels: {
+                    allowOverlap: false,
+                    color: '#151a41',
+                    enabled: true,
+                    formatter: expect.any(Function),
+                    style: {
+                        fontFamily: 'Poppins',
+                        fontSize: '11',
+                        fontWeight: 'normal'
+                    }
+                },
+                initialName: 'row 2',
+                name: 'Total'
+            }];
+  
+            it("should mark the series as total if the feature flag is on", () => {
+                additionalOptionsMock = {};
+                opts = {
+                    total: true,
+                    devFixDrollDownByTotal: true,
+                };
+                pivotDataMock.colTotals = {
+                    "col 1": { value: () => 123450 },
+                    "col 2": { value: () => 123451 },
+                    DR_Others: { value: () => 123452 },
+                };
+                const value = highchartsRenderer.ptCreateColumnSeries(
+                    pivotDataMock,
+                    colors,
+                    onlyNumbers,
+                    isUniqueVals,
+                    isNotDrillDown,
+                    additionalOptionsMock,
+                    opts,
+                    chartOptions,
+                    chartType
+                );
+                const fixedResponse = [...originResponse];
+                fixedResponse[fixedResponse.length - 1] = {
+                    ...fixedResponse[fixedResponse.length - 1],
+                    ...{
+                        initialName: "Total",
+                        isTotal: true,
+                    },
+                };
+                expect(value).toEqual(fixedResponse);
+            });
+  
+            it("should not change the original series if the feature flag is off", () => {
+                additionalOptionsMock = {};
+                opts = {
+                    total: true,
+                    devFixDrollDownByTotal: false,
+                };
+                pivotDataMock.colTotals = {
+                    "col 1": { value: () => 123450 },
+                    "col 2": { value: () => 123451 },
+                    DR_Others: { value: () => 123452 },
+                };
+                const value = highchartsRenderer.ptCreateColumnSeries(
+                    pivotDataMock,
+                    colors,
+                    onlyNumbers,
+                    isUniqueVals,
+                    isNotDrillDown,
+                    additionalOptionsMock,
+                    opts,
+                    chartOptions,
+                    chartType
+                );
+                expect(value).toEqual(originResponse);
+            });
+        });
     });
     describe('Function ptCreateBasicLineSeries', () => {
         const format = null;