@datarailsshared/dr_renderer 1.4.78 → 1.4.80

package/package.json

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

package/src/dr_pivottable.js

@@ -2356,6 +2356,9 @@ let initDRPivotTable = function($, window, document) {
         main = function(rowAttrs, rowKeys, colAttrs, colKeys, pivotData) {
             if (opts.chartOptions.isSmartQueriesEnabled) {
                 rowKeys = rowKeys.filter(rowKey => !rowKey.includes(DR_SCENARIO.SQ_Actuals));
+                rowKeys = Array.from(
+                    new Set(rowKeys.map(JSON.stringify))
+                ).map(JSON.parse);
             }
             var c,rowspan, colHeaderCols, colHeaderHeaders, colHeaders, h, k, l, len, len1, result, rowHeaderHeaders, rowHeaderRows, rowHeaders, tbody, thead, tr;
             rowHeaders = [];

package/src/highcharts_renderer.js

@@ -1250,6 +1250,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var chart_series = [],
             row_n_keys = pivotData.getRowKeys(),
             col_n_keys = pivotData.getColKeys();
+        const chartType = chartOptions && chartOptions.chart && chartOptions.chart.type ? chartOptions.chart.type : null;
+        const isCombiLineForecastChart = opts.chartOptions.isSmartQueriesEnabled;
+        const indexOfScenarioCycleFilter = lodash.findIndex(pivotData.rowAttrs, (rowAttr) => rowAttr === 'Scenario Cycle');
+
+        if (isChartTypeSupportedForSmartQuery(chartType) && pivotData.rowAttrs?.length < row_n_keys?.[0]?.length && indexOfScenarioCycleFilter > -1) {
+            const indexOfScenarioFilter = row_n_keys[0].length - 1;
+            for (let i = 0; i < row_n_keys?.length; i++) {
+                row_n_keys[i].splice(indexOfScenarioFilter, 1);
+            }
+            row_n_keys = Array.from(
+                new Set(row_n_keys.map(JSON.stringify))
+            ).map(JSON.parse);
+        }
 
         var has_delta = false;
         if (additionOptions && lodash.has(additionOptions, "delta_column.field") && additionOptions.delta_column.field == "series") {
@@ -1430,8 +1443,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         chart_series = chart_series.concat(trendSerieses);
 
         highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
-        const chartType = chartOptions && chartOptions.chart && chartOptions.chart.type ? chartOptions.chart.type : null;
-        const isCombiLineForecastChart = opts.chartOptions.isSmartQueriesEnabled;
         const smartQuerySeries = isChartTypeSupportedForSmartQuery(chartType)
             ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions, pivotData, isCombiLineForecastChart)
             : null;