@datarailsshared/dr_renderer 1.5.41 → 1.5.50

package/package.json

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

package/src/highcharts_renderer.js

@@ -1521,7 +1521,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if ($.isNumeric(val)) {
                         val = parseFloat(val);
                     }
-                } else if (helpers.isShowingEmptyValues(additionOptions)) {
+                } else {
+                    // don't check helpers.isShowingEmptyValues as e2e rely on empty values being present in the DOM for column charts
                     if (onlyNumbers)
                         val = NaN;
                     else
@@ -6639,7 +6640,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'checkbox',
                     value_name: 'dislay_empty_values',
                     element_label: 'Display empty values',
-                    default_value: true
+                    default_value: false
                 },
             ]
         },
@@ -6667,7 +6668,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 element_type: 'checkbox',
                 value_name: 'dislay_empty_values',
                 element_label: 'Display empty values',
-                default_value: true
+                default_value: false
             },
             {
                 element_type: 'devider',
@@ -9315,12 +9316,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/src/smart_queries_helper.js

@@ -30,21 +30,29 @@ function getSqAggregator(tree, rowKey, flatColKey) {
 
 function handleForecastSeries(chart_series, chartOptions, pivotData) {
   const midMonthOffset = 0.5;
-  const sqInput = _.filter(pivotData.input, item => item['Scenario'] === DR_SCENARIO.SQ_Actuals);
+  const sqInput = _.filter(pivotData.input, item => item['Scenario'] === DR_SCENARIO.SQ_Actuals && !!item['Reporting Month']);
   const noSqSeries = _.filter(chart_series, (s) => !_.includes(s.name, DR_SCENARIO.SQ_Actuals)); // SQ_Actuals are just base for forecast
 
   return _.map(noSqSeries, series => {
       const itemScenario = getSqScenarioCycle(series.name);
-      const sqCount = _.filter(sqInput, item => _.startsWith(pivotData.getFlatKey(item, pivotData.rowAttrs), itemScenario)).length;
+      const sqItems = _.filter(sqInput, item => {
+          const itemRowKey = pivotData.getFlatKey(item, pivotData.rowAttrs);
 
-      if(!sqCount) return series;
+          if(itemRowKey.includes(DR_SCENARIO.SQ_Actuals)) {
+              return _.startsWith(itemRowKey, itemScenario);
+          }
+
+          return series.name === itemRowKey;
+      });
+
+      if(!sqItems.length) return series;
 
       return {
           name: series.name,
           data: series.data,
           zoneAxis: "x",
           zones: [
-              { value: sqCount - midMonthOffset, dashStyle: chartOptions.chart.actuals },
+              { value: sqItems.length - midMonthOffset, dashStyle: chartOptions.chart.actuals },
               { dashStyle: chartOptions.chart.forecast },
           ],
       }

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');
+        });
     });