@datarailsshared/dr_renderer 1.5.46 → 1.5.52

package/package.json

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

package/src/dr_pivottable.js

@@ -1273,9 +1273,6 @@ let initDRPivotTable = function($, window, document) {
                 "rowspan": rowHeader.descendants + 1,
                 "colspan": colspan
             });
-            if (pivotData.isSmartQueriesEnabled) {
-                th.textContent = th.textContent.replace(DR_SCENARIO.Forecast, 'Forecast Smart Query');
-            }
             if (opts.chartOptions.table_options.hide_nulls_in_headers) {
                 th.textContent = th.textContent.replace('[null]', '');
             }

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',
@@ -9320,11 +9321,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             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') {
                     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;

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 },
           ],
       }