@datarailsshared/dr_renderer 1.5.39 → 1.5.46

package/package.json

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

package/src/highcharts_renderer.js

@@ -2131,8 +2131,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.addSecondYAxis = function (pivotData, chartOptions, additionOptions, opts) {
-        const varianceColor = (additionOptions && additionOptions.delta_column.color) || (highchartsRenderer && highchartsRenderer.variance_color) || Highcharts.getOptions().colors[7];
-        const forcePercentage = lodash.get(opts, 'comboOptions.secondaryAxisSettings.is_percentage', false) || lodash.get(additionOptions, 'delta_column.is_percentage', false);
+       const forcePercentage = lodash.get(opts, 'comboOptions.secondaryAxisSettings.is_percentage', false) || lodash.get(additionOptions, 'delta_column.is_percentage', false);
 
         chartOptions.yAxis = [chartOptions.yAxis];
         chartOptions.yAxis[1] = {
@@ -2141,13 +2140,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             title: {
                 text: highchartsRenderer.encodeHTMLBrackets(opts.comboOptions.secondaryAxisSettings.name),
                 style: {
-                    color: varianceColor
+                    color: CHART_COLORS.LABEL_SECOND
                 }
             },
             labels: {
                 formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts, forcePercentage),
                 style: {
-                    color: varianceColor
+                    color: CHART_COLORS.LABEL_SECOND
                 }
             },
             opposite: true,
@@ -9316,12 +9315,28 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (!keys || !invertedDateStringMap) {
             return;
         }
+        const dateWidgetFields = lodash.filter(widgetFields, obj => obj.type === 'Date');
         const replaceNestedKeys = (nestedKeys) => {
             for (let i = 0; i < nestedKeys.length; i++) {
                 if (Array.isArray(nestedKeys[i])) {
                     replaceNestedKeys(nestedKeys[i]);
-                } else if (invertedDateStringMap[nestedKeys[i]] && widgetFields[i] && widgetFields[i].type === 'Date') {
-                    nestedKeys[i] = invertedDateStringMap[nestedKeys[i]];
+                } 
+                else if (invertedDateStringMap[nestedKeys[i]] && widgetFields[i] && widgetFields[i].type === 'Date') {
+                    const getFormat = (obj) => (lodash.get(obj, 'format') ?? '').toUpperCase();
+                    const isSameDateFormats = lodash.every(dateWidgetFields, obj => getFormat(obj) === getFormat(dateWidgetFields[0]));
+                    
+                    if (isSameDateFormats) {
+                        nestedKeys[i] = invertedDateStringMap[nestedKeys[i]];
+                        continue;
+                    }
+
+                    // Reformatting dates when "widgetFields" array contains fields with different formats
+                    // Fixes the issue - https://datarailsteam.atlassian.net/browse/DR-37813
+                    // Will be removed once "format_dates_as_other_axis_types" FF is deleted
+                    const format = (widgetFields[i].format ?? "MM/DD/YYYY").toUpperCase();
+                    const date = new Date(parseInt(nestedKeys[i]) * 1000);
+                    const formattedDateString = moment_lib(date).utcOffset(0).format(format) + "";
+                    nestedKeys[i] = formattedDateString;
                 }
             }
         };

package/tests/highcharts_renderer.test.js

@@ -5964,6 +5964,40 @@ describe('highcharts_renderer', () => {
             highchartsRenderer.replaceSortingKeysWithMappedValues(null, invertedDateStringMap, widget.rows);
             highchartsRenderer.replaceSortingKeysWithMappedValues(null, invertedDateStringMap, widget.rows);
         });
+
+        // This test was added to cover an edge case where multiple Date fields have the same date values
+        // but require different formatting based on their individual field settings
+        // Fixes the issue - https://datarailsteam.atlassian.net/browse/DR-37813
+        // Will be removed once "format_dates_as_other_axis_types" FF is deleted
+        it('should reformat dates when widget fields have same dates, but different formats', () => {
+            const keysObject = {
+                col_keys: [
+                    [1648684800, 1648684800, 1648684800],
+                ],
+                row_keys: [],
+                row_keys_by_cols: [],
+            };
+
+            const invertedDateStringMap = {
+                1648684800: '03/31/2022',
+            };
+
+            const widget = {
+                cols: [
+                    { type: 'Date', format: null }, // Default format MM/DD/YYYY
+                    { type: 'Date', format: 'MM-DD-YYYY' },
+                    { type: 'Date', format: 'DD/MM/YYYY' },
+                ],
+                rows: [],
+                pivot: { keysObject },
+            };
+
+            highchartsRenderer.replaceSortingKeysWithMappedValues(keysObject.col_keys, invertedDateStringMap, widget.cols);
+
+            expect(keysObject.col_keys[0][0]).toBe('03/31/2022');
+            expect(keysObject.col_keys[0][1]).toBe('03-31-2022');
+            expect(keysObject.col_keys[0][2]).toBe('31/03/2022');
+        });
     });