@datarailsshared/dr_renderer 1.5.124 → 1.5.129

package/package.json

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

package/src/highcharts_renderer.js

@@ -1038,7 +1038,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 tempAr[temp_len - 1] = highchartsRenderer.getFieldName(colAttrs[j]);
             }
 
-            const formattedColKeys = highchartsRenderer.getFormattedColKeys(pivotData, null, true);
+            const formattedColKeys = highchartsRenderer.getFormattedColKeys(pivotData, null);
             tempAr = tempAr.concat(lodash.map(formattedColKeys, function (row) {
                 return row[j];
             }));
@@ -1057,11 +1057,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
         forExport.push(tempAr);
 
+        const formattedRowKeys = highchartsRenderer.getFormattedRowKeys(pivotData, null);
+
         for (i in rowKeys) {
             if (!hasProp.call(rowKeys, i)) continue;
             tempAr = [];
             rowKey = rowKeys[i];
-            tempAr = tempAr.concat(rowKey);
+            const formattedRowKey = formattedRowKeys[i];
+            tempAr = tempAr.concat(formattedRowKey);
             for (j in colKeys) {
                 if (!hasProp.call(colKeys, j)) continue;
                 colKey = colKeys[j];
@@ -8235,10 +8238,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 lodash.forEach(values, (value, key) => {
                     const formatInfo = pivotData[type][key] || {};
                     const valueToFloat = parseFloat(value);
+                    const isBlankDate = formatInfo.type === 'Date' && (value === '' || value === '[blank]');
                     const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value, formatInfo.format).isValid());
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
 
-                    if (isNumberFormatting || isDate) {
+                    if (isNumberFormatting || isDate || isBlankDate) {
                         values[key] = highchartsRenderer.returnRawDataValue(
                             formatInfo.type,
                             !isNaN(valueToFloat) ? valueToFloat : value,

package/tests/highcharts_renderer.test.js

@@ -5120,6 +5120,17 @@ describe('highcharts_renderer', () => {
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
                 expect(formattedKey).toEqual(initialKey);
             });
+
+            // some e2e tests exist that expects this behavior
+            it('should format blank value with [blank] text', () => {
+                const initialKey = ['DR_Others', ''];
+                const pivotData = {
+                    colFormats: [{ type: "Text", name: "Month" }, { type: 'Date', name: "Date" }],
+                };
+                const type = 'colFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+                expect(formattedKey).toEqual(['DR_Others', '[blank]']);
+            });
         });
     });
 
@@ -6218,6 +6229,119 @@ describe('highcharts_renderer', () => {
                 ]);
             });
         });
+
+        describe('cases for date in rows (timestamp row keys)', () => {
+            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": [
+                        ['Food'],
+                        ['Technology'],
+                    ],
+                    "row_keys": [
+                        [1653177600],
+                        [1653955200]
+                    ]
+                }
+            ];
+            const subOptions = {
+                "cols": ["Type"],
+                "rows": ["Date"],
+                "keysObject": {
+                    "row_keys": [[1653177600], [1653955200]],
+                    "col_keys": [["Food"], ["Technology"]],
+                },
+                "colFormats": [
+                    {
+                        "type": "Text",
+                        "name": "Type",
+                        "val_not_convert": []
+                    },
+                ],
+                "rowFormats": [
+                    {
+                        "type": "Date",
+                        "name": "Date",
+                        "val_not_convert": []
+                    },
+                ],
+                "rendererOptions": {
+                },
+            };
+
+            it('should format timestamp row keys as dates in csv export', () => {
+                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([
+                    ["Type", "Food", "Technology", "Totals"],
+                    ["Date"],
+                    ["05/22/2022", 1, 1, 1],
+                    ["05/31/2022", 1, 1, 1],
+                    ["Totals", 1, 1, 2]
+                ]);
+            });
+
+            it('should format timestamp row keys as dates without 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([
+                    ["Type", "Food", "Technology"],
+                    ["Date"],
+                    ["05/22/2022", 1, 1],
+                    ["05/31/2022", 1, 1],
+                ]);
+            });
+        });
     });
 
     describe("Function returnRawDataValue", () => {