@datarailsshared/dr_renderer 1.2.379 → 1.2.383

package/package.json

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

package/src/highcharts_renderer.js

@@ -2575,7 +2575,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 1, false, true);
         if (drilldownFunc)
             chartOptions.drilldown = {}
-        else
+        else if (!pivotData.isDrillDownDisabled)
             chartOptions.drilldown = highchartsRenderer.ptCreateDrillDownSeriesToDrilldownChart(pivotData, chartOptions, additionOptions, opts);
 
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
@@ -3102,7 +3102,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         highchartsRenderer.handleGridLines(additionOptions, chartOptions);
 
-        var isNotDrilldown = !(colAttrs && colAttrs.length > 1);
+        var isNotDrilldown = !(colAttrs && colAttrs.length > 1) || pivotData.isDrillDownDisabled;
         if (lodash.get(opts, 'paletteOptions.widgetPalette', null)) {
             const mc_palette = lodash.find(lodash.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
             chartOptions.colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
@@ -4881,6 +4881,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             rendererOptions: widget.options,
             dateValuesDictionary: pivotOptions ? pivotOptions.dateValuesDictionary : null,
             keysObject: pivotOptions ? pivotOptions.keysObject : null,
+            isDrillDownDisabled: pivotOptions ? pivotOptions.isDrillDownDisabled : false,
         };
 
         if (!subopts.rendererOptions) {
@@ -6017,16 +6018,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     ];
 
     highchartsRenderer.getDefaultValueForChart = function (type, existing_options) {
-        var chartOpt;
-        if (type == highchartsRenderer.richTextSubType.type) {
-            chartOpt = highchartsRenderer.richTextSubType;
-        } else {
-            chartOpt = highchartsRenderer.getChartOptionsBySubType(type);
-        }
-        var valToReturn = {};
+        const chartOpt = type === highchartsRenderer.richTextSubType.type
+            ? highchartsRenderer.richTextSubType
+            : highchartsRenderer.getChartOptionsBySubType(type);
+
+        let valToReturn = {};
         if (chartOpt) {
-            lodash.forEach(chartOpt.suboptions, function (suboption) {
-                valToReturn[suboption.category_type] = highchartsRenderer.getDefaultValueForSubOptions(suboption.category_type, existing_options);
+            lodash.forEach(chartOpt.suboptions, (suboption) => {
+                valToReturn[suboption.category_type] = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
             });
         }
 
@@ -6107,10 +6106,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return key
     };
 
-    highchartsRenderer.getDefaultValueForSubOptions = function (type, existing_options) {
-        var valToReturn = {};
-        var option = highchartsRenderer.suboptions[type] || lodash.find(highchartsRenderer.suboptions, suboption => suboption.category_type === type);
+    highchartsRenderer.getDefaultValueForSubOptions = function (option, existing_options) {
+        const valToReturn = {};
+        
         if (option) {
+            const type = option.category_type;
             lodash.forEach(option.elements, function (elem) {
                 if (existing_options && lodash.has(existing_options, type + '.' + elem.value_name)) {
                     valToReturn[elem.value_name] = lodash.get(existing_options, type + '.' + elem.value_name);

package/src/pivottable.js

@@ -711,6 +711,7 @@ let initPivotTable = function($, window, document) {
             this.isFormattingAxisLabels = opts.rendererOptions && opts.rendererOptions.isFormattingAxisLabels;
             this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
             this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
+            this.isDrillDownDisabled = opts.isDrillDownDisabled;
 
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {

package/tests/highcharts_renderer.test.js

@@ -3436,17 +3436,19 @@ describe('highcharts_renderer', () => {
             highchartsRenderer.suboptions = tempSubOptions;
         });
 
-        it('should return an empty object if option type is not found', () => {
-            const type = 'invalid_type';
+        it('should return an empty object if passed suboption is falsy', () => {
             const existing_options = {};
-            const result = highchartsRenderer.getDefaultValueForSubOptions(type, existing_options);
-            expect(result).toEqual({});
+            const result1 = highchartsRenderer.getDefaultValueForSubOptions(null, existing_options);
+            expect(result1).toEqual({});
+
+            const result2 = highchartsRenderer.getDefaultValueForSubOptions(undefined, existing_options);
+            expect(result2).toEqual({});
         });
 
         it('should return default values for all elements in suboption', () => {
-            const type = 'type1';
+            const suboption = suboptions.option1;
             const existing_options = {};
-            const result = highchartsRenderer.getDefaultValueForSubOptions(type, existing_options);
+            const result = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
             expect(result).toEqual({
                 value1: 'default1',
                 value2: 42,
@@ -3454,14 +3456,14 @@ describe('highcharts_renderer', () => {
         });
 
         it('should use existing options if available', () => {
-            const type = 'type1';
+            const suboption = suboptions.option1;
             const existing_options = {
                 type1: {
                     value1: 'existing1',
                     value2: 99,
                 },
             };
-            const result = highchartsRenderer.getDefaultValueForSubOptions(type, existing_options);
+            const result = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
             expect(result).toEqual({
                 value1: 'existing1',
                 value2: 99,
@@ -3469,16 +3471,16 @@ describe('highcharts_renderer', () => {
         });
 
         it('should ignore elements with type "devider"', () => {
-            const type = 'type1';
+            const suboption = suboptions.option1;
             const existing_options = {};
-            const result = highchartsRenderer.getDefaultValueForSubOptions(type, existing_options);
+            const result = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
             expect(result).not.toHaveProperty('value3');
         });
 
         it('should clone default value if it is an object', () => {
-            const type = 'type3';
+            const suboption = suboptions.option3;
             const existing_options = {};
-            const result = highchartsRenderer.getDefaultValueForSubOptions(type, existing_options);
+            const result = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
             expect(result.value1).toEqual(suboptions.option3.elements[0].default_value);
             expect(result.value1).not.toBe(suboptions.option3.elements[0].default_value);
         });