@datarailsshared/dr_renderer 1.4.108 → 1.4.112

package/package.json

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

package/src/dr_pivottable.js

@@ -177,7 +177,7 @@ let initDRPivotTable = function($, window, document) {
             return keys.join(delim);
         }
 
-        DRPivotData.prototype.processRecord = function(record) {
+        DRPivotData.prototype.processRecord = function(record, isSmartQueriesEnabled) {
             if (!this.notFirst) {
                 this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
                 this.notFirst = true;
@@ -211,7 +211,9 @@ let initDRPivotTable = function($, window, document) {
             if (!colKey.length && !rowKey.length) {
                 this.allTotal.push(record);
             } else if (!colKey.length && rowKey.length) {
-                if (!this.rowTotals[flatRowKey]) {
+                if (!this.rowTotals[flatRowKey] && !(record['Scenario Cycle']
+                    && isSmartQueriesEnabled
+                    && (record['Scenario'] === 'SQ_Actuals' || record['Scenario'] === 'Forecast'))) {
                     this.rowTotals[flatRowKey] = getRowAggregator(rowKey.slice());
                     this.rowTotals[flatRowKey].push(record);
                 }

package/src/pivottable.js

@@ -641,6 +641,7 @@ let initPivotTable = function($, window, document) {
             this.filter = (ref9 = opts.filter) != null ? ref9 : (function() {
                 return true;
             });
+            this.isSmartQueriesEnabled = opts.rendererOptions?.chartOptions?.isSmartQueriesEnabled || false;
             this.tree = {};
 
             this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object' && helpers.backendSortingKeysAreNotEmpty(opts.keysObject);
@@ -670,7 +671,7 @@ let initPivotTable = function($, window, document) {
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
                     if (_this.filter(record)) {
-                        return _this.processRecord(record);
+                        return _this.processRecord(record, _this.isSmartQueriesEnabled);
                     }
                 };
             })(this));

package/src/smart_queries_helper.js

@@ -25,8 +25,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['Reporting Month']
+    (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) && !!item['Reporting Month']
   );
 
   const data = lodash.map(filtered, item => ({
@@ -34,7 +33,7 @@ function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOf
     name: item['Reporting Month'],
     initialName: item['Reporting Month'],
     type: item.Scenario,
-  })).sort((a, b) => new Date(a.name) - new Date(b.name));
+  })).sort((a, b) => sortRowValuesByName(a, b));
 
   const sqCount = lodash.filter(input, item => item.Scenario === DR_SCENARIO.SQ_Actuals).length;
 
@@ -64,7 +63,9 @@ function buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actu
               initialName: item['Reporting Month'],
               type: item.Scenario,
             }))
-            .value().sort((a, b) => new Date(a.name) - new Date(b.name));
+            .value().sort((a, b) => {
+                return sortRowValuesByName(a, b);
+            });
         if (!data.length) {
             resultingSeries.push(series);
             continue;
@@ -86,6 +87,12 @@ function buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actu
     return resultingSeries;
 }
 
+function sortRowValuesByName(rowValueA, rowValueB) {
+    const aDate = new Date(rowValueA.name);
+    const bDate = new Date(rowValueB.name);
+    return !isNaN(aDate.getTime()) && !isNaN(bDate.getTime()) ? aDate - bDate : rowValueA.name.localeCompare(rowValueB.name);
+}
+
 function buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset) {
   const seriesA = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.SQ_Actuals));
   const seriesB = lodash.find(chart_series, s => s.name && lodash.includes(s.name, DR_SCENARIO.Forecast));