@datarailsshared/dr_renderer 1.2.296 → 1.2.297

package/package.json

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

package/src/highcharts_renderer.js

@@ -502,7 +502,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var topSlot = '';
             if (labelOpts.show_percentage_in_labels) {
                 rightSlot = `(${(this.point.percentage).toFixed(2)}%)`;
-                if (labelOpts.show_value_in_labels && value) topSlot = `${value}<br>`;
+                if (labelOpts.show_value_in_labels && value) {
+                    topSlot = `${value}<br>`;
+                }
             } else if (labelOpts.show_value_in_labels && value) {
                 rightSlot = value;
             }
@@ -540,7 +542,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         const labelOptions = lodash.get(opts.chartOptions, 'label') || lodash.get(opts.chartOptions, 'label_pie');
         const othersName = opts.total_value_options ? highchartsRenderer.getOthersName(opts) : undefined;
-        const drOthersInAxis = highchartsRenderer.getDrOthersInAxisState(pivotData, othersName);
+        const drOthersInAxis = pivotData ? highchartsRenderer.getDrOthersInAxisState(pivotData, othersName) : {};
 
         var func = function () {
             var value = parseFloat(this.y);
@@ -717,7 +719,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         const othersName = opts.total_value_options ? highchartsRenderer.getOthersName(opts) : undefined;
-        const drOthersInAxis = highchartsRenderer.getDrOthersInAxisState(pivotData, othersName);
+        const drOthersInAxis = pivotData ? highchartsRenderer.getDrOthersInAxisState(pivotData, othersName) : {};
 
         var func = function () {
             const isWaterfallBreakdown = this.series.options.className === SERIES_CLASSNAMES.WATERFALL_BREAKDOWN;

package/tests/highcharts_renderer.test.js

@@ -380,19 +380,117 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function isSystemField', () => {
-        it('system name', () => {
-            const field = {
-                name: 'Doc_ID'
+    describe('function defaultValueLabelsFormatter', () => {
+        let funcContext;
+
+        beforeEach(() => {
+            funcContext = { value: '12345.678' };
+        });
+
+        it('should return formatted number by aggregator', () => {
+            const format = '"$"#,###.##';
+            let pivotData = {
+                getAggregator: () => {
+                    let aggregator = highchartsRenderer.rhPivotAggregatorSum([''], format, true, {}, {});
+                    return aggregator({}, '', '');
+                }
             };
-            expect(highchartsRenderer.isSystemField(field)).toBe(true);
+            let defaultValueLabelsFormatterFn = highchartsRenderer.defaultValueLabelsFormatter(pivotData, {})
+            let result = defaultValueLabelsFormatterFn.call(funcContext)
+            expect(result).toBe('$12,345.68');
         });
 
-        it('not system name', () => {
-            const field = {
-                name: 'field name'
+        it('should return local string if there are no pivotData', () => {
+            let defaultValueLabelsFormatterFn = highchartsRenderer.defaultValueLabelsFormatter(null, {})
+            let result = defaultValueLabelsFormatterFn.call(funcContext)
+            expect(result).toBe('12,345.678');
+        });
+    });
+
+    describe('function persantageValueLabelsFormatter', () => {
+        it('should return local string with %', () => {
+            let funcContext = { value: '12345.678' };
+            let persantageValueLabelsFormatterFn = highchartsRenderer.persantageValueLabelsFormatter(null, {})
+            let result = persantageValueLabelsFormatterFn.call(funcContext)
+            expect(result).toBe('1,234,567.8%');
+        });
+    });
+
+    describe('function pieDataLabelFormatter', () => {
+        let funcContext;
+        let opts;
+
+        beforeEach(() => {
+            spyOn(highchartsRenderer, 'defaultDataLabelFormatter').and.returnValue(function() { return this.value })
+            funcContext = {
+                value: '12345.678',
+                point: {
+                    color: 'red',
+                    name: 'test',
+                    percentage: 12.3456,
+                }
             };
-            expect(highchartsRenderer.isSystemField(field)).toBe(false);
+            opts = {
+                chartOptions: {
+                    label_pie: {
+                        use_area_color: false,
+                        show_percentage_in_labels: false,
+                        show_value_in_labels: false,
+                    }
+                }
+            }
+        });
+
+        it('should return null if value is nor defined', () => {
+            highchartsRenderer.defaultDataLabelFormatter.and.returnValue(() => null);
+            let func = highchartsRenderer.pieDataLabelFormatter(null, opts);
+            let result = func.call(funcContext);
+            expect(result).toBe(null);
+        });
+
+        it('should present only name with area color if only use_area_color option enabled', () => {
+            opts.chartOptions.label_pie.use_area_color = true;
+            let func = highchartsRenderer.pieDataLabelFormatter(null, opts);
+            let result = func.call(funcContext);
+            expect(result).toBe('<b><span style="color: red;">test</span><span>\u200E: </span></b>');
+        });
+
+        it('should present only name and value if only show_value_in_labels option enabled', () => {
+            opts.chartOptions.label_pie.show_value_in_labels = true;
+            let func = highchartsRenderer.pieDataLabelFormatter(null, opts);
+            let result = func.call(funcContext);
+            expect(result).toBe('<b><span >test</span><span>\u200E: 12345.678</span></b>');
+        });
+
+        it('should present only name and percentage if only show_percentage_in_labels option enabled', () => {
+            opts.chartOptions.label_pie.show_percentage_in_labels = true;
+            let func = highchartsRenderer.pieDataLabelFormatter(null, opts);
+            let result = func.call(funcContext);
+            expect(result).toBe('<b><span >test</span><span>\u200E: (12.35%)</span></b>');
+        });
+
+        it('should present vale + name + percentage if only % and value options enabled', () => {
+            opts.chartOptions.label_pie.show_percentage_in_labels = true;
+            opts.chartOptions.label_pie.show_value_in_labels = true;
+            let func = highchartsRenderer.pieDataLabelFormatter(null, opts);
+            let result = func.call(funcContext);
+            expect(result).toBe('12345.678<br><b><span >test</span><span>\u200E: (12.35%)</span></b>');
+        });
+    });
+
+    describe('function defaultDataLabelFormatter', () => {
+        let funcContext;
+        let opts;
+
+        beforeEach(() => {
+            funcContext = { y: '12345.678' };
+            opts = {}
+        });
+
+        it('should return local string if there are no pivotData', () => {
+            let fn = highchartsRenderer.defaultDataLabelFormatter(null, {})
+            let result = fn.call(funcContext)
+            expect(result).toBe('12,345.678');
         });
     });
 
@@ -1042,6 +1140,22 @@ describe('highcharts_renderer', () => {
         });
     });
 
+    describe('function isSystemField', () => {
+        it('system name', () => {
+            const field = {
+                name: 'Doc_ID'
+            };
+            expect(highchartsRenderer.isSystemField(field)).toBe(true);
+        });
+
+        it('not system name', () => {
+            const field = {
+                name: 'field name'
+            };
+            expect(highchartsRenderer.isSystemField(field)).toBe(false);
+        });
+    });
+
     describe('function getFieldColorClass', () => {
         it('should return "green_field" if field is not a system field and not mandatory', () => {
             const field = {
@@ -2327,7 +2441,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-
     describe('function getChartAxisLabel', () => {
         it('should return default value', () => {
             expect(highchartsRenderer.getChartAxisLabel('invalidType')).toBe('Axis (Category)')