@datarailsshared/dr_renderer 1.4.118 → 1.4.128

package/package.json

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

package/src/highcharts_renderer.js

@@ -709,7 +709,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 if (is_drill_down_pie && (highchartsRenderer.selfStartsWith(series_name, "Series ") || isChartWithMultiValues)) {
                     rows = [];
-                    cols = pivotData.getColKeys()[0];
+
+                    if (isChartWithMultiValues) {
+                        cols = pivotData.getColKeys()[0];
+                    }
                 }
 
                 if (pivotData.rowAttrs.length == 0
@@ -872,7 +875,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 
                 if (is_drill_down_pie && (highchartsRenderer.selfStartsWith(series_name,"Series ") || isChartWithMultiValues)) {
                     rows = [];
-                    cols = pivotData.getColKeys()[0];
+                    
+                    if (isChartWithMultiValues) {
+                        cols = pivotData.getColKeys()[0];
+                    }
                 }
 
                 if (pivotData.rowAttrs.length == 0

package/src/value.formatter.js

@@ -31,7 +31,7 @@ function isAbsoluteValue(formula) {
     if (!formula)
         return false;
     
-    return lodash.includes(formula.replace(/\s+/g, ''), 'x2-x1');
+    return !lodash.includes(formula.replace(/\s+/g, ''), '/');
 };
 
 module.exports = {

package/tests/highcharts_renderer.test.js

@@ -648,15 +648,17 @@ 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');
             });
 

package/tests/value.formatter.test.js

@@ -9,7 +9,8 @@ describe('Function getAggregatorPercentageValueIfRequired', () => {
             chartOptions: { 
                 delta_column: { 
                     name: 'Variance',
-                    formula: 'x2-x1' 
+                    formula: 'x2-x1',
+                    is_percentage: false
                 } 
             }
         };
@@ -17,7 +18,7 @@ describe('Function getAggregatorPercentageValueIfRequired', () => {
         colKey = ['SomeCol'];
     });
 
-    it('should return percentage string when all conditions are met', () => {
+    it('should return percentage string when secondaryAxisSettings.is_percentage is true but delta_column.is_percentage is false', () => {
         const data = {
             rowKeys: ['Variance'],
             getAggregator: jest.fn(() => ({
@@ -28,6 +29,19 @@ describe('Function getAggregatorPercentageValueIfRequired', () => {
         expect(result).toBe('25%');
     });
 
+    it('should return percentage string when secondaryAxisSettings.is_percentage is false but delta_column.is_percentage is true', () => {
+        const data = {
+            rowKeys: ['Variance'],
+            getAggregator: jest.fn(() => ({
+                value: () => 200
+            }))
+        };
+        render_options.comboOptions.secondaryAxisSettings.is_percentage = false;
+        render_options.chartOptions.delta_column.is_percentage = true;
+        const result = getAggregatorPercentageValueIfRequired(50, render_options, data, rowKey, colKey);
+        expect(result).toBe('25%');
+    });
+
     it('should return null if is_percentage is false', () => {
         const data = {
             rowKeys: ['Variance'],
@@ -111,20 +125,19 @@ describe('Function isAbsoluteValue', () => {
         expect(isAbsoluteValue(null)).toBe(false);
     });
 
-    it('should return false if formula does not contain "x2-x1"', () => {
-        expect(isAbsoluteValue('x2 + x1')).toBe(false);
-        expect(isAbsoluteValue('x1-x2')).toBe(false);
-        expect(isAbsoluteValue('')).toBe(false);
+    it('should return false if formula contains "/"', () => {
+        expect(isAbsoluteValue('/')).toBe(false);
+        expect(isAbsoluteValue(' / ')).toBe(false);
     });
 
-    it('should return true if formula contains "x2-x1"', () => {
+    it('should return true if formula does not contain "/"', () => {
         expect(isAbsoluteValue('x2-x1')).toBe(true);
-        expect(isAbsoluteValue(' x2 - x1 ')).toBe(true);
+        expect(isAbsoluteValue(' x1 - x2 ')).toBe(true);
         expect(isAbsoluteValue('some text x2-x1 more text')).toBe(true);
     });
 
     it('should ignore spaces in formula', () => {
         expect(isAbsoluteValue('x2 - x1')).toBe(true);
-        expect(isAbsoluteValue('  x2   -   x1  ')).toBe(true);
+        expect(isAbsoluteValue('  x1   -   x2  ')).toBe(true);
     });
 });