@datarailsshared/dr_renderer 1.4.10 → 1.4.12

package/src/charts/dr_gauge_chart.js

@@ -51,7 +51,7 @@ const GAUGE_OPTIONS_DEFAULT = {
     ],
 };
 
-function DrGaugeChart(pivotData, opts) {
+function DrGaugeChart(pivotData, opts, isDynamicGoal) {
     this.render = function () {
         return DrGaugeChart.highchartsRenderer.ptCreateElementAndDraw(this.configChart(), opts);
     };
@@ -84,13 +84,20 @@ function DrGaugeChart(pivotData, opts) {
         return (value - min) < (max - min) / 2;
     };
 
-    this.createTicks = DrGaugeChart.createTicks;
+    this.createTicks = function(plotBands, options) {
+        return DrGaugeChart.createTicks(plotBands, options);
+    }
 
     this.mergeOptions = function (options) {
+        const clone = (o) =>
+            o && typeof o === 'object'
+                ? (globalThis.structuredClone ? structuredClone(o) : JSON.parse(JSON.stringify(o)))
+                : o;
+
         return helpers.mergeDeep(
-            JSON.parse(JSON.stringify(GAUGE_OPTIONS_DEFAULT)),
-            this.getDefaultValueForChart(DrGaugeChart.highchartsRenderer.CHART_TYPES.GAUGE_CHART_ENHANCED),
-            options
+            clone(GAUGE_OPTIONS_DEFAULT),
+            clone(this.getDefaultValueForChart(DrGaugeChart.highchartsRenderer.CHART_TYPES.GAUGE_CHART_ENHANCED)),
+            clone(options || {})
         );
     };
 
@@ -111,7 +118,7 @@ function DrGaugeChart(pivotData, opts) {
     };
 
     this.toPercent = function (value) {
-        return `${Math.round((value * 100) / (this.options.isAbsoluteValue ? this.max : this.goal.value))}%`;
+        return `${Math.round((value * 100) / (this.options.isAbsoluteValue ? this.max : this.options.goal.value))}%`;
     };
 
     this.formatValueLabel = function (value, options) {
@@ -139,9 +146,11 @@ function DrGaugeChart(pivotData, opts) {
         const goalValue = isGoal
             ? `<span style="font-size: 1.125em; color: ${options.gauge.colors.goal};">${formattedValue}</span>`
             : `<span style="color: ${options.label.font_color};">${formattedValue}</span>`;
+
+        const goalTitleText = DrGaugeChart.getGoalTitleText(options);
         const goalTitle =
-            isGoal && options.label.show_goal_name && options.goal.title
-                ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.goal};">${options.goal.title}</span>`
+            isGoal && options.label.show_goal_name && goalTitleText
+                ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.goal};">${goalTitleText}</span>`
                 : "";
         const percentage = options.label.show_percentage_in_segments
             ? `<span style="font-size: 0.75em; color: ${options.gauge.colors.meta}; font-weight: 400;">(${this.toPercent(
@@ -171,9 +180,17 @@ function DrGaugeChart(pivotData, opts) {
             goal: { value },
         } = options;
 
+        let valueForPosition = value;
+        let verticalOffset = 0;
+
+        if (DrGaugeChart.dynamicGoalFeatureEnabled() && (value > this.max || value < this.min)) {
+            valueForPosition = value > this.max ? this.max : this.min;
+            verticalOffset = 30;
+        }
+
         return {
-            x: center[0] - radius * Math.sin(Math.PI / 2 - this.getAngleForValue(value)) - goalIconSize[0] / 2,
-            y: center[1] - radius * Math.cos(Math.PI / 2 - this.getAngleForValue(value)) - goalIconSize[1] / 2,
+            x: center[0] - radius * Math.sin(Math.PI / 2 - this.getAngleForValue(valueForPosition)) - goalIconSize[0] / 2,
+            y: center[1] + verticalOffset - radius * Math.cos(Math.PI / 2 - this.getAngleForValue(valueForPosition)) - goalIconSize[1] / 2,
         };
     };
 
@@ -197,46 +214,112 @@ function DrGaugeChart(pivotData, opts) {
         return label;
     };
 
+    this.getGoalLabelPosition = function (chart, options, goalLabel) {
+        const padding = 7;
+        const point = this.getGoalIconPosition(chart, options);
+        const isLower = options.goal.value < this.min;
+
+        return {
+            x: point.x + (isLower ? -goalLabel.element.clientWidth : padding),
+            y: point.y + padding,
+        };
+    }
+
+    this.createGoalLabel = function (chart, options) {
+        const label = chart.renderer.text(
+            this.formatTickLabel(options.goal.value, options), 0, 0, true
+        ).add().toFront();
+
+        label.attr(this.getGoalLabelPosition(chart, options, label));
+
+        if (options.tooltips.show) {
+            const drTooltip = new DrChartTooltip(chart, {
+                fontSize: options.tooltips.font_size,
+                fontFamily: options.tooltips.font_style,
+                color: options.tooltips.font_color,
+            });
+            drTooltip.add(
+                this.toPercent(options.goal.value),
+                label.element,
+                {
+                    direction: "right",
+                }
+            );
+        }
+
+        return label;
+    };
+
     this.getPaneDimensions = function (chart, options) {
-        const { renderer } = chart;
-        const valueLabel = this.createValueLabel(chart, this.options);
+        const valueLabel = this.createValueLabel(chart, options);
+        const { height: labelH } = valueLabel.getBBox ? valueLabel.getBBox() : { height: 0 };
+        valueLabel.destroy && valueLabel.destroy();
+
         const { offset } = options.gauge;
-        const { height: labelH } = valueLabel.getBBox();
+        const offsetTop    = Array.isArray(offset) ? offset[0] : 0;
+        const offsetRight  = Array.isArray(offset) ? offset[1] : 0;
+        const offsetBottomG= Array.isArray(offset) ? offset[2] : 0;
+        const offsetLeft   = Array.isArray(offset) ? offset[3] : 0;
+
+        const vOff = options.gauge.valueOffset || [0,0,0,0];
 
-        const offsetBottom = labelH + options.gauge.valueOffset[0] + options.gauge.valueOffset[2] + offset[2];
-        valueLabel.destroy();
+        const offsetBottom = (labelH || 0) + (vOff[0] || 0) + (vOff[2] || 0) + (offsetBottomG || 0);
+
+        const safeDiv = (num, den) => {
+            const v = num / den;
+            return Number.isFinite(v) ? v : Infinity;
+        };
+
+        const radiuses = [
+            chart.chartWidth / 2 - Math.max(offsetRight || 0, offsetLeft || 0),
+            chart.chartHeight - offsetBottom - (offsetTop || 0),
+        ];
 
-        const radiuses = [chart.chartWidth / 2 - Math.max(offset[1], offset[3]), chart.chartHeight - offsetBottom - offset[0]];
         if (options.label.show) {
             this.ticks.forEach((tick) => {
-                const label = renderer.label(this.formatTickLabel(tick, options), 0, 0, null, null, null, true).add();
+                const label = chart.renderer
+                    .label(this.formatTickLabel(tick, options), 0, 0, null, null, null, true)
+                    .add();
+
                 const angle = this.getAngleForValue(tick);
-                // depends on label width
-                radiuses.push(
-                    (chart.chartWidth / 2 - label.bBox.width - Math.max(offset[1], offset[3])) /
-                    Math.sin(Math.abs(Math.PI / 2 - angle))
-                );
-                // depends on label height
+                const s = Math.sin(Math.abs(Math.PI / 2 - angle));
+                const c = Math.cos(Math.abs(Math.PI / 2 - angle));
+
                 radiuses.push(
-                    (chart.chartHeight - offsetBottom - label.bBox.height / 2 - offset[0]) /
-                    Math.cos(Math.abs(Math.PI / 2 - angle))
+                    safeDiv(
+                        chart.chartWidth / 2 - label.bBox.width - Math.max(offsetRight || 0, offsetLeft || 0),
+                        s
+                    ),
+                    safeDiv(
+                        chart.chartHeight - offsetBottom - label.bBox.height / 2 - (offsetTop || 0),
+                        c
+                    )
                 );
-                label.destroy();
+
+                label.destroy && label.destroy();
             });
         } else {
-            // reserve space for the goal icon
             const angle = this.getAngleForValue(options.goal.value);
-            const [iconW, iconH] = options.gauge.goalIconSize;
-            radiuses.push((chart.chartWidth / 2 - iconW / 2 - offset[1]) / Math.sin(Math.abs(Math.PI / 2 - angle)));
-            radiuses.push((chart.chartHeight - offsetBottom - iconH / 2 - offset[0]) / Math.cos(Math.abs(Math.PI / 2 - angle)));
+            const [iconW, iconH] = options.gauge.goalIconSize || [0, 0];
+            const s = Math.sin(Math.abs(Math.PI / 2 - angle));
+            const c = Math.cos(Math.abs(Math.PI / 2 - angle));
+
+            radiuses.push(
+                safeDiv(chart.chartWidth  / 2 - iconW / 2 - (offsetRight || 0), s),
+                safeDiv(chart.chartHeight - offsetBottom - iconH / 2 - (offsetTop || 0), c)
+            );
         }
 
+        const finite = radiuses.filter(Number.isFinite);
+        const radius = finite.length ? Math.min(...finite) : 0;
+
         return {
-            radius: Math.min(...radiuses),
+            radius,
             center: [chart.chartWidth / 2, chart.chartHeight - offsetBottom],
         };
     };
 
+
     this.setTicksStyles = function (chart, options) {
         const ticks = chart.yAxis[0].ticks;
         Object.keys(ticks).forEach((i) => {
@@ -265,7 +348,7 @@ function DrGaugeChart(pivotData, opts) {
     };
 
     this.updateLabelsWhenGoalIsHidden = function (ticks, options) {
-        if (ticks[options.goal.value].label.opacity === 0) {
+        if (ticks[options.goal.value] && ticks[options.goal.value].label.opacity === 0) {
 
             const ticksArray = Object.entries(ticks);
 
@@ -330,7 +413,7 @@ function DrGaugeChart(pivotData, opts) {
             // goal tooltip if lebels are hidden
             if (tick.pos === options.goal.value && !options.label.show) {
                 drTooltip.add(
-                    `${options.label.show_goal_name ? options.goal.title || "" : ""
+                    `${options.label.show_goal_name ? DrGaugeChart.getGoalTitleText(options) || "" : ""
                     }<span style="font-weight: 600">${this.formatValue(options.goal.value)}</span>`,
                     chart.goalIcon.element,
                     {
@@ -350,19 +433,35 @@ function DrGaugeChart(pivotData, opts) {
 
     this.setPane = function (chart, options) {
         const { radius, center } = this.getPaneDimensions(chart, options);
-        chart.pane[0].options.size = 2 * radius;
+
+        const MIN_RADIUS = Math.max(8, options.gauge.thickness / 2 + 1);
+        const R = Math.max(MIN_RADIUS, radius);
+
+        chart.pane[0].options.size = 2 * R;
         chart.pane[0].options.center = center;
+
+        const effectiveTick = Math.min(options.gauge.tickLength, Math.floor(R * 0.8));
+        chart.yAxis[0].options.tickLength = effectiveTick;
+
         chart.yAxis[0].options.plotBands.forEach((band) => {
-            band.outerRadius = radius - (options.gauge.tickLength - options.gauge.thickness) / 2;
+            band.outerRadius = Math.max(1, R - (effectiveTick - options.gauge.thickness) / 2);
         });
-        chart.series[0].options.dial.radius = Math.round((100 * (radius - options.gauge.tickLength - 10)) / radius) + "%";
+
+        chart.series[0].options.dial.radius = R > 0
+            ? Math.round((100 * (R - effectiveTick - 10)) / R) + "%"
+            : "0%";
     };
 
+
     this.setCustomElements = function (chart, options) {
         chart.label = this.createValueLabel(chart, options);
         chart.startBorder = DrGaugeChart.createBorder(chart, options, "start");
         chart.endBorder = DrGaugeChart.createBorder(chart, options, "end");
         chart.goalIcon = this.createGoalIcon(chart, options);
+
+        if (DrGaugeChart.dynamicGoalFeatureEnabled() && (options.goal.value > this.max || options.goal.value < this.min)) {
+            chart.goalLabel = this.createGoalLabel(chart, options);
+        }
     };
 
     this.updateCustomElements = function (chart, options) {
@@ -370,6 +469,10 @@ function DrGaugeChart(pivotData, opts) {
         chart.endBorder.attr(DrGaugeChart.getBorderPosition(chart, options, "end"));
         chart.goalIcon.attr(this.getGoalIconPosition(chart, options));
         chart.label.attr(DrGaugeChart.getValueLabelPosition(chart, options));
+
+        if (chart.goalLabel) {
+            chart.goalLabel.attr(this.getGoalLabelPosition(chart, options, chart.goalLabel));
+        }
     };
 
     this.createPlotBands = function (options) {
@@ -380,10 +483,22 @@ function DrGaugeChart(pivotData, opts) {
             gauge: { thickness },
         } = options;
 
+        // If goal is not positive in percentage mode, scale segments by the current needle magnitude
+        const scaleBase = !isAbsoluteValue && (!helpers.isNumber(goalValue) || goalValue === 0)
+            ? (helpers.isNumber(this.value) && Math.abs(this.value)) || 1
+            : goalValue;
+
         const bands = segments.map((item) => {
+            const fromValue = isAbsoluteValue ? item.from : (item.from * scaleBase) / 100;
+            const toValue = isAbsoluteValue ? item.to : (item.to * scaleBase) / 100;
+
+            // Ensure a valid interval for Highcharts plotBands even when goal is negative
+            const normalizedFrom = Math.min(fromValue, toValue);
+            const normalizedTo = Math.max(fromValue, toValue);
+
             return {
-                from: isAbsoluteValue ? item.from : (item.from * goalValue) / 100,
-                to: isAbsoluteValue ? item.to : (item.to * goalValue) / 100,
+                from: normalizedFrom,
+                to: normalizedTo,
                 color: item.color,
                 thickness: thickness,
                 title: item.title,
@@ -391,7 +506,9 @@ function DrGaugeChart(pivotData, opts) {
         });
 
         // clamp last segment
-        bands[bands.length - 1].to = Math.max(bands[bands.length - 1].to, goalValue);
+        if (!DrGaugeChart.dynamicGoalFeatureEnabled()) {
+            bands[bands.length - 1].to = Math.max(bands[bands.length - 1].to, goalValue);
+        }
 
         return bands;
     };
@@ -400,6 +517,10 @@ function DrGaugeChart(pivotData, opts) {
         chart.startBorder.toFront();
         chart.endBorder.toFront();
         chart.goalIcon.toFront();
+
+        if (chart.goalLabel) {
+            chart.goalLabel.toFront();
+        }
     };
 
     this.clampValueToPane = function (value, max = this.max, min = this.min) {
@@ -407,6 +528,16 @@ function DrGaugeChart(pivotData, opts) {
         return helpers.clamp(min - correction, value, max + correction);
     };
 
+    this.setGoal = function (pivotData, opts) {
+        if (isDynamicGoal) {
+            this.options.goal = {
+                title: DrGaugeChart.getGoalTitleText(this.options),
+                value: DrGaugeChart.getValue(pivotData, opts, true, true),
+            };
+        }
+        this.goal = this.options.goal;
+    };
+
     this.configChart = function () {
         return {
             title: {
@@ -513,18 +644,25 @@ function DrGaugeChart(pivotData, opts) {
 
     this.originalOptions = opts;
     this.options = this.mergeOptions(opts.chartOptions);
-    this.aggregation = pivotData.getAggregator([], []);
+    this.aggregation = DrGaugeChart.getAggregation(pivotData, opts.chartOptions);
     this.format = this.aggregation.widget_values_format;
-    this.goal = this.options.goal;
+    this.value = DrGaugeChart.getValue(pivotData, opts, isDynamicGoal);
+    this.setGoal(pivotData, opts);
     this.plotBands = this.createPlotBands(this.options);
     this.ticks = this.createTicks(this.plotBands, this.options);
-    this.value = DrGaugeChart.getValue(pivotData, opts);
     this.max = this.ticks[this.ticks.length - 1];
     this.min = this.ticks[0];
 }
 
 DrGaugeChart.createTicks = function (plotBands, options) {
-    return _.uniq([plotBands[0].from || 0, ...plotBands.map((b) => b.to), options.goal.value]).sort((a, b) => a - b);
+    const goal = options.goal.value;
+    const ticks = [plotBands[0].from || 0, ...plotBands.map((b) => b.to)];
+
+    if (!DrGaugeChart.dynamicGoalFeatureEnabled() || goal < Math.max(...ticks) && goal > Math.min(...ticks)) {
+        ticks.push(options.goal.value);
+    }
+
+    return _.uniq(ticks.sort((a, b) => a - b));
 };
 
 DrGaugeChart.getBorderPosition = function (chart, options, position) {
@@ -583,33 +721,57 @@ DrGaugeChart.getSingleValueAgg = function (opts, aggfunc, base) {
     return DrGaugeChart.highchartsRenderer.getSingleValueAgg(opts, aggfunc, base);
 };
 
-DrGaugeChart.getValue = function (pivotData, opts) {
-    const lineSeries = DrGaugeChart.ptCreateBasicLineSeries(pivotData, null, true, null, null, opts, {});
+DrGaugeChart.getAggregation = function(pivotData, options, isForGoal = false) {
+    if (_.get(options, 'dynamicGaugeConfig')) {
+        return pivotData.getAggregator([], [isForGoal ? options.dynamicGaugeConfig.goal : options.dynamicGaugeConfig.needle]);
+    }
+    return pivotData.getAggregator([], []);
+}
 
-    let total = _.flatten(lineSeries
-        .map((s) => s.data.map((v) => v))
-        .filter((v) => !_.isNaN(v))
-    );
 
-    let aggfunc = (a, b) => a + b;
-    let base = 0;
-    let singleValueAgg = DrGaugeChart.getSingleValueAgg(
-        {
-            value: {
-                value: "Sum",
+DrGaugeChart.getValue = function (pivotData, opts, isDynamicGoal = false, isForGoal = false) {
+    const aggregator = DrGaugeChart.getAggregation(pivotData, opts.chartOptions, isForGoal)
+
+    let total;
+    if (!isDynamicGoal) {
+        const lineSeries = DrGaugeChart.ptCreateBasicLineSeries(pivotData, null, true, null, null, opts, {});
+
+        total = _.flatten(lineSeries
+            .map((s) => s.data.map((v) => v))
+            .filter((v) => !_.isNaN(v))
+        );
+
+        let aggfunc = (a, b) => a + b;
+        let base = 0;
+        let singleValueAgg = DrGaugeChart.getSingleValueAgg(
+            {
+                value: {
+                    value: "Sum",
+                },
             },
-        },
-        aggfunc,
-        base
-    );
+            aggfunc,
+            base
+        );
 
-    aggfunc = singleValueAgg.aggfunc;
-    base = singleValueAgg.base;
+        aggfunc = singleValueAgg.aggfunc;
+        base = singleValueAgg.base;
 
-    const aggregator = pivotData.getAggregator([], []);
-    const value = total.length > 0 ? total.reduce(aggfunc, base) : aggregator.value();
+        if (total.length > 0) {
+            return total.reduce(aggfunc, base);
+        }
+    }
 
-    return value;
+    return aggregator.value();
 };
 
+DrGaugeChart.getGoalTitleText = function(options) {
+    return DrGaugeChart.dynamicGoalFeatureEnabled()
+        ? _.get(options, 'label.goal_name') || options.goal.title
+        : options.goal.title;
+}
+
+DrGaugeChart.dynamicGoalFeatureEnabled = function() {
+    return DrGaugeChart.highchartsRenderer.hasFeature(helpers.FEATURES.ENABLE_GAUGE_DYNAMIC_GOAL);
+}
+
 module.exports = { DrGaugeChart, GAUGE_OPTIONS_DEFAULT };

package/src/dr-renderer-helpers.js

@@ -18,25 +18,32 @@ function isNumber(n) {
 }
 
 function mergeDeep(target, ...sources) {
-    const isObject = (obj) => obj && typeof obj === 'object' && !Array.isArray(obj);
+    const deepClone = (val) => {
+        if (Array.isArray(val)) return val.map(deepClone);
+        if (_.isPlainObject(val)) {
+            const out = {};
+            for (const k of Object.keys(val)) out[k] = deepClone(val[k]);
+            return out;
+        }
+        return val;
+    };
 
-    if (!isObject(target)) return target;
+    if (!_.isPlainObject(target)) return target;
 
-    sources.forEach((source) => {
-        if (!isObject(source)) return;
+    for (const source of sources) {
+        if (!_.isPlainObject(source)) continue;
 
-        Object.keys(source).forEach((key) => {
-            const targetValue = target[key];
-            const sourceValue = source[key];
+        for (const key of Object.keys(source)) {
+            const tVal = target[key];
+            const sVal = source[key];
 
-            if (isObject(targetValue) && isObject(sourceValue)) {
-                target[key] = mergeDeep(Object.assign({}, targetValue), sourceValue);
+            if (_.isPlainObject(tVal) && _.isPlainObject(sVal)) {
+                target[key] = mergeDeep({}, tVal, sVal);
             } else {
-                target[key] = sourceValue;
+                target[key] = deepClone(sVal);
             }
-        });
-    });
-
+        }
+    }
     return target;
 }
 
@@ -66,6 +73,15 @@ function isShowingEmptyValues(additionOptions) {
     return !additionOptions || !additionOptions.chart || additionOptions.chart.dislay_empty_values !== false;
 }
 
+const FEATURES = {
+    ENABLE_NEW_WIDGET_VALUE_FORMATTING: 'enable_new_widget_value_formatting',
+    FORMAT_DATES_AS_OTHER_AXIS_TYPES: 'format_dates_as_other_axis_types',
+    MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
+    USE_NEW_SCENARIO_TAG: 'use_new_scenario_tag',
+    ENABLE_SERVER_WIDGET_DATA_SORTING: 'enable_server_widget_data_sorting',
+    ENABLE_GAUGE_DYNAMIC_GOAL: 'enable_gauge_dynamic_goal',
+}
+
 module.exports = {
     backendSortingKeysAreNotEmpty,
     capitalize,
@@ -75,4 +91,5 @@ module.exports = {
     removeSVGTextCorrection,
     disableLegendInteractionIfRequired,
     isShowingEmptyValues,
+    FEATURES
 }

package/src/dr_pivottable.js

@@ -1,5 +1,5 @@
 const { DR_SCENARIO } = require('./smart_queries_helper');
-
+const { TooMuchDataError } = require('./errors');
 
 let initDRPivotTable = function($, window, document) {
     var hasProp = {}.hasOwnProperty;
@@ -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,7 @@ 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] || isSmartQueriesEnabled) {
                     this.rowTotals[flatRowKey] = getRowAggregator(rowKey.slice());
                     this.rowTotals[flatRowKey].push(record);
                 }
@@ -437,7 +437,6 @@ let initDRPivotTable = function($, window, document) {
 
             return resultsArr;
         } else {
-            let tooMuch = false;
             const show_more_than_thousand_rows = _.get(opts, 'chartOptions.table_options.show_more_than_thousand_rows', false);
             if (pvtData &&
                 (pvtData.rowKeys.length > 1000 || pvtData.colKeys.length > 500) &&
@@ -445,15 +444,16 @@ let initDRPivotTable = function($, window, document) {
                 !show_more_than_thousand_rows) {
                 pvtData.rowKeys = [];
                 pvtData.colKeys = [];
-                tooMuch = true;
-                opts.error_has_occurred = true;
-                opts.error_params = $.pivotUtilities.errorHandling.placeholders.tooMuchData;
+
+                const tooMuchDataError = new TooMuchDataError();
+                console.error(tooMuchDataError.title);
+                throw tooMuchDataError;
             }
-            return SubtotalRenderer(pvtData, opts, charttype, tooMuch, opts.error_params);
+            return SubtotalRenderer(pvtData, opts, charttype);
         }
     }
 
-    SubtotalRenderer = function(pivotData, opts, charttype, tooMuch = false, error_params) {
+    SubtotalRenderer = function(pivotData, opts, charttype) {
         var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, subscribeToClick;
         var createTotalValsBolder, createGrandTotalBolder, getHeaderColorProperties, colorizeRowLabelHeaders, colorizeTableIfNeed, valueNoDashes, getColorsWithOffsetForTable, offsetColors, handleFreezePanesScroll, selectFreezableElements, removeRowHeaderNullValue;
         var getAdditionalAggregation, buildAdditionalHeaderCols, buildAdditionalHeaderRows, buildAdditionalColValues, buildAdditionalRowValues, buildAdditionalRowTotals, buildAdditionalColTotals;
@@ -1526,7 +1526,7 @@ let initDRPivotTable = function($, window, document) {
                     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]?.value() || 0;
+                            val += (actualsRow[flatColKey] && actualsRow[flatColKey].value()) || 0;
                         }
                     }
                     isColSubtotal = colHeader.children.length !== 0;
@@ -1572,7 +1572,7 @@ let initDRPivotTable = function($, window, document) {
 
                 val = totalAggregator.value();
                 if (opts.chartOptions.isSmartQueriesEnabled && flatRowKey.split(' , ').includes(DR_SCENARIO.Forecast)) {
-                    val += rowTotals[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)]?.value() || 0;
+                    val += _.get(rowTotals[flatRowKey.replace(DR_SCENARIO.Forecast, DR_SCENARIO.SQ_Actuals)], 'value', () => null)() || 0;
                 }
                 style = "pvtTotal rowTotal";
                 if (isRowSubtotal) {
@@ -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 = [];
@@ -2494,24 +2497,13 @@ let initDRPivotTable = function($, window, document) {
                 resultsArr.push(subTitle);
             }
 
-            if (tooMuch) {
-                const defaultPlaceholder = $(`
-                        <div class="noData--table-many-rows">
-                            <span><i class="noData-icon dr-icon-info"></i> There are too many rows to display in the table.</span>
-                            <span>Please filter or change the table type in options.</span>
-                        </div>
-                `);
-
-                resultsArr.push($.pivotUtilities.errorHandling.getErrorPlaceholder(error_params) || defaultPlaceholder);
-            } else {
-                var tableContainer = document.createElement("div");
-                tableContainer.className = "pivot-div";
-                tableContainer.appendChild(result);
-                if (opts.chartOptions.table_options.freeze_panes) {
-                    tableContainer.onscroll = handleFreezePanesScroll(selectFreezableElements(tableContainer));
-                }
-                resultsArr.push(tableContainer);
+            var tableContainer = document.createElement("div");
+            tableContainer.className = "pivot-div";
+            tableContainer.appendChild(result);
+            if (opts.chartOptions.table_options.freeze_panes) {
+                tableContainer.onscroll = handleFreezePanesScroll(selectFreezableElements(tableContainer));
             }
+            resultsArr.push(tableContainer);
 
             var wrapper = document.createElement("div");
             wrapper.className = "pivot-wrapper";
@@ -2522,7 +2514,7 @@ let initDRPivotTable = function($, window, document) {
         };
         return main(rowAttrs, rowKeys, colAttrs, colKeys, pivotData);
     };
-    // $.pivotUtilities.subtotal_renderers = SubtotalRenderer;
+
     $.pivotUtilities.subtotal_renderers = NovixRenderer;
     $.pivotUtilities.delim = delim;