@datarailsshared/dr_renderer 1.5.88 → 1.5.89

package/package.json

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

package/src/highcharts_renderer.js

@@ -9877,7 +9877,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 lodash.forEach(values, (value, key) => {
                     const formatInfo = pivotData[type][key] || {};
                     const valueToFloat = parseFloat(value);
-                    const isDate = formatInfo.type === 'Date';
+                    const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value).isValid());
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
 

package/tests/highcharts_renderer.test.js

@@ -5089,6 +5089,10 @@ describe('highcharts_renderer', () => {
         });
 
         describe('formatting Dates', () => {
+            afterEach(() => {
+                lodash.set(document, 'ReportHippo.user.features', []);
+            });
+
             it('should return formatted multivalue colKey as array (format_dates_as_other_axis_types is ON)', () => {
                 lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
                 const initialKey = [1687277052, 1687277052];
@@ -5136,6 +5140,29 @@ describe('highcharts_renderer', () => {
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKeyAlreadyFormatted, pivotData, type);
                 expect(formattedKey).toEqual(initialKeyAlreadyFormatted);
             });
+
+            it('should return NOT formatted value when type is Date but value is not a valid moment date', () => {
+                lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
+                const initialKey = ['Some Text Value', 'Another Text'];
+                const pivotData = {
+                    colFormats: [{ type: 'Date' }, { type: 'Date' }],
+                    isFormattingAxisLabels: true,
+                };
+                const type = 'colFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+                expect(formattedKey).toEqual(initialKey);
+            });
+
+            it('should return formatted value when type is Date and value is a valid moment date (format_dates_as_other_axis_types is OFF)', () => {
+                const initialKey = ['Feb-24', 'Jan-24'];
+                const pivotData = {
+                    colFormats: [{ type: 'Date' }, { type: 'Date' }],
+                    isFormattingAxisLabels: true,
+                };
+                const type = 'colFormats';
+                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
+                expect(formattedKey).toEqual(initialKey);
+            });
         });
     });
 
@@ -6152,6 +6179,14 @@ describe('highcharts_renderer', () => {
     describe('Function tableCSVExportRenderer', () => {
         window._ = lodash;
 
+        beforeEach(() => {
+            lodash.set(document, 'ReportHippo.user.features', ['format_dates_as_other_axis_types']);
+        });
+
+        afterEach(() => {
+            lodash.set(document, 'ReportHippo.user.features', []);
+        });
+
         it('should create csv json object representation based on pivot data (only cols)', () => {
             const chartOptions = {
                 table_options: {
@@ -6226,7 +6261,7 @@ describe('highcharts_renderer', () => {
             const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
             expect(csvJson).toEqual(
                 [
-                    [ 1651363200, 1652400000, 1653177600, 1653955200, 'Totals' ],
+                    [ '05/01/2022', '05/13/2022', '05/22/2022', '05/31/2022', 'Totals' ],
                     [ undefined, undefined, undefined, undefined, 'Totals' ],
                     [],
                     [ 1, 1, 1, 1, 2 ],
@@ -6329,7 +6364,7 @@ describe('highcharts_renderer', () => {
                 const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
                 expect(csvJson).toEqual(
                     [
-                        ["Date", 1653177600, 1653955200, "Totals"],
+                        ["Date", "05/22/2022", "05/31/2022", "Totals"],
                         ["Type"],
                         ["Food", 1, 1, 1],
                         ["Technology", 1, 1, 1],
@@ -6348,7 +6383,7 @@ describe('highcharts_renderer', () => {
                 const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
                 const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
                 expect(csvJson).toEqual([
-                    ["Date", 1653177600, 1653955200, "Totals"],
+                    ["Date", "05/22/2022", "05/31/2022", "Totals"],
                     ["Type"],
                     ["Food", 1, 1, 1],
                     ["Technology", 1, 1, 1]
@@ -6366,7 +6401,7 @@ describe('highcharts_renderer', () => {
                 const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
                 const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
                 expect(csvJson).toEqual([
-                    ["Date", 1653177600, 1653955200],
+                    ["Date", "05/22/2022", "05/31/2022"],
                     ["Type"],
                     ["Food", 1, 1],
                     ["Technology", 1, 1],
@@ -6385,7 +6420,7 @@ describe('highcharts_renderer', () => {
                 const pivotData = $.pivotUtilities.getPivotDataModel(inputs, subOptions);
                 const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData, chartOptions);
                 expect(csvJson).toEqual([
-                    ["Date", 1653177600, 1653955200],
+                    ["Date", "05/22/2022", "05/31/2022"],
                     ["Type"],
                     ["Food", 1, 1],
                     ["Technology", 1, 1],