@datarailsshared/dr_renderer 1.2.333 → 1.2.334

package/package.json

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

package/src/highcharts_renderer.js

@@ -3929,11 +3929,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.rhPivotCount = function (arg, widget_values_format, is_graph, render_options, calculated_info) {
         var attr = arg[0];
-        // isCustomValues format need for check in case when customer apply SecondaryAxis and one of them is true
-        // in that case we take formats from seriesOptions and apply those format to each one of them their format from the table
-        // method isCustomValuesFormat check if format was added custom format by self or it's a default format from table
-        const isCustomValuesFormat = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
-
         return function (data, rowKey, colKey) {
             return {
                 sum: 0,
@@ -3993,11 +3988,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         number_format = 'General';
                     }
 
-                    if (this.widget_values_format && !highchartsRenderer.enabledNewWidgetValueFormatting) {
-                        number_format = this.widget_values_format;
-                    }
-
-                    if (isCustomValuesFormat) {
+                    if (this.widget_values_format && highchartsRenderer.isUsingWidgetValuesFormat(data, render_options, widget_values_format)) {
                         number_format = this.widget_values_format;
                     }
 
@@ -4085,11 +4076,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.rhPivotAggregatorSum = function (arg, widget_values_format, is_graph, render_options, calculated_info) {
         var attr = arg[0];
-        // isCustomValues format need for check in case when customer apply SecondaryAxis and one of them is true
-        // in that case we take formats from seriesOptions and apply those format to each one of them their format from the table
-        // method isCustomValuesFormat check if format was added custom format by self or it's a default format from table
-        const isCustomValuesFormat = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
-
         return function (data, rowKey, colKey) {
             return {
                 sum: 0,
@@ -4161,13 +4147,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         number_format = 'General';
                     }
 
-                    if (this.widget_values_format && !highchartsRenderer.enabledNewWidgetValueFormatting) {
+                    if (this.widget_values_format && highchartsRenderer.isUsingWidgetValuesFormat(data, render_options, widget_values_format)) {
                         number_format = this.widget_values_format;
                     }
 
-                    if (isCustomValuesFormat) {
-                        number_format = this.widget_values_format;
-                    }
                     number_format = highchartsRenderer.getCalculatedValueFormat(this.calculated_formats, rowKey, colKey) || number_format;
                     var formated_value = highchartsRenderer.formatValue('n', number_format, x)
 
@@ -4185,11 +4168,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.rhPivotAggregatorMin = function (arg, widget_values_format, is_graph, render_options, calculated_info) {
         var attr = arg[0];
-        // isCustomValues format need for check in case when customer apply SecondaryAxis and one of them is true
-        // in that case we take formats from seriesOptions and apply those format to each one of them their format from the table
-        // method isCustomValuesFormat check if format was added custom format by self or it's a default format from table
-        const isCustomValuesFormat = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
-
         return function (data, rowKey, colKey) {
             return {
                 val: null,
@@ -4259,11 +4237,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         number_format = 'General';
                     }
 
-                    if (this.widget_values_format && !highchartsRenderer.enabledNewWidgetValueFormatting) {
-                        number_format = this.widget_values_format;
-                    }
-
-                    if (isCustomValuesFormat) {
+                    if (this.widget_values_format && highchartsRenderer.isUsingWidgetValuesFormat(data, render_options, widget_values_format)) {
                         number_format = this.widget_values_format;
                     }
 
@@ -4284,11 +4258,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.rhPivotAggregatorMax = function (arg, widget_values_format, is_graph, render_options, calculated_info) {
         var attr = arg[0];
-        // isCustomValues format need for check in case when customer apply SecondaryAxis and one of them is true
-        // in that case we take formats from seriesOptions and apply those format to each one of them their format from the table
-        // method isCustomValuesFormat check if format was added custom format by self or it's a default format from table
-        const isCustomValuesFormat = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
-
         return function (data, rowKey, colKey) {
             return {
                 val: null,
@@ -4359,11 +4328,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         number_format = 'General';
                     }
 
-                    if (this.widget_values_format && !highchartsRenderer.enabledNewWidgetValueFormatting) {
-                        number_format = this.widget_values_format;
-                    }
-
-                    if (isCustomValuesFormat) {
+                    if (this.widget_values_format && highchartsRenderer.isUsingWidgetValuesFormat(data, render_options, widget_values_format)) {
                         number_format = this.widget_values_format;
                     }
 
@@ -4384,11 +4349,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.rhPivotAggregatorAverage = function (arg, widget_values_format, is_graph, render_options, calculated_info) {
         var attr = arg[0];
-        // isCustomValues format need for check in case when customer apply SecondaryAxis and one of them is true
-        // in that case we take formats from seriesOptions and apply those format to each one of them their format from the table
-        // method isCustomValuesFormat check if format was added custom format by self or it's a default format from table
-        const isCustomValuesFormat = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
-
         return function (data, rowKey, colKey) {
             return {
                 sum: 0,
@@ -4466,11 +4426,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         number_format = 'General';
                     }
 
-                    if (this.widget_values_format && !highchartsRenderer.enabledNewWidgetValueFormatting) {
-                        number_format = this.widget_values_format;
-                    }
-
-                    if (isCustomValuesFormat) {
+                    if (this.widget_values_format && highchartsRenderer.isUsingWidgetValuesFormat(data, render_options, widget_values_format)) {
                         number_format = this.widget_values_format;
                     }
 
@@ -9331,6 +9287,11 @@ 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';
+    }
+
     highchartsRenderer.checkFormats = function(render_options, widget_values_format) {
         let isSecondaryAxis = false;
         let formats = [];
@@ -9353,9 +9314,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return formats;
     }
 
-    highchartsRenderer.isCustomValuesFormat = function (render_options, widget_values_format) {
+    // Will be FALSE when all 4 conditions true: 1. User applies SecondaryAxis 2. Format on 'format editor panel' is same as any Value field table format
+    // 3. Chart has more than one value fields in Values block 4. enable_new_widget_value_formatting is turned ON
+    // In that case we apply for both value fields their format from the table
+    // In all other cases we are applying format from editor panel to both of them (specification: DR-20955)
+    highchartsRenderer.isUsingWidgetValuesFormat = function (pivotData, render_options, widget_values_format) {
         const { isSecondaryAxis, isCustomFormat } = highchartsRenderer.checkFormats(render_options, widget_values_format);
-        return highchartsRenderer.enabledNewWidgetValueFormatting && (isCustomFormat || !isSecondaryAxis);
+        return !highchartsRenderer.enabledNewWidgetValueFormatting || !highchartsRenderer.isChartWithMultiValues(pivotData) || !isSecondaryAxis || isCustomFormat;
     }
 
     highchartsRenderer.isFormattingAxis = function () {

package/tests/highcharts_renderer.test.js

@@ -4741,8 +4741,18 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function isCustomValuesFormat', () => {
-        const render_options = {
+    describe('function isChartWithMultiValues', () => {
+        it('should return true if DR_Values in attributes', () => {
+            expect(highchartsRenderer.isChartWithMultiValues({ rowAttrs: ['DR_Values'] })).toEqual(true);
+        });
+
+        it('should return false if no DR_Values in attributes', () => {
+            expect(highchartsRenderer.isChartWithMultiValues({ rowAttrs: ['Profit'] })).toEqual(false);
+        });
+    });
+
+    describe('function isUsingWidgetValuesFormat', () => {
+        const renderOptions = {
             comboOptions: {
                 seriesOptions: [
                     { series: 'Profit', format: '#,###', secondaryAxis: false },
@@ -4751,40 +4761,51 @@ describe('highcharts_renderer', () => {
             }
         };
 
-        it('should return true if new widget value formatting is enabled and the format is custom or there is no secondary axis', () => {
-            const widget_values_format = '$####.##';
-
-            highchartsRenderer.enabledNewWidgetValueFormatting = true;
-
-            const expectedValue = true;
-
-            const result = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
+        it('should return true (enable_new_widget_value_formatting !== true, format is not custom, secondary axis present, >1 value fields)', () => {
+            const widgetValuesFormat = '#,###';
+            const pivotData = { rowAttrs: ['DR_Values'] };
+            highchartsRenderer.enabledNewWidgetValueFormatting = false;
 
-            expect(result).toEqual(expectedValue);
+            const result = highchartsRenderer.isUsingWidgetValuesFormat(pivotData, renderOptions, widgetValuesFormat);
+            expect(result).toEqual(true);
         });
 
-        it('should return false if new widget value formatting is disabled', () => {
-            const widget_values_format = '#,###';
-
-            highchartsRenderer.enabledNewWidgetValueFormatting = false;
+        it('should return true (enable_new_widget_value_formatting === true, format is custom, secondary axis present, >1 value fields)', () => {
+            const widgetValuesFormat = '$#,###';
+            const pivotData = { rowAttrs: ['DR_Values'] };
+            highchartsRenderer.enabledNewWidgetValueFormatting = true;
 
-            const expectedValue = false;
+            const result = highchartsRenderer.isUsingWidgetValuesFormat(pivotData, renderOptions, widgetValuesFormat);
+            expect(result).toEqual(true);
+        });
 
-            const result = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
+        it('should return true (enable_new_widget_value_formatting === true, format is not custom, secondary axis not present, >1 value fields)', () => {
+            const widgetValuesFormat = '#,###';
+            const pivotData = { rowAttrs: ['DR_Values'] };
+            highchartsRenderer.enabledNewWidgetValueFormatting = true;
+            const renderOptionsNoSecondary = lodash.cloneDeep(renderOptions);
+            renderOptionsNoSecondary.comboOptions.seriesOptions[1].secondaryAxis = false;
 
-            expect(result).toEqual(expectedValue);
+            const result = highchartsRenderer.isUsingWidgetValuesFormat(pivotData, renderOptionsNoSecondary, widgetValuesFormat);
+            expect(result).toEqual(true);
         });
 
-        it('should return false if the format is not custom and there is a secondary axis', () => {
-            const widget_values_format = '#,###';
-
+        it('should return true (enable_new_widget_value_formatting === true, format is not custom, secondary axis present, 1 value fields)', () => {
+            const widgetValuesFormat = '#,###';
+            const pivotData = { rowAttrs: ['Profit'] };
             highchartsRenderer.enabledNewWidgetValueFormatting = true;
 
-            const expectedValue = false;
+            const result = highchartsRenderer.isUsingWidgetValuesFormat(pivotData, renderOptions, widgetValuesFormat);
+            expect(result).toEqual(true);
+        });
 
-            const result = highchartsRenderer.isCustomValuesFormat(render_options, widget_values_format);
+        it('should return false (enable_new_widget_value_formatting === true, format is not custom, secondary axis present, >1 value fields)', () => {
+            const widgetValuesFormat = '#,###';
+            const pivotData = { rowAttrs: ['DR_Values'] };
+            highchartsRenderer.enabledNewWidgetValueFormatting = true;
 
-            expect(result).toEqual(expectedValue);
+            const result = highchartsRenderer.isUsingWidgetValuesFormat(pivotData, renderOptions, widgetValuesFormat);
+            expect(result).toEqual(false);
         });
     });