@datarailsshared/dr_renderer 1.4.82 → 1.4.89

package/package.json

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

package/src/highcharts_renderer.js

@@ -10007,11 +10007,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         e.point.name = e.point.initialName;
         e.point.series.name = lodash.get(e.point.series, 'userOptions.initialName', e.point.series.name);
         const seriesData = lodash.get(e.point.series, 'userOptions.data');
-        const initialNameForSmartQueries = seriesData
+        const initialSeriesName = seriesData
             ? lodash.find(seriesData, obj => obj.name === e.point.name)
             : null;
-        if (initialNameForSmartQueries && initialNameForSmartQueries.type) {
-            e.point.series.name = initialNameForSmartQueries.type === "SQ_Actuals" ? 'Actuals' : 'Forecast';
+        if (initialSeriesName && initialSeriesName.type && ['SQ_Actuals', 'Forecast'].includes(initialSeriesName.type)) {
+            e.point.series.name = 'Forecast';
         }
         lodash.set(e, 'point.category.userOptions', e.point.initialName.toString().split(highchartsRenderer.delimer));
     }

package/src/smart_queries_helper.js

@@ -26,7 +26,7 @@ function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData
 function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset, name) {
   const filtered = input.filter(item =>
     (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) &&
-    item.Amount !== 0
+    item.Amount !== 0 && !!item['Reporting Month']
   );
 
   const data = lodash.map(filtered, item => ({
@@ -57,7 +57,7 @@ function buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actu
 
         const data = lodash.chain(input)
             .filter(item => item['Scenario Cycle'] === series.name &&
-          (item['Scenario'] === DR_SCENARIO.SQ_Actuals || item['Scenario'] === DR_SCENARIO.Forecast))
+          (item['Scenario'] === DR_SCENARIO.SQ_Actuals || item['Scenario'] === DR_SCENARIO.Forecast) && !!item['Reporting Month'])
             .map(item => ({
               y: item.Amount,
               name: item['Reporting Month'],