@datarailsshared/dr_renderer 1.2.403 → 1.2.405

package/package.json

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

package/src/highcharts_renderer.js

@@ -863,19 +863,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     /*  model renderers */
 
-    highchartsRenderer.tableCSVExportRenderer = function (pivotData, opts) {
-        var aggregator, colAttrs, colKey, colKeys, defaults, i, j, rowAttrs, rowKey, rowKeys, tempAr,
+    highchartsRenderer.tableCSVExportRenderer = function (pivotData) {
+        var aggregator, colAttrs, colKey, colKeys, i, j, rowAttrs, rowKey, rowKeys, tempAr,
             totalAggregator, val;
 
         var hasProp = {}.hasOwnProperty;
         var forExport = [];
 
-        defaults = {
-            localeStrings: {
-                totals: "Totals"
-            }
-        };
-        opts = $.extend(defaults, opts);
+        const TOTAL_CELL = 'Totals'; 
         colAttrs = pivotData.colAttrs;
         rowAttrs = pivotData.rowAttrs;
         rowKeys = pivotData.getRowKeys();
@@ -897,7 +892,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             tempAr = tempAr.concat(lodash.map(colKeys, function (row) {
                 return row[j];
             }));
-            tempAr.push(opts.localeStrings.totals);
+            tempAr.push(TOTAL_CELL);
             forExport.push(tempAr);
         }
 
@@ -930,7 +925,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         for (j in rowAttrs) {
             if (!hasProp.call(rowAttrs, j)) continue;
-            tempAr.push(opts.localeStrings.totals)
+            tempAr.push(TOTAL_CELL)
         }
 
         for (j in colKeys) {
@@ -949,10 +944,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return forExport;
     };
 
-    highchartsRenderer.getNoDataResult = function (rendererOptions, to_match) {
+    highchartsRenderer.getNoDataResult = function (to_match) {
         var temp_result = $('<div class="noData-box"></div>');
         var resultsArr = [];
-        var subTitle;
 
         if (to_match) {
             resultsArr.push(highchartsRenderer.getWidgetPlaceholder(highchartsRenderer.widgetPlaceholders.tooMuchData));
@@ -1070,11 +1064,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         if (!seriesDataLength && !chartOptions.onlyText) {
-            result = highchartsRenderer.getNoDataResult(chartOptions);
+            result = highchartsRenderer.getNoDataResult();
             opts.error_has_occurred = true;
             opts.error_params = highchartsRenderer.widgetPlaceholders.nodata;
         } else if (!chartOptions.onlyText && chartOptions.series && toMatch) {
-            result = highchartsRenderer.getNoDataResult(chartOptions, toMatch);
+            result = highchartsRenderer.getNoDataResult(toMatch);
             opts.error_has_occurred = true;
             opts.error_params = highchartsRenderer.widgetPlaceholders.tooMuchData;
         } else {
@@ -4669,7 +4663,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     class: uniqueCategories.length < minCategories ? 'waterfall-nodata' : 'waterfall-too-much-data',
                 }
 
-                return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
+                return highchartsRenderer.getNoDataResult(true);
             }
         }
 
@@ -4680,7 +4674,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             options.error_has_occurred = true;
             options.error_params = highchartsRenderer.widgetPlaceholders.nodata;
-            return highchartsRenderer.getNoDataResult(options.rendererOptions);
+            return highchartsRenderer.getNoDataResult();
         }
 
         if (rowData.length > highchartsRenderer.MAX_ROWS_FOR_SHOW_RESULTS) {
@@ -4690,7 +4684,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             options.error_has_occurred = true;
             options.error_params = highchartsRenderer.widgetPlaceholders.tooMuchData;
-            return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
+            return highchartsRenderer.getNoDataResult(true);
         }
 
         var tmp = $.pivotUtilities.aggregatorTemplates;
@@ -4839,7 +4833,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     class: uniqueCategories.length < minCategories ? 'waterfall-nodata' : 'waterfall-too-much-data',
                 }
 
-                return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
+                return highchartsRenderer.getNoDataResult(true);
             }
         }
 
@@ -4850,7 +4844,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             options.error_has_occurred = true;
             options.error_params = highchartsRenderer.widgetPlaceholders.nodata;
