@datarailsshared/dr_renderer 1.2.416 → 1.2.417

package/package.json

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

package/src/highcharts_renderer.js

@@ -859,7 +859,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     /*  model renderers */
 
-    highchartsRenderer.tableCSVExportRenderer = function (pivotData) {
+    highchartsRenderer.tableCSVExportRenderer = function (pivotData, chartOptions) {
         var aggregator, colAttrs, colKey, colKeys, i, j, rowAttrs, rowKey, rowKeys, tempAr,
             totalAggregator, val;
 
@@ -867,11 +867,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var forExport = [];
 
         const TOTAL_CELL = 'Totals'; 
+
         colAttrs = pivotData.colAttrs;
         rowAttrs = pivotData.rowAttrs;
         rowKeys = pivotData.getRowKeys();
         colKeys = pivotData.getColKeys();
 
+        let isDisplayingColTotals = lodash.get(chartOptions, 'table_options.show_column_total') && colKeys.length;
+        let isDisplayingRowTotals = lodash.get(chartOptions, 'table_options.show_row_total') && rowKeys.length;
+
         for (j in colAttrs) {
             if (!hasProp.call(colAttrs, j)) continue;
             tempAr = [];
@@ -888,7 +892,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             tempAr = tempAr.concat(lodash.map(colKeys, function (row) {
                 return row[j];
             }));
-            tempAr.push(TOTAL_CELL);
+
+            if (isDisplayingRowTotals) {
+                tempAr.push(TOTAL_CELL);
+            }
+
             forExport.push(tempAr);
         }
 
@@ -911,31 +919,42 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 val = aggregator.value();
                 tempAr.push(val);
             }
-            totalAggregator = pivotData.getAggregator(rowKey, []);
-            val = totalAggregator.value();
-            tempAr.push(val);
+
+            if (isDisplayingRowTotals) {
+                totalAggregator = pivotData.getAggregator(rowKey, []);
+                val = totalAggregator.value();
+                tempAr.push(val);
+            }
+
             forExport.push(tempAr);
         }
 
         tempAr = [];
 
