@datarailsshared/dr_renderer 1.5.19 → 1.5.39

package/package.json

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

package/src/dr-renderer-helpers.js

@@ -73,6 +73,7 @@ function isShowingEmptyValues(additionOptions) {
     return !additionOptions || !additionOptions.chart || additionOptions.chart.dislay_empty_values !== false;
 }
 
+const DELIMER = ' , '
 const FEATURES = {
     ENABLE_NEW_WIDGET_VALUE_FORMATTING: 'enable_new_widget_value_formatting',
     FORMAT_DATES_AS_OTHER_AXIS_TYPES: 'format_dates_as_other_axis_types',
@@ -91,5 +92,6 @@ module.exports = {
     removeSVGTextCorrection,
     disableLegendInteractionIfRequired,
     isShowingEmptyValues,
-    FEATURES
+    FEATURES,
+    DELIMER
 }

package/src/dr_pivottable.js

@@ -1,4 +1,5 @@
-const { DR_SCENARIO } = require('./smart_queries_helper');
+const { DR_SCENARIO, getSqAggregator } = require('./smart_queries_helper');
+const { DELIMER } = require('./dr-renderer-helpers');
 const { TooMuchDataError } = require('./errors');
 
 let initDRPivotTable = function($, window, document) {
@@ -10,13 +11,12 @@ let initDRPivotTable = function($, window, document) {
     const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
         'rgb(171, 216, 255)', 'rgb(174, 231, 220)', 'rgb(227, 255, 236)', 'rgb(162, 215, 227)', 'rgb(223, 239, 236)'];
 
-    var delim = " , ";
     const useNewUx = document.ReportHippo && document.ReportHippo && document.ReportHippo.user &&
       document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
     // const numberOfRows = 500; // change to activate the handsontable when num of rows bigger then this.
 
     const isFlatKeyInPivotKeys = function(keys, flatKey) {
-        return keys.some(key => key.join(delim) === flatKey);
+        return keys.some(key => key.join(DELIMER) === flatKey);
     };
 
     DRPivotData = (function(superClass) {
@@ -138,7 +138,7 @@ let initDRPivotTable = function($, window, document) {
             for (k = 0, len = attrs.length; k < len; k++) {
                 attr = attrs[k];
                 key.push((ref = record[attr]) != null ? ref : "null");
-                flatKey = key.join(delim);
+                flatKey = key.join(DELIMER);
                 if (!totals[flatKey]) {
                     totals[flatKey] = getAggregator(key.slice());
                     addKey = true;
@@ -174,7 +174,7 @@ let initDRPivotTable = function($, window, document) {
 
         DRPivotData.prototype.getFlatKey = function(record, attrs) {
             const keys = this.getAttrsKeys(record, attrs);
-            return keys.join(delim);
+            return keys.join(DELIMER);
         }
 
         DRPivotData.prototype.processRecord = function(record, isSmartQueriesEnabled) {
@@ -196,8 +196,8 @@ let initDRPivotTable = function($, window, document) {
             const rowKey = this.getAttrsKeys(record, this.rowAttrs);
             const colKey = this.getAttrsKeys(record, this.colAttrs);
 
-            let flatRowKey = rowKey.join(delim);
-            let flatColKey = colKey.join(delim);
+            let flatRowKey = rowKey.join(DELIMER);
+            let flatColKey = colKey.join(DELIMER);
 
             if (this.keysLength === rowKey.length + colKey.length) {
                 if (!this.isKeysSortingDoneOnBackendSide && !isFlatKeyInPivotKeys(this.rowKeys, flatRowKey)) {
@@ -232,8 +232,8 @@ let initDRPivotTable = function($, window, document) {
         DRPivotData.prototype.getAggregator = function(rowKey, colKey) {
             var agg, flatColKey, flatRowKey;
             let hebrewMarkRegex = new RegExp(String.fromCharCode(8206), 'g');
-            flatRowKey = rowKey.join(delim).replace(hebrewMarkRegex, '');
-            flatColKey = colKey.join(delim).replace(hebrewMarkRegex, '');
+            flatRowKey = rowKey.join(DELIMER).replace(hebrewMarkRegex, '');
+            flatColKey = colKey.join(DELIMER).replace(hebrewMarkRegex, '');
             if (rowKey.length === 0 && colKey.length === 0) {
                 agg = this.allTotal;
             } else if (rowKey.length === 0) {
@@ -241,7 +241,8 @@ let initDRPivotTable = function($, window, document) {
             } else if (colKey.length === 0) {
                 agg = this.rowTotals[flatRowKey];
             } else {
-                agg = this.tree[flatRowKey][flatColKey];
+                const sqAgg = this.isSmartQueriesEnabled ? getSqAggregator(this.tree, rowKey, flatColKey) : null;
+                agg = sqAgg || this.tree[flatRowKey][flatColKey];
             }
             return agg != null ? agg : {
                 value: (function() {
@@ -880,7 +881,7 @@ let initDRPivotTable = function($, window, document) {
                 descendants: lastCol,
                 leaves: 1,
                 key: key,
-                flatKey: key.join(delim)
+                flatKey: key.join(DELIMER)
             };
             headers.push(node);
             rMark[0] = node;
@@ -900,7 +901,7 @@ let initDRPivotTable = function($, window, document) {
                     descendants: lastCol - c,
                     leaves: 1,
                     key: key,
-                    flatKey: key.join(delim)
+                    flatKey: key.join(DELIMER)
                 };
                 rMark[c] = node;
                 rMark[c - 1].children.push(node);
@@ -941,7 +942,7 @@ let initDRPivotTable = function($, window, document) {
                             descendants: 0,
                             leaves: 0,
                             key: key,
-                            flatKey: key.join(delim)
+                            flatKey: key.join(DELIMER)
                         };
 
                         headers.push(node);
@@ -964,7 +965,7 @@ let initDRPivotTable = function($, window, document) {
                         descendants: 0,
                         leaves: 0,
                         key: key,
-                        flatKey: key.join(delim)
+                        flatKey: key.join(DELIMER)
                     };
                     if (c === 0) {
                         headers.push(node);
@@ -1272,7 +1273,7 @@ let initDRPivotTable = function($, window, document) {
                 "rowspan": rowHeader.descendants + 1,
                 "colspan": colspan
             });
-            if (opts.chartOptions.isSmartQueriesEnabled) {
+            if (pivotData.isSmartQueriesEnabled) {
                 th.textContent = th.textContent.replace(DR_SCENARIO.Forecast, 'Forecast Smart Query');
             }
             if (opts.chartOptions.table_options.hide_nulls_in_headers) {
@@ -1506,8 +1507,9 @@ let initDRPivotTable = function($, window, document) {
                 for (l = 0, len1 = colHeaderCols.length; l < len1; l++) {
                     colHeader = colHeaderCols[l];
                     flatColKey = colHeader.flatKey;
-                    if(tree && tree[flatRowKey] && tree[flatRowKey][flatColKey]){
-                        ref8 = tree[flatRowKey][flatColKey]
+                    const sqAgg = pivotData.isSmartQueriesEnabled && tree ? getSqAggregator(tree, rowHeader.key, flatColKey) : null;
+                    if(sqAgg || (tree && tree[flatRowKey] && tree[flatRowKey][flatColKey])){
+                        ref8 = sqAgg || tree[flatRowKey][flatColKey]
                     }
                     else{
                         ref8 = null;
@@ -1522,13 +1524,6 @@ let initDRPivotTable = function($, window, document) {
                         }
                     };
                     val = aggregator.value();
-
-                    if (opts.chartOptions.isSmartQueriesEnabled && flatRowKey.split(' , ').includes(DR_SCENARIO.Forecast)) {
-                        const actualsRow = tree[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)] || {};
-                        if (actualsRow && actualsRow[flatColKey]) {
-                            val += (actualsRow[flatColKey] && actualsRow[flatColKey].value()) || 0;
-                        }
-                    }
                     isColSubtotal = colHeader.children.length !== 0;
                     style = "pvtVal";
                     if (isColSubtotal) {
@@ -1571,9 +1566,6 @@ let initDRPivotTable = function($, window, document) {
                 }
 
                 val = totalAggregator.value();
-                if (opts.chartOptions.isSmartQueriesEnabled && flatRowKey.split(' , ').includes(DR_SCENARIO.Forecast)) {
-                    val += _.get(rowTotals[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)], 'value', () => null)() || 0;
-                }
                 style = "pvtTotal rowTotal";
                 if (isRowSubtotal) {
                     style += " pvtRowSubtotal";
@@ -1694,7 +1686,7 @@ let initDRPivotTable = function($, window, document) {
         };
         removeRowHeaderNullValue = function(h) {
             if (opts.chartOptions.table_options.hide_nulls_in_headers) {
-                h.th.innerHTML = h.th.innerHTML.replace('[null]' , '');
+                h.th.innerHTML = h.th.innerHTML.replace('[null]', '');
             }
         };
         hideDescendantCol = function(d) {
@@ -2354,7 +2346,7 @@ let initDRPivotTable = function($, window, document) {
         }
 
         main = function(rowAttrs, rowKeys, colAttrs, colKeys, pivotData) {
-            if (opts.chartOptions.isSmartQueriesEnabled) {
+            if (pivotData.isSmartQueriesEnabled) {
                 rowKeys = rowKeys.filter(rowKey => !rowKey.includes(DR_SCENARIO.SQ_Actuals));
                 rowKeys = Array.from(
                     new Set(rowKeys.map(JSON.stringify))
@@ -2516,7 +2508,7 @@ let initDRPivotTable = function($, window, document) {
     };
 
     $.pivotUtilities.subtotal_renderers = NovixRenderer;
-    $.pivotUtilities.delim = delim;
+    $.pivotUtilities.delim = DELIMER;
 
     $.pivotUtilities.getFormattedNumber = getFormattedNumber;
     $.pivotUtilities.sortDateStrings = sortDateStrings;

package/src/highcharts_renderer.js

@@ -85,7 +85,7 @@ const CHART_TYPES = {
 }
 
 const HIGHCHARTS_CONSTANTS = {
-    delimer: ' , ',
+    delimer: helpers.DELIMER,
     DRILL_BUTTON_FONT_SIZE: '16px',
     MAX_ROWS_FOR_AUTO_REFRESH: 100000,
     MAX_ROWS_FOR_SHOW_RESULTS: 10000,
@@ -1274,10 +1274,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             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');
+        const withExtraScenarioCycle = pivotData.rowAttrs && row_n_keys[0] && pivotData.rowAttrs.length < row_n_keys[0].length
 
-        if (isChartTypeSupportedForSmartQuery(chartType) && pivotData.rowAttrs?.length < row_n_keys?.[0]?.length && indexOfScenarioCycleFilter > -1) {
+        if (isChartTypeSupportedForSmartQuery(chartType) && withExtraScenarioCycle && 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);
@@ -1454,7 +1454,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             col_n_keys.forEach(columnKey => {
                 let totalKey = columnKey;
                 if (lodash.isArray(columnKey)) {
-                    totalKey = totalKey.join(' , ');
+                    totalKey = totalKey.join(helpers.DELIMER);
                 }
                 const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
                 newSeries.data.push(value);
@@ -1466,26 +1466,10 @@ 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 smartQuerySeries = isChartTypeSupportedForSmartQuery(chartType)
-            ? smartQueriesHelper.createSingleDataSeriesForForecast(chart_series, opts.chartOptions, pivotData, isCombiLineForecastChart)
-            : null;
 
-        if (smartQuerySeries) {
-            if (chart_series.length > 1) {
-                if (isCombiLineForecastChart) {
-                    chart_series = smartQuerySeries;
-                } else {
-                    lodash.remove(chart_series, s =>
-                        (s.name && lodash.includes(s.name, 'SQ_Actuals')) || s.name === 'Forecast'
-                    );
-                    chart_series.push(smartQuerySeries);
-                }
-            } else {
-                chart_series = [smartQuerySeries];
-            }
-        }
+        if (!opts.chartOptions || !opts.chartOptions.chart || !opts.chartOptions.chart.smart_query || !pivotData.isSmartQueriesEnabled) return chart_series;
 
-        return chart_series;
+        return smartQueriesHelper.handleForecastSeries(chart_series, opts.chartOptions, pivotData)
     };
 
     highchartsRenderer.ptCreateColumnSeries = function (pivotData, colors, onlyNumbers, isUniqueVals, isNotDrilldown, additionOptions, opts, chartOptions, chartType) {
@@ -4856,7 +4840,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             dateValuesDictionary: pivotOptions ? pivotOptions.dateValuesDictionary : null,
             keysObject: pivotOptions ? pivotOptions.keysObject : null,
             isDrillDownDisabled: pivotOptions ? pivotOptions.isDrillDownDisabled : false,
-            pivotUiFnRemoved: pivotOptions ? pivotOptions.pivotUiFnRemoved : false,
         };
 
         if (!subopts.rendererOptions) {
@@ -10099,13 +10082,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         e.point = lodash.cloneDeep(e.point);
         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 initialSeriesName = seriesData
-            ? lodash.find(seriesData, obj => obj.name === e.point.name)
-            : null;
-        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/pivottable.js

@@ -1,4 +1,6 @@
+const _ = require('lodash');
 const helpers = require('./dr-renderer-helpers');
+const { DR_SCENARIO } = require('./smart_queries_helper');
 const { GenericRenderingError, GenericComputationalError} = require('./errors');
 
 // from pivottable@2.23.0
@@ -641,7 +643,7 @@ let initPivotTable = function($, window, document) {
             this.filter = (ref9 = opts.filter) != null ? ref9 : (function() {
                 return true;
             });
-            this.isSmartQueriesEnabled = opts.rendererOptions?.chartOptions?.isSmartQueriesEnabled || false;
+            this.isSmartQueriesEnabled = _.some(input, item => item.Scenario === DR_SCENARIO.SQ_Actuals);
             this.tree = {};
 
             this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object' && helpers.backendSortingKeysAreNotEmpty(opts.keysObject);
@@ -666,7 +668,6 @@ let initPivotTable = function($, window, document) {
             this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
             this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
             this.isDrillDownDisabled = opts.isDrillDownDisabled;
-            this.pivotUiFnRemoved = opts.pivotUiFnRemoved;
 
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
@@ -1212,508 +1213,6 @@ let initPivotTable = function($, window, document) {
         return this.append(result);
     };
 
-    /*
-    Pivot Table UI: calls Pivot Table core above with options set by user
-     */
-    $.fn.pivotUI = function(input, inputOpts, overwrite, locale) {
-        if (!this.pivotUiFnRemoved) {
-            var a, aggregator, attr, attrLength, attrValues, c, colOrderArrow, defaults, e, existingOpts, fn1, i, initialRender, l, len1, len2, len3, localeDefaults, localeStrings, materializedInput, n, o, opts, ordering, pivotTable, recordsProcessed, ref, ref1, ref2, ref3, refresh, refreshDelayed, renderer, rendererControl, rowOrderArrow, shownAttributes, shownInAggregators, shownInDragDrop, tr1, tr2, uiTable, unused, unusedAttrsVerticalAutoCutoff, unusedAttrsVerticalAutoOverride, x;
-            if (overwrite == null) {
-                overwrite = false;
-            }
-            if (locale == null) {
-                locale = "en";
-            }
-            if (locales[locale] == null) {
-                locale = "en";
-            }
-            defaults = {
-                derivedAttributes: {},
-                aggregators: locales[locale].aggregators,
-                renderers: locales[locale].renderers,
-                hiddenAttributes: [],
-                hiddenFromAggregators: [],
-                hiddenFromDragDrop: [],
-                menuLimit: 500,
-                cols: [],
-                rows: [],
-                vals: [],
-                rowOrder: "key_a_to_z",
-                colOrder: "key_a_to_z",
-                dataClass: PivotData,
-                exclusions: {},
-                inclusions: {},
-                unusedAttrsVertical: 85,
-                autoSortUnusedAttrs: false,
-                onRefresh: null,
-                showUI: true,
-                filter: function() {
-                    return true;
-                },
-                sorters: {}
-            };
-            localeStrings = $.extend(true, {}, locales.en.localeStrings, locales[locale].localeStrings);
-            localeDefaults = {
-                rendererOptions: {
-                    localeStrings: localeStrings
-                },
-                localeStrings: localeStrings
-            };
-            existingOpts = this.data("pivotUIOptions");
-            if ((existingOpts == null) || overwrite) {
-                opts = $.extend(true, {}, localeDefaults, $.extend({}, defaults, inputOpts));
-            } else {
-                opts = existingOpts;
-            }
-            try {
-                attrValues = {};
-                materializedInput = [];
-                recordsProcessed = 0;
-                PivotData.forEachRecord(input, opts.derivedAttributes, function(record) {
-                    var attr, base, ref, value;
-                    if (!opts.filter(record)) {
-                        return;
-                    }
-                    materializedInput.push(record);
-                    for (attr in record) {
-                        if (!hasProp.call(record, attr)) continue;
-                        if (attrValues[attr] == null) {
-                            attrValues[attr] = {};
-                            if (recordsProcessed > 0) {
-                                attrValues[attr]["null"] = recordsProcessed;
-                            }
-                        }
-                    }
-                    for (attr in attrValues) {
-                        value = (ref = record[attr]) != null ? ref : "null";
-                        if ((base = attrValues[attr])[value] == null) {
-                            base[value] = 0;
-                        }
-                        attrValues[attr][value]++;
-                    }
-                    return recordsProcessed++;
-                });
-                uiTable = $("<table>", {
-                    "class": "pvtUi"
-                }).attr("cellpadding", 5);
-                rendererControl = $("<td>").addClass("pvtUiCell");
-                renderer = $("<select>").addClass('pvtRenderer').appendTo(rendererControl).bind("change", function() {
-                    return refresh();
-                });
-                ref = opts.renderers;
-                for (x in ref) {
-                    if (!hasProp.call(ref, x)) continue;
-                    $("<option>").val(x).html(x).appendTo(renderer);
-                }
-                unused = $("<td>").addClass('pvtAxisContainer pvtUnused pvtUiCell');
-                shownAttributes = (function() {
-                    var results;
-                    results = [];
-                    for (a in attrValues) {
-                        if (indexOf.call(opts.hiddenAttributes, a) < 0) {
-                            results.push(a);
-                        }
-                    }
-                    return results;
-                })();
-                shownInAggregators = (function() {
-                    var l, len1, results;
-                    results = [];
-                    for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
-                        c = shownAttributes[l];
-                        if (indexOf.call(opts.hiddenFromAggregators, c) < 0) {
-                            results.push(c);
-                        }
-                    }
-                    return results;
-                })();
-                shownInDragDrop = (function() {
-                    var l, len1, results;
-                    results = [];
-                    for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
-                        c = shownAttributes[l];
-                        if (indexOf.call(opts.hiddenFromDragDrop, c) < 0) {
-                            results.push(c);
-                        }
-                    }
-                    return results;
-                })();
-                unusedAttrsVerticalAutoOverride = false;
-                if (opts.unusedAttrsVertical === "auto") {
-                    unusedAttrsVerticalAutoCutoff = 120;
-                } else {
-                    unusedAttrsVerticalAutoCutoff = parseInt(opts.unusedAttrsVertical);
-                }
-                if (!isNaN(unusedAttrsVerticalAutoCutoff)) {
-                    attrLength = 0;
-                    for (l = 0, len1 = shownInDragDrop.length; l < len1; l++) {
-                        a = shownInDragDrop[l];
-                        attrLength += a.length;
-                    }
-                    unusedAttrsVerticalAutoOverride = attrLength > unusedAttrsVerticalAutoCutoff;
-                }
-                if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
-                    unused.addClass('pvtVertList');
-                } else {
-                    unused.addClass('pvtHorizList');
-                }
-                fn1 = function(attr) {
-                    var attrElem, checkContainer, closeFilterBox, controls, filterItem, filterItemExcluded, finalButtons, hasExcludedItem, len2, n, placeholder, ref1, sorter, triangleLink, v, value, valueCount, valueList, values;
-                    values = (function() {
-                        var results;
-                        results = [];
-                        for (v in attrValues[attr]) {
-                            results.push(v);
-                        }
-                        return results;
-                    })();
-                    hasExcludedItem = false;
-                    valueList = $("<div>").addClass('pvtFilterBox').hide();
-                    valueList.append($("<h4>").append($("<span>").text(attr), $("<span>").addClass("count").text("(" + values.length + ")")));
-                    if (values.length > opts.menuLimit) {
-                        valueList.append($("<p>").html(opts.localeStrings.tooMany));
-                    } else {
-                        if (values.length > 5) {
-                            controls = $("<p>").appendTo(valueList);
-                            sorter = getSort(opts.sorters, attr);
-                            placeholder = opts.localeStrings.filterResults;
-                            $("<input>", {
-                                type: "text"
-                            }).appendTo(controls).attr({
-                                placeholder: placeholder,
-                                "class": "pvtSearch"
-                            }).bind("keyup", function() {
-                                var accept, accept_gen, filter;
-                                filter = $(this).val().toLowerCase().trim();
-                                accept_gen = function(prefix, accepted) {
-                                    return function(v) {
-                                        var real_filter, ref1;
-                                        real_filter = filter.substring(prefix.length).trim();
-                                        if (real_filter.length === 0) {
-                                            return true;
-                                        }
-                                        return ref1 = Math.sign(sorter(v.toLowerCase(), real_filter)), indexOf.call(accepted, ref1) >= 0;
-                                    };
-                                };
-                                accept = filter.indexOf(">=") === 0 ? accept_gen(">=", [1, 0]) : filter.indexOf("<=") === 0 ? accept_gen("<=", [-1, 0]) : filter.indexOf(">") === 0 ? accept_gen(">", [1]) : filter.indexOf("<") === 0 ? accept_gen("<", [-1]) : filter.indexOf("~") === 0 ? function(v) {
-                                    if (filter.substring(1).trim().length === 0) {
-                                        return true;
-                                    }
-                                    return v.toLowerCase().match(filter.substring(1));
-                                } : function(v) {
-                                    return v.toLowerCase().indexOf(filter) !== -1;
-                                };
-                                return valueList.find('.pvtCheckContainer p label span.value').each(function() {
-                                    if (accept($(this).text())) {
-                                        return $(this).parent().parent().show();
-                                    } else {
-                                        return $(this).parent().parent().hide();
-                                    }
-                                });
-                            });
-                            controls.append($("<br>"));
-                            $("<button>", {
-                                type: "button"
-                            }).appendTo(controls).html(opts.localeStrings.selectAll).bind("click", function() {
-                                valueList.find("input:visible:not(:checked)").prop("checked", true).toggleClass("changed");
-                                return false;
-                            });
-                            $("<button>", {
-                                type: "button"
-                            }).appendTo(controls).html(opts.localeStrings.selectNone).bind("click", function() {
-                                valueList.find("input:visible:checked").prop("checked", false).toggleClass("changed");
-                                return false;
-                            });
-                        }
-                        checkContainer = $("<div>").addClass("pvtCheckContainer").appendTo(valueList);
-                        ref1 = values.sort(getSort(opts.sorters, attr));
-                        for (n = 0, len2 = ref1.length; n < len2; n++) {
-                            value = ref1[n];
-                            valueCount = attrValues[attr][value];
-                            filterItem = $("<label>");
-                            filterItemExcluded = false;
-                            if (opts.inclusions[attr]) {
-                                filterItemExcluded = (indexOf.call(opts.inclusions[attr], value) < 0);
-                            } else if (opts.exclusions[attr]) {
-                                filterItemExcluded = (indexOf.call(opts.exclusions[attr], value) >= 0);
-                            }
-                            hasExcludedItem || (hasExcludedItem = filterItemExcluded);
-                            $("<input>").attr("type", "checkbox").addClass('pvtFilter').attr("checked", !filterItemExcluded).data("filter", [attr, value]).appendTo(filterItem).bind("change", function() {
-                                return $(this).toggleClass("changed");
-                            });
-                            filterItem.append($("<span>").addClass("value").text(value));
-                            filterItem.append($("<span>").addClass("count").text("(" + valueCount + ")"));
-                            checkContainer.append($("<p>").append(filterItem));
-                        }
-                    }
-                    closeFilterBox = function() {
-                        if (valueList.find("[type='checkbox']").length > valueList.find("[type='checkbox']:checked").length) {
-                            attrElem.addClass("pvtFilteredAttribute");
-                        } else {
-                            attrElem.removeClass("pvtFilteredAttribute");
-                        }
-                        valueList.find('.pvtSearch').val('');
-                        valueList.find('.pvtCheckContainer p').show();
-                        return valueList.hide();
-                    };
-                    finalButtons = $("<p>").appendTo(valueList);
-                    if (values.length <= opts.menuLimit) {
-                        $("<button>", {
-                            type: "button"
-                        }).text(opts.localeStrings.apply).appendTo(finalButtons).bind("click", function() {
-                            if (valueList.find(".changed").removeClass("changed").length) {
-                                refresh();
-                            }
-                            return closeFilterBox();
-                        });
-                    }
-                    $("<button>", {
-                        type: "button"
-                    }).text(opts.localeStrings.cancel).appendTo(finalButtons).bind("click", function() {
-                        valueList.find(".changed:checked").removeClass("changed").prop("checked", false);
-                        valueList.find(".changed:not(:checked)").removeClass("changed").prop("checked", true);
-                        return closeFilterBox();
-                    });
-                    triangleLink = $("<span>").addClass('pvtTriangle').html(" &#x25BE;").bind("click", function(e) {
-                        var left, ref2, top;
-                        ref2 = $(e.currentTarget).position(), left = ref2.left, top = ref2.top;
-                        return valueList.css({
-                            left: left + 10,
-                            top: top + 10
-                        }).show();
-                    });
-                    attrElem = $("<li>").addClass("axis_" + i).append($("<span>").addClass('pvtAttr').text(attr).data("attrName", attr).append(triangleLink));
-                    if (hasExcludedItem) {
-                        attrElem.addClass('pvtFilteredAttribute');
-                    }
-                    return unused.append(attrElem).append(valueList);
-                };
-                for (i in shownInDragDrop) {
-                    if (!hasProp.call(shownInDragDrop, i)) continue;
-                    attr = shownInDragDrop[i];
-                    fn1(attr);
-                }
-                tr1 = $("<tr>").appendTo(uiTable);
-                aggregator = $("<select>").addClass('pvtAggregator').bind("change", function() {
-                    return refresh();
-                });
-                ref1 = opts.aggregators;
-                for (x in ref1) {
-                    if (!hasProp.call(ref1, x)) continue;
-                    aggregator.append($("<option>").val(x).html(x));
-                }
-                ordering = {
-                    key_a_to_z: {
-                        rowSymbol: "&varr;",
-                        colSymbol: "&harr;",
-                        next: "value_a_to_z"
-                    },
-                    value_a_to_z: {
-                        rowSymbol: "&darr;",
-                        colSymbol: "&rarr;",
-                        next: "value_z_to_a"
-                    },
-                    value_z_to_a: {
-                        rowSymbol: "&uarr;",
-                        colSymbol: "&larr;",
-                        next: "key_a_to_z"
-                    }
-                };
-                rowOrderArrow = $("<a>", {
-                    role: "button"
-                }).addClass("pvtRowOrder").data("order", opts.rowOrder).html(ordering[opts.rowOrder].rowSymbol).bind("click", function() {
-                    $(this).data("order", ordering[$(this).data("order")].next);
-                    $(this).html(ordering[$(this).data("order")].rowSymbol);
-                    return refresh();
-                });
-                colOrderArrow = $("<a>", {
-                    role: "button"
-                }).addClass("pvtColOrder").data("order", opts.colOrder).html(ordering[opts.colOrder].colSymbol).bind("click", function() {
-                    $(this).data("order", ordering[$(this).data("order")].next);
-                    $(this).html(ordering[$(this).data("order")].colSymbol);
-                    return refresh();
-                });
-                $("<td>").addClass('pvtVals pvtUiCell').appendTo(tr1).append(aggregator).append(rowOrderArrow).append(colOrderArrow).append($("<br>"));
-                $("<td>").addClass('pvtAxisContainer pvtHorizList pvtCols pvtUiCell').appendTo(tr1);
-                tr2 = $("<tr>").appendTo(uiTable);
-                tr2.append($("<td>").addClass('pvtAxisContainer pvtRows pvtUiCell').attr("valign", "top"));
-                pivotTable = $("<td>").attr("valign", "top").addClass('pvtRendererArea').appendTo(tr2);
-                if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
-                    uiTable.find('tr:nth-child(1)').prepend(rendererControl);
-                    uiTable.find('tr:nth-child(2)').prepend(unused);
-                } else {
-                    uiTable.prepend($("<tr>").append(rendererControl).append(unused));
-                }
-                this.html(uiTable);
-                ref2 = opts.cols;
-                for (n = 0, len2 = ref2.length; n < len2; n++) {
-                    x = ref2[n];
-                    this.find(".pvtCols").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
-                }
-                ref3 = opts.rows;
-                for (o = 0, len3 = ref3.length; o < len3; o++) {
-                    x = ref3[o];
-                    this.find(".pvtRows").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
-                }
-                if (opts.aggregatorName != null) {
-                    this.find(".pvtAggregator").val(opts.aggregatorName);
-                }
-                if (opts.rendererName != null) {
-                    this.find(".pvtRenderer").val(opts.rendererName);
-                }
-                if (!opts.showUI) {
-                    this.find(".pvtUiCell").hide();
-                }
-                initialRender = true;
-                refreshDelayed = (function(_this) {
-                    return function() {
-                        var exclusions, inclusions, len4, newDropdown, numInputsToProcess, pivotUIOptions, pvtVals, ref4, ref5, subopts, t, u, unusedAttrsContainer, vals;
-                        subopts = {
-                            derivedAttributes: opts.derivedAttributes,
-                            localeStrings: opts.localeStrings,
-                            rendererOptions: opts.rendererOptions,
-                            sorters: opts.sorters,
-                            cols: [],
-                            rows: [],
-                            dataClass: opts.dataClass
-                        };
-                        numInputsToProcess = (ref4 = opts.aggregators[aggregator.val()]([])().numInputs) != null ? ref4 : 0;
-                        vals = [];
-                        _this.find(".pvtRows li span.pvtAttr").each(function() {
-                            return subopts.rows.push($(this).data("attrName"));
-                        });
-                        _this.find(".pvtCols li span.pvtAttr").each(function() {
-                            return subopts.cols.push($(this).data("attrName"));
-                        });
-                        _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
-                            if (numInputsToProcess === 0) {
-                                return $(this).remove();
-                            } else {
-                                numInputsToProcess--;
-                                if ($(this).val() !== "") {
-                                    return vals.push($(this).val());
-                                }
-                            }
-                        });
-                        if (numInputsToProcess !== 0) {
-                            pvtVals = _this.find(".pvtVals");
-                            for (x = t = 0, ref5 = numInputsToProcess; 0 <= ref5 ? t < ref5 : t > ref5; x = 0 <= ref5 ? ++t : --t) {
-                                newDropdown = $("<select>").addClass('pvtAttrDropdown').append($("<option>")).bind("change", function() {
-                                    return refresh();
-                                });
-                                for (u = 0, len4 = shownInAggregators.length; u < len4; u++) {
-                                    attr = shownInAggregators[u];
-                                    newDropdown.append($("<option>").val(attr).text(attr));
-                                }
-                                pvtVals.append(newDropdown);
-                            }
-                        }
-                        if (initialRender) {
-                            vals = opts.vals;
-                            i = 0;
-                            _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
-                                $(this).val(vals[i]);
-                                return i++;
-                            });
-                            initialRender = false;
-                        }
-                        subopts.aggregatorName = aggregator.val();
-                        subopts.vals = vals;
-                        subopts.aggregator = opts.aggregators[aggregator.val()](vals);
-                        subopts.renderer = opts.renderers[renderer.val()];
-                        subopts.rowOrder = rowOrderArrow.data("order");
-                        subopts.colOrder = colOrderArrow.data("order");
-                        exclusions = {};
-                        _this.find('input.pvtFilter').not(':checked').each(function() {
-                            var filter;
-                            filter = $(this).data("filter");
-                            if (exclusions[filter[0]] != null) {
-                                return exclusions[filter[0]].push(filter[1]);
-                            } else {
-                                return exclusions[filter[0]] = [filter[1]];
-                            }
-                        });
-                        inclusions = {};
-                        _this.find('input.pvtFilter:checked').each(function() {
-                            var filter;
-                            filter = $(this).data("filter");
-                            if (exclusions[filter[0]] != null) {
-                                if (inclusions[filter[0]] != null) {
-                                    return inclusions[filter[0]].push(filter[1]);
-                                } else {
-                                    return inclusions[filter[0]] = [filter[1]];
-                                }
-                            }
-                        });
-                        subopts.filter = function(record) {
-                            var excludedItems, k, ref6, ref7;
-                            if (!opts.filter(record)) {
-                                return false;
-                            }
-                            for (k in exclusions) {
-                                excludedItems = exclusions[k];
-                                if (ref6 = "" + ((ref7 = record[k]) != null ? ref7 : 'null'), indexOf.call(excludedItems, ref6) >= 0) {
-                                    return false;
-                                }
-                            }
-                            return true;
-                        };
-                        pivotTable.pivot(materializedInput, subopts);
-                        pivotUIOptions = $.extend({}, opts, {
-                            cols: subopts.cols,
-                            rows: subopts.rows,
-                            colOrder: subopts.colOrder,
-                            rowOrder: subopts.rowOrder,
-                            vals: vals,
-                            exclusions: exclusions,
-                            inclusions: inclusions,
-                            inclusionsInfo: inclusions,
-                            aggregatorName: aggregator.val(),
-                            rendererName: renderer.val()
-                        });
-                        _this.data("pivotUIOptions", pivotUIOptions);
-                        if (opts.autoSortUnusedAttrs) {
-                            unusedAttrsContainer = _this.find("td.pvtUnused.pvtAxisContainer");
-                            $(unusedAttrsContainer).children("li").sort(function(a, b) {
-                                return naturalSort($(a).text(), $(b).text());
-                            }).appendTo(unusedAttrsContainer);
-                        }
-                        pivotTable.css("opacity", 1);
-                        if (opts.onRefresh != null) {
-                            return opts.onRefresh(pivotUIOptions);
-                        }
-                    };
-                })(this);
-                refresh = (function(_this) {
-                    return function() {
-                        pivotTable.css("opacity", 0.5);
-                        return setTimeout(refreshDelayed, 10);
-                    };
-                })(this);
-                refresh();
-                this.find(".pvtAxisContainer").sortable({
-                    update: function(e, ui) {
-                        if (ui.sender == null) {
-                            return refresh();
-                        }
-                    },
-                    connectWith: this.find(".pvtAxisContainer"),
-                    items: 'li',
-                    placeholder: 'pvtPlaceholder'
-                });
-            } catch (error) {
-                e = error;
-                if (typeof console !== "undefined" && console !== null) {
-                    console.error(e.stack);
-                }
-                // This function is not used internally or in webclient_angular/export_widget_service
-                // TODO if it not removed in DR-39041, upgrade the error propagation
-                this.html("An error occurred rendering the PivotTable UI.");
-            }
-            return this;
-        }
-    };
-
     /*
     Heatmap post-processing
      */

package/src/smart_queries_helper.js

@@ -1,144 +1,69 @@
-const lodash = require('lodash');
+const _ = require('lodash');
+const { DELIMER } = require('./dr-renderer-helpers');
 
 const DR_SCENARIO = {
     SQ_Actuals: 'SQ_Actuals',
     Forecast: 'Forecast',
 };
 
-function createSingleDataSeriesForForecast(chart_series, chartOptions, pivotData, isChartCombiLine) {
-  if (!chartOptions || !chartOptions.chart) return null;
-
-  const { actuals, forecast, smart_query } = chartOptions.chart;
-  const input = pivotData.input;
-
-  const hasSQActuals = lodash.some(input, item => lodash.includes(item.Scenario, DR_SCENARIO.SQ_Actuals));
-  chartOptions.isSmartQueriesEnabled = hasSQActuals;
-  if (!smart_query || !hasSQActuals) return null;
-
-  const midMonthOffset = 0.5
-    return chart_series.length === 1
-        ? buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset, chart_series[0].name)
-        : (isChartCombiLine ?
-            buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actuals, forecast, midMonthOffset) :
-            buildChartSeriesFromSeries(chart_series, actuals, forecast, midMonthOffset));
-}
-
-function buildChartSeriesFromPivotInputOnly(input, actuals, forecast, midMonthOffset, name) {
-  const filtered = input.filter(item =>
-    (item.Scenario === DR_SCENARIO.SQ_Actuals || item.Scenario === DR_SCENARIO.Forecast) && !!item['Reporting Month']
-  );
-
-  const data = lodash.map(filtered, item => ({
-    y: item.Amount,
-    name: item['Reporting Month'],
-    initialName: item['Reporting Month'],
-    type: item.Scenario,
-  })).sort((a, b) => sortRowValuesByName(a, b));
-
-  const sqCount = lodash.filter(input, item => item.Scenario === DR_SCENARIO.SQ_Actuals).length;
-
-  return {
-    name,
-    data,
-    zoneAxis: "x",
-    zones: [
-      { value: sqCount - midMonthOffset, dashStyle: actuals },
-      { dashStyle: forecast },
-    ],
-  };
-}
-
-function buildChartSeriesForMultipleSeriesCombinedLine(chart_series, input, actuals, forecast, midMonthOffset) {
-    const resultingSeries = [];
-    for (let i = 0; i < chart_series.length; i++) {
-        const series = chart_series[i];
-        if (!series || !series.data || !series.data.length) continue;
+/**
+ * @param tree {DRPivotData['tree']}
+ * @param rowKey {string[]} ['6+6', 'Forecast 6+6 Mid'] OR ['6+6', 'SQ_Actuals']
+ * @param flatColKey {string} 'Jan-25'
+ * @returns {object|null} A aggregator object of SQ_Actuals or null if not found
+ */
+function getSqAggregator(tree, rowKey, flatColKey) {
+    const uniqueRowKeys = _.uniq(rowKey);
+
+    // if we have only scenarioCycle (uniqueRowKeys[1] is undefined) default aggregator should handle fine
+    // SQ_Actuals should be used only for Forecast items, if current item is SQ_Actuals we just ignore it
+    if(!uniqueRowKeys[1] || uniqueRowKeys[1] === DR_SCENARIO.SQ_Actuals) {
+        return null;
+    }
 
-        const data = lodash.chain(input)
-            .filter(item => item['Scenario Cycle'] === series.name &&
-          (item['Scenario'] === DR_SCENARIO.SQ_Actuals || item['Scenario'] === DR_SCENARIO.Forecast) && !!item['Reporting Month'])
-            .map(item => ({
-              y: item.Amount,
-              name: item['Reporting Month'],
-              initialName: item['Reporting Month'],
-              type: item.Scenario,
-            }))
-            .value().sort((a, b) => {
-                return sortRowValuesByName(a, b);
-            });
-        if (!data.length) {
-            resultingSeries.push(series);
-            continue;
-        }
+    // at this point rowKey should be something like ['6+6', 'Forecast 6+6 Mid', ...]
+    // SQ_Actuals always contains scenarioCycle at 0 position ('6+6') and repeats 'SQ_Actuals' for rest of the rows
+    const sqFlatRowKey = _.map(rowKey, (key, index) => index === 0 ? key : DR_SCENARIO.SQ_Actuals).join(DELIMER)
 
-        const sqCount = lodash.filter(data, item => item.type === DR_SCENARIO.SQ_Actuals).length;
-        resultingSeries.push(
-            {
-                name: series.name,
-                data,
-                zoneAxis: "x",
-                zones: [
-                    { value: sqCount - midMonthOffset, dashStyle: actuals },
-                    { dashStyle: forecast },
-                ],
-            }
-        )
-    }
-    return resultingSeries;
+    return tree[sqFlatRowKey] ? tree[sqFlatRowKey][flatColKey] : null;
 }
 
-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 handleForecastSeries(chart_series, chartOptions, pivotData) {
+  const midMonthOffset = 0.5;
+  const sqInput = _.filter(pivotData.input, item => item['Scenario'] === DR_SCENARIO.SQ_Actuals);
+  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;
+
+      if(!sqCount) return series;
+
+      return {
+          name: series.name,
+          data: series.data,
+          zoneAxis: "x",
+          zones: [
+              { value: sqCount - midMonthOffset, dashStyle: chartOptions.chart.actuals },
+              { dashStyle: chartOptions.chart.forecast },
+          ],
+      }
+  })
 }
 
-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));
-
-  if (!seriesA || !seriesB) return null;
-
-  const indexOfForecastFirstZero = lodash.findIndex(seriesB.data, function(value) {
-    return value.y === 0;
-  });
-  const indexOfActualsFirstZero = lodash.findIndex(seriesA.data, function(value) {
-    return value.y === 0;
-  });
-  const cutoffIndex = Math.max(indexOfForecastFirstZero, indexOfActualsFirstZero);
-
-
-  const minLength = Math.min(seriesA.data.length, seriesB.data.length);
-  const data = [];
-
-  for (let i = 0; i < minLength; i++) {
-    const pointA = seriesA.data[i];
-    const pointB = seriesB.data[i];
-
-    const yA = (pointA && pointA.y !== null && typeof pointA.y !== undefined) ? pointA.y : pointA;
-    const yB = (pointB && pointB.y !== null && typeof pointB.y !== undefined) ? pointB.y : pointB;
-
-    data.push({
-      x: i,
-      y: yA + yB,
-      name: pointA && pointA.name ? pointA.name : null,
-      initialName: (pointA && pointA.name) ? pointA.name : 'Point ' + (i + 1),
-      type: yA ? DR_SCENARIO.SQ_Actuals : DR_SCENARIO.Forecast,
-    });
-  }
-
-  return {
-    name: "Forecast Smart Query",
-    data,
-    zoneAxis: "x",
-    zones: [
-      { value: cutoffIndex - midMonthOffset, dashStyle: actuals },
-      { dashStyle: forecast },
-    ],
-  };
+/**
+ * @example
+ * getSqScenarioCycle("6+6 , Forecast 6+6 Mid"); // "6+6"
+ * getSqScenarioCycle("6+6 , SQ_Actuals"); // "6+6"
+ *
+ * @returns {string|undefined}
+ */
+function getSqScenarioCycle(name) {
+    return _.first(_.split(name, DELIMER));
 }
 
 module.exports = {
-  createSingleDataSeriesForForecast,
+  getSqAggregator,
+  handleForecastSeries,
   DR_SCENARIO
 };