-            return highchartsRenderer.getNoDataResult(options.rendererOptions);
+            return highchartsRenderer.getNoDataResult();
         }
 
         if (rowData.length > highchartsRenderer.MAX_ROWS_FOR_SHOW_RESULTS) {
@@ -4860,7 +4854,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             options.error_has_occurred = true;
             options.error_params = highchartsRenderer.widgetPlaceholders.tooMuchData;
-            return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
+            return highchartsRenderer.getNoDataResult(true);
         }
 
         var tmp = $.pivotUtilities.aggregatorTemplates;

package/tests/highcharts_renderer.test.js

@@ -6244,6 +6244,84 @@ describe('highcharts_renderer', () => {
         });
     });
 
+    describe('Function tableCSVExportRenderer', () => {
+        window._ = lodash;
+        it('should create csv json object representation based on pivot data', () => {
+            const inputs = [
+                {
+                    "Date": 1653955200,
+                    "Amount": 2849521.69
+                },
+                {
+                    "Date": 1653177600,
+                    "Amount": 3141257.27
+                },
+                {
+                    "Date": 1652400000,
+                    "Amount": 1700691.7000000002
+                },
+                {
+                    "Date": 1651363200,
+                    "Amount": 2142840.39
+                },
+                {
+                    "Amount": 9834311.05
+                },
+                {
+                    "col_keys": [
+                        [
+                            1651363200
+                        ],
+                        [
+                            1652400000
+                        ],
+                        [
+                            1653177600
+                        ],
+                        [
+                            1653955200
+                        ]
+                    ],
+                    "row_keys": []
+                }
+            ];
+            const subOptions = {
+                "sorters": () => null,
+                "sortByValueAttrs": [],
+                "cols": [
+                    "Date",
+                    "Payment Date"
+                ],
+                "rows": [],
+                "colFormats": [
+                    {
+                        "type": "Date",
+                        "name": "Date",
+                        "val_not_convert": []
+                    },
+                    {
+                        "type": "Date",
+                        "name": "Payment Date",
+                        "val_not_convert": []
+                    }
+                ],
+                "rowFormats": [],
+                "rendererOptions": {
+                },
+            };
+            const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
+            const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData);
+            expect(csvJson).toEqual(
+                [
+                    [1651363200, 1652400000, 1653177600, 1653955200, 'null', 'Totals' ],
+                    ['null', 'null', 'null', 'null', 'null', 'Totals'],
+                    [],
+                    [1, 1, 1, 1, 2, 6]
+                ]
+            );
+        });
+    });
+
     describe("Function returnRawDataValue", () => {
         const testCases = [{
                 name: "Date",
@@ -7427,4 +7505,42 @@ describe('highcharts_renderer', () => {
             ]);
         })
     });
+
+    describe('Function getNoDataResult', () => {
+        const container = $('<div class="noData-box"></div>');
+
+        it('should return no data html', () => {
+            const placeholderMeta = highchartsRenderer.widgetPlaceholders.nodata;
+            const expected = container.clone().html(highchartsRenderer.getWidgetPlaceholder(placeholderMeta));
+            expect(highchartsRenderer.getNoDataResult()).toEqual(expected);
+        });
+
+        it('should return too much data html', () => {
+            const placeholderMeta = highchartsRenderer.widgetPlaceholders.tooMuchData;
+            const expected = container.clone().html(highchartsRenderer.getWidgetPlaceholder(placeholderMeta));
+            expect(highchartsRenderer.getNoDataResult(true)).toEqual(expected);
+        });
+
+    });
+
+    describe('Function getWidgetPlaceholder', () => {
+        const titleSelector = '.noData-title';
+        const imageSelector = '.noData-image';
+        const textSelector = '.noData-text';
+
+        it('should return default placeholder when no data is provided', () => {
+            const placeholder = highchartsRenderer.getWidgetPlaceholder();
+            const defaultPlaceholder = '<div class="noData"><i class="noData-image"></i> no data</div>';
+            expect(placeholder[0].outerHTML).toEqual(defaultPlaceholder);
+        });
+
+        it('should return placeholder html when data is provided', () => {
+            Object.entries(highchartsRenderer.widgetPlaceholders).forEach(([, value]) => {
+                const placeholder = highchartsRenderer.getWidgetPlaceholder(value)[0];
+                expect(placeholder.querySelector(titleSelector).innerHTML).toEqual(value.title);
+                expect(placeholder.querySelector(imageSelector).classList.contains(value.class)).toBeTruthy();
+                expect(placeholder.querySelector(textSelector).innerHTML).toEqual(value.text);
+            });
+        });
+    })
 });