-        for (j in rowAttrs) {
-            if (!hasProp.call(rowAttrs, j)) continue;
-            tempAr.push(TOTAL_CELL)
+        if (isDisplayingColTotals) {
+            for (j in rowAttrs) {
+                if (!hasProp.call(rowAttrs, j)) continue;
+                tempAr.push(TOTAL_CELL)
+            }
+
+            for (j in colKeys) {
+                if (!hasProp.call(colKeys, j)) continue;
+                colKey = colKeys[j];
+                aggregator = pivotData.getAggregator([], colKey);
+                val = aggregator.value();
+                tempAr.push(val);
+            }
         }
 
-        for (j in colKeys) {
-            if (!hasProp.call(colKeys, j)) continue;
-            colKey = colKeys[j];
-            aggregator = pivotData.getAggregator([], colKey);
-            val = aggregator.value();
+        if (isDisplayingColTotals && isDisplayingRowTotals) {
+            totalAggregator = pivotData.getAggregator([], []);
+            val = totalAggregator.value();
             tempAr.push(val);
         }
 
-        totalAggregator = pivotData.getAggregator([], []);
-        val = totalAggregator.value();
-        tempAr.push(val);
-        forExport.push(tempAr);
+        if (tempAr.length) {
+            forExport.push(tempAr);
+        }
 
         return forExport;
     };

package/tests/highcharts_renderer.test.js

@@ -5962,7 +5962,15 @@ describe('highcharts_renderer', () => {
 
     describe('Function tableCSVExportRenderer', () => {
         window._ = lodash;
-        it('should create csv json object representation based on pivot data', () => {
+
+        it('should create csv json object representation based on pivot data (only cols)', () => {
+            const chartOptions = {
+                table_options: {
+                    show_column_total: true,
+                    show_row_total: true,
+                },
+            };
+
             const inputs = [
                 {
                     "Date": 1653955200,
@@ -6026,7 +6034,7 @@ describe('highcharts_renderer', () => {
                 },
             };
             const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
-            const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData);
+            const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
             expect(csvJson).toEqual(
                 [
                     [ 1651363200, 1652400000, 1653177600, 1653955200, 'Totals' ],
@@ -6037,6 +6045,164 @@ describe('highcharts_renderer', () => {
                 ]
             );
         });
+
+        describe('cases for both col and row present', () => {
+            const inputs = [
+                {
+                    "Date": 1653955200,
+                    "Type": 'Food',
+                    "Amount": 2849521.69
+                },
+                {
+                    "Date": 1653955200,
+                    "Type": 'Technology',
+                    "Amount": 321123
+                },
+                {
+                    "Date": 1653177600,
+                    "Type": 'Food',
+                    "Amount": 3141257.27
+                },
+                {
+                    "Date": 1653177600,
+                    "Type": 'Technology',
+                    "Amount": 4321
+                },
+                {
+                    "Date": 1653955200,
+                    "Amount": 123
+                },
+                {
+                    "Type": 'Technology',
+                    "Amount": 1
+                },
+                {
+                    "Type": 'Food',
+                    "Amount": 2
+                },
+                {
+                    "Date": 1653177600,
+                    "Amount": 321
+                },
+                {
+                    "Amount": 9834311.05
+                },
+                {
+                    "col_keys": [
+                        [
+                            1651363200
+                        ],
+                        [
+                            1653177600
+                        ],
+                    ],
+                    "row_keys": [
+                        [
+                            'Food'
+                        ],
+                        [
+                            'Technology'
+                        ]
+                    ]
+                }
+            ];
+            const subOptions = {
+                "sorters": () => null,
+                "sortByValueAttrs": [],
+                "cols": ["Date"],
+                "rows": ["Type"],
+                "colFormats": [
+                    {
+                        "type": "Date",
+                        "name": "Date",
+                        "val_not_convert": []
+                    },
+                ],
+                "rowFormats": [
+                    {
+                        "type": "Text",
+                        "name": "Type",
+                        "val_not_convert": []
+                    },
+                ],
+                "rendererOptions": {
+                },
+            };
+    
+            it('should create csv json object representation based on pivot data, with totals', () => {
+                const chartOptions = {
+                    table_options: {
+                        show_column_total: true,
+                        show_row_total: true,
+                    },
+                };
+                const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
+                const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
+                expect(csvJson).toEqual(
+                    [
+                        ["Date", 1653177600, 1653955200, "Totals"],
+                        ["Type"],
+                        ["Food", 1, 1, 1],
+                        ["Technology", 1, 1, 1],
+                        ["Totals", 1, 1, 2]
+                    ]
+                );
+            });
+    
+            it('should create csv json object representation based on pivot data, without col totals', () => {
+                const chartOptions = {
+                    table_options: {
+                        show_column_total: false,
+                        show_row_total: true,
+                    },
+                };
+                const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
+                const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
+                expect(csvJson).toEqual([
+                    ["Date", 1653177600, 1653955200, "Totals"],
+                    ["Type"],
+                    ["Food", 1, 1, 1],
+                    ["Technology", 1, 1, 1]
+                ]);
+            });
+    
+            it('should create csv json object representation based on pivot data, without row totals', () => {
+                const chartOptions = {
+                    table_options: {
+                        show_column_total: true,
+                        show_row_total: false,
+                    },
+                };
+    
+                const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
+                const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
+                expect(csvJson).toEqual([
+                    ["Date", 1653177600, 1653955200],
+                    ["Type"],
+                    ["Food", 1, 1],
+                    ["Technology", 1, 1],
+                    ["Totals", 1, 1]
+                ]);
+            });
+    
+            it('should create csv json object representation based on pivot data, without col and row totals', () => {
+                const chartOptions = {
+                    table_options: {
+                        show_column_total: false,
+                        show_row_total: false,
+                    },
+                };
+    
+                const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
+                const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
+                expect(csvJson).toEqual([
+                    ["Date", 1653177600, 1653955200],
+                    ["Type"],
+                    ["Food", 1, 1],
+                    ["Technology", 1, 1],
+                ]);
+            });
+        });
     });
 
     describe("Function returnRawDataValue", () => {