@datarailsshared/dr_renderer 1.2.216-dragons → 1.2.217

package/package.json

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

package/src/highcharts_renderer.js

@@ -1,6 +1,5 @@
 const SERIES_CLASSNAMES = {
     WATERFALL_BREAKDOWN: 'waterfallBreakdown',
-    WATERFALL_WALKTHROUGH: 'waterfallWalkthrough',
     TOTAL_SERIES: 'totalSeries',
     TREND_SERIES: 'trendSeries',
 };
@@ -26,7 +25,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     const textColor = "#151a41";
     const chartLabelColor = "#cfd7dd";
     const HIGHCHARTS_FONT_FAMILY = 'Poppins';
-    let firstBarColor = null;
 
     if(!Highcharts){
         Highcharts = {
@@ -84,16 +82,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         KPI_WIDGET: 'kpi-widget',
         TEXT_WIDGET: 'text-widget',
         WATERFALL_BREAKDOWN: 'waterfall-chart-breakdown',
-        WATERFALL_WALKTHROUGH: 'waterfall-chart-walkthrough',
         PUBLISHED_ITEM: 'published_item',
         RICH_TEXT: 'rich_text',
         EXCEL_VIEWER: 'excel_viewer',
     };
 
-    highchartsRenderer.VIRTUAL_FIELDS = {
-        WATERFALL_VARIANCE: 'DR_WATERFALL_BREAKDOWN_VARIANCE',
-    };
-
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -469,7 +462,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             highchartsRenderer.getOthersName(opts) :
             undefined;
         var drOthersInColumn = lodash.find(
-            pivotData.getColKeys(),
+            pivotData.getColKeys(), 
             keys => keys.length && (lodash.includes(keys, 'DR_Others') || lodash.includes(keys, othersName))
         );
 
@@ -489,7 +482,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     rows = [];
                 }
 
-                var cols = lodash.get(this, 'point.options.colsForTotal') || this.key;
+                var cols = this.key;
                 if (typeof (cols) == 'object' && cols.name) {
                     cols = cols.name;
                 }
@@ -497,7 +490,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (!cols && is_drill_down_pie) {
                     cols = this.point.name;
                 }
-
+                
                 if (drOthersInColumn) {
                     if (!lodash.isArray(cols) && othersName === cols) {
                         cols = ['DR_Others'];
@@ -635,8 +628,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     || this.series.options.className === 'trendSeries') {
                     rows = [];
                 }
-
-                var cols = lodash.get(this, 'point.options.colsForTotal') || this.key;
+                var cols = this.key;
                 if (!cols && is_drill_down_pie) {
                     cols = this.name;
                 }
@@ -659,9 +651,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         rows = temp;
                     }
 
-                    var category_text = `<span style="font-weight: bold;">
-                        ${ lodash.get(this, 'point.options.colsForTotal') ? cols[0] : cols } ${ isWaterfallBreakdown ? ': ' : ' ' }
-                    </span>`;
+                    var category_text = `<span style="font-weight: bold;">${ cols }${ isWaterfallBreakdown ? ': ' : ' ' }</span>`;
                     if (this.category) {
                         category_text = '';
                     }
@@ -678,7 +668,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         const modifiedRowsAndCols = highchartsRenderer.transformRowsAndColsForBreakdown(rows, cols, this.point, opts);
                         rows = modifiedRowsAndCols.rows;
                         cols = modifiedRowsAndCols.cols;
-                    }
+                    }    
 
                     var aggr = pivotData.getAggregator(rows, cols);
 
@@ -1354,6 +1344,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const chart_series = [];
         const row_n_keys = pivotData.getRowKeys();
         const col_n_keys = pivotData.getColKeys();
+        const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
 
         let resultObject = {
             data: [],
@@ -1372,6 +1363,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
 
             const totalColumnValue = pivotData.getAggregator([], col_n_value).value();
+            const nextTotalColumnKey = col_n_keys[col_index + 1];
+            const nextTotalColumnValue = nextTotalColumnKey ? pivotData.getAggregator([], nextTotalColumnKey).value() : null;
             resultObject.data.push({
                 y: totalColumnValue,
                 name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
@@ -1383,7 +1376,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (col_index !== col_n_keys.length - 1) {
                 lodash.forEach(row_n_keys, function (row_n_value) {
                     const agg = pivotData.getAggregator(row_n_value, col_n_value);
-                    let val = agg.value();
+                    let val = hasBreakdownValues
+                        ? agg.value()
+                        : nextTotalColumnValue - totalColumnValue;
 
                     val = $.isNumeric(val) ? parseFloat(val) : 0;
                     if (val) {
@@ -1394,7 +1389,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         if (tmoobj.name) {
                             tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
                         }
-
                         if (lodash.isEmpty(String(tmoobj.name))) {
                             tmoobj.name = lodash.unescape(col_n_value);
                             tmoobj.visible = false;
@@ -1404,12 +1398,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
-
                 });
             }
         });
 
         chart_series.push(resultObject);
+
         opts.chart_series = [];
         if (!lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach(series => {
@@ -1420,89 +1414,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_series;
     }
 
-    highchartsRenderer.ptCreateWaterfallWalkthroughSeries = function (pivotData, onlyNumbers, additionOptions, opts) {
-        const waterfallOptions = opts.walkthrough_options;
-        const chart_series = [];
-        let resultObject = {
-            data: [],
-            dataLabels: {
-                allowOverlap: additionOptions && additionOptions.label ? additionOptions.label.overlap : false,
-                enabled: additionOptions && additionOptions.label ? additionOptions.label.show : true,
-                formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions, total_value_options: opts.total_value_options}),
-                style: highchartsRenderer.getDataLabelsStyle(additionOptions),
-            },
-            upColor: waterfallOptions.colors.increase,
-            color: waterfallOptions.colors.decrease,
-            className: SERIES_CLASSNAMES.WATERFALL_WALKTHROUGH
-        };
-        resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
-        lodash.forEach(waterfallOptions.values.walkthrough, function(value, index) {
-
-            let keys = [];
-            if (value.trend === 'total') {
-                keys = ['Total'];
-            } else {
-                _.forEach(value.key, (item) => {
-                    const findKeyByValue = Object.keys(pivotData.dateValuesDictionary || {}).find(key => pivotData.dateValuesDictionary[key] === item);
-                    keys.push(findKeyByValue ? findKeyByValue : item);
-                 })
-            }
-
-            const agg = pivotData.getAggregator([], keys);
-            let val = agg.value();
-
-            if (val != null && $.isNumeric(val)) {
-                val = parseFloat(val);
-            } else if (onlyNumbers) {
-                val = NaN;
-            } else {
-                val = 0;
-            }
-
-            if (value.trend === 'decrease') {
-                val = val * -1;
-            }
-
-            const name = value.trend === 'total' ? value.formattedKey || value.key[0] : keys.join(highchartsRenderer.delimer);
-            let color = '';
-            if (value.trend !== 'total') {
-                if (index === 0 && !firstBarColor) {
-                    color = waterfallOptions.colors.total;
-                    firstBarColor = waterfallOptions.colors.total;
-                } else {
-                    color = value.color
-                }
-            } else {
-                color = waterfallOptions.colors.total;
-            }
-
-            resultObject.data.push({
-                y: val,
-                name: lodash.unescape(name).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
-                isSum: value.trend === 'total',
-                isTotal: value.trend === 'total',
-                color,
-                colsForTotal: value.trend === 'total' ? keys : null,
-            });
-        });
-        chart_series.push(resultObject);
-        chart_series.push(
-            {
-                name: 'Increase',
-                visible: false,
-                color: waterfallOptions.colors.increase
-            });
-
-        chart_series.push(
-            {
-                name: 'Decrease',
-                visible: false,
-                color: waterfallOptions.colors.decrease
-            });
-
-        return chart_series;
-    }
-
     highchartsRenderer.setChartTypeBySeriesType = function (type, series) {
         const types = {
             'line-chart': 'line',
@@ -1706,7 +1617,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.getDataLabelsStylesForDrillDown = function(additionOptions) {
         let result = highchartsRenderer.getDataLabelsOptions(additionOptions, { dataLabels: {} });
 
-        if (!result.dataLabels) return {};
+        if (!result.dataLabels) return {}; 
         return {
             activeDataLabelStyle: {
                 color: result.dataLabels.color,
@@ -3262,7 +3173,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.ptRenderWaterfallBreakdown = function (pivotData, opts, drilldownFunc, chartType) {
         let chartOptions = {};
-        const additionOptions = opts.chartOptions
+        const additionOptions = opts.chartOptions 
             ? opts.chartOptions
             : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
 
@@ -3361,122 +3272,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
     };
 
-    highchartsRenderer.ptRenderWaterfallWalkthrough = function (pivotData, opts) {
-        let chartOptions = {};
-        const waterfallOptions = opts?.walkthrough_options;
-        const additionOptions = opts.chartOptions
-            ? opts.chartOptions
-            : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH);
-
-        chartOptions.chart = {
-            type: 'waterfall',
-            zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
-        };
-        if (disableAnimation) {
-            chartOptions.chart.animation = false;
-        }
-        const walkthroughFieldIsNotSet = lodash.some(pivotData.getRowKeys(), rowKey => !rowKey || lodash.isArray(rowKey) && !rowKey.length);
-
-        chartOptions.xAxis = {
-            type: 'category',
-            crosshair: true,
-            min: 0,
-            title: {
-                text : additionOptions && additionOptions.axisX ? additionOptions.axisX.name : '',
-            },
-            uniqueNames: walkthroughFieldIsNotSet,
-        };
-
-        highchartsRenderer.setTitleAndSubTitle(chartOptions, opts, additionOptions);
-
-        chartOptions.yAxis = {
-            min: null,
-            max: null,
-            title: {
-                text: additionOptions && additionOptions.axisY ? additionOptions.axisY.name : '',
-                autoylabel: additionOptions && additionOptions.axisY ? additionOptions.axisY.autoylabel : ''
-            },
-            labels: {
-                formatter: highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts)
-            },
-        };
-        if (additionOptions) {
-            highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
-        }
-
-        chartOptions.tooltip = {
-            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-            valueDecimals: 2,
-        };
-
-        highchartsRenderer.handleGridLines(additionOptions, chartOptions);
-
-        if (lodash.get(opts, 'paletteOptions.widgetPalette', null)) {
-            const mc_palette = lodash.find(lodash.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
-            chartOptions.colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
-        } else if (lodash.get(opts, 'paletteOptions.dashboardPalette.colors', null)) {
-            chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
-        }
-        chartOptions.series = highchartsRenderer
-            .ptCreateWaterfallWalkthroughSeries(pivotData, null, additionOptions, opts);
-
-        chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
-        chartOptions.plotOptions = {
-            waterfall: {
-                pointPadding: 0.2,
-                borderWidth: 0,
-                borderRadius: 1,
-                lineWidth: 0,
-            },
-            series: {
-                animation: !disableAnimation,
-                cropThreshold: 1000,
-                dataLabels: {
-                    allowOverlap: additionOptions && additionOptions.label ? additionOptions.label.overlap : false,
-                    enabled: additionOptions && additionOptions.label ? additionOptions.label.show : true,
-                    formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, opts),
-                    style: highchartsRenderer.getDataLabelsStyle(additionOptions),
-                    inside: false
-                },
-                events: {
-                    legendItemClick: () => {
-                        return false;
-                    }
-                }
-            }
-        };
-
-        if (opts.drillDownListFunc) {
-            chartOptions.plotOptions.series.cursor = 'pointer';
-            chartOptions.plotOptions.series.point = {
-                events: {
-                    click: opts.drillDownListFunc
-                }
-            };
-        }
-        if (waterfallOptions.colors) {
-            chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 3, false);
-            chartOptions.legend.useHTML = true;
-            chartOptions.legend.labelFormatter = function() {
-                const name = this.options.className ? 'Total': this.name;
-                const findTotal = _.find(this.options.data, {isTotal: true});
-                const color = findTotal?.color ? findTotal.color : this.color;
-                return '<span style="margin: 5px; vertical-align: middle; display:inline-block; background-color: '+ color + '; width: 12px; height: 12px; border-radius: 50%"></span><span style="color: #000; display: inline-block; margin: 5px; vertical-align: middle;">' + name + '</span>';
-            }
-
-            chartOptions.legend.symbolPadding = 0;
-            chartOptions.legend.symbolWidth = 0;
-            chartOptions.legend.symbolHeight = 0;
-            chartOptions.legend.squareSymbol = false;
-        } else {
-            chartOptions.legend = {
-                enabled: false
-            }
-        }
-
-        return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
-    }
-
     highchartsRenderer.formatFieldValue = function (field, value) {
         let currentType = '';
         let format = field.format;
@@ -4545,17 +4340,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
     };
 
-    highchartsRenderer.waterfallConstants = {
-        [highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN]: {
-            minCategoriesCount: 2,
-            maxCategoriesCount: 5,
-        },
-        [highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH]: {
-            minCategoriesCount: 2,
-            maxCategoriesCount: 10,
-        }
-    };
-
     highchartsRenderer.rhPivotView = function (rowData, options, isTable = false, widget = null) {
         if (!rowData || !rowData) {
             if (options.onlyOptions) {
@@ -4564,15 +4348,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             return null;
         }
 
-        const isWaterfall = widget
-            && (
-                widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN
-                || widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH
-            );
-
-        if (isWaterfall) {
-            const maxCategories = highchartsRenderer.waterfallConstants[widget.chart_type].maxCategoriesCount;
-            const minCategories = highchartsRenderer.waterfallConstants[widget.chart_type].minCategoriesCount;
+        if (widget && widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
+            const breakdownSettings = widget.options.breakdown_options.settings;
+            const maxCategories = breakdownSettings.maxCategoriesCount;
+            const minCategories = breakdownSettings.minCategoriesCount;
             const uniqueCategories = lodash.filter(
                 lodash.uniq(
                     lodash.map(rowData, row => row[widget.cols[0].name])
@@ -4582,13 +4361,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             if (uniqueCategories && (uniqueCategories.length > maxCategories || uniqueCategories.length < minCategories )) {
                 options.error_has_occurred = true;
-                const isDateField = widget.cols[0].type === 'Date';
-                const commonMessagePart = `This chart support a selection of ${minCategories}-${maxCategories} items from the category section. `;
                 options.error_params = {
                     title: 'Data Conflict',
                     text: `Please adjust your dashboard's reference date and filter selections as \
                         the quantity of data doesn't match the chart's ${ minCategories }-${ maxCategories } value limit.`,
-                    class: uniqueCategories.length < minCategories ? 'waterfall-nodata' : 'waterfall-too-much-data',
+                    class: 'nodata',
                 }
                 return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
             }
@@ -4832,25 +4609,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.getWeekNumber(dateObj);
     };
 
-    highchartsRenderer.check_values_not_for_convert = function (currentgraph, field_name) {
-        let vals_not_convert = [];
+    highchartsRenderer.check_value_not_for_convert = function (currentgraph, field_name) {
+        let val_not_convert = null;
         if (lodash.has(currentgraph, "options.chartOptions.delta_column") && currentgraph.options.chartOptions.delta_column) {
             let delta_options = currentgraph.options.chartOptions.delta_column;
             if (delta_options.field == 'series' && currentgraph.rows && currentgraph.rows[0] &&
                 currentgraph.rows[0].name == field_name) {
-                vals_not_convert = [delta_options.name];
+                val_not_convert = delta_options.name;
             } else if (delta_options.field == 'category' && currentgraph.rows && currentgraph.cols[0] &&
                 currentgraph.cols[0].name == field_name) {
-                vals_not_convert = [delta_options.name];
+                val_not_convert = delta_options.name;
             }
-        } else if (currentgraph.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
-            lodash.forEach(currentgraph.options.walkthrough_options.values.walkthrough, value => {
-                if (value.trend === 'total') {
-                    vals_not_convert.push(value.key[0]);
-                }
-            });
         }
-        return vals_not_convert;
+        return val_not_convert;
     };
 
     highchartsRenderer.updateFiltersShowNames = function (filters) {
@@ -4870,8 +4641,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         })
     };
 
-    highchartsRenderer.returnRawDataValue = function (type, value, format, field_name, vals_not_for_convert) {
-        if (vals_not_for_convert && vals_not_for_convert.length && lodash.includes(vals_not_for_convert, value)) {
+    highchartsRenderer.returnRawDataValue = function (type, value, format, field_name, val_not_for_convert) {
+        if (val_not_for_convert && val_not_for_convert == value) {
             return value;
         }
 
@@ -5183,28 +4954,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
-        // add virtual fields to rows if required
-        let rows = widgetOptions.rows;
-        if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
-            rows = [
-                {
-                    id: -1,
-                    name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
-                    type: 'Text',
-                },
-            ];
-        }
-
         // fill rows fields
-        lodash.forEach(rows, function (valObj) {
-            if (lodash.includes(highchartsRenderer.VIRTUAL_FIELDS, valObj.name)) {
-                legendFields.push(valObj);
-            } else {
-                fieldOb = lodash.find(fields, {id: valObj.id});
-                if (fieldOb) {
-                    legendFields.push(fieldOb);
-                    lodash.remove(fields, {id: fieldOb.id});
-                }
+        lodash.forEach(widgetOptions.rows, function (valObj) {
+            fieldOb = lodash.find(fields, {id: valObj.id});
+            if (fieldOb) {
+                legendFields.push(fieldOb);
+                lodash.remove(fields, {id: fieldOb.id});
             }
         });
 
@@ -5845,7 +5600,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return valToReturn;
     };
 
-
+    
     highchartsRenderer.getChartAxisLabel = function(type) {
         return highchartsRenderer.chartsTypesInfo[type] ? highchartsRenderer.chartsTypesInfo[type].axisName : CHART_AXIS_DEFAULT_LABEL;
     };
@@ -6680,7 +6435,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'show',
                     default_value: true,
                     disabled_str: '!{var}.show_out_of_x_axis && !{var}.show_out_of_data_series && !{var}.show_value && !{var}.show_x_axis && !{var}.show_data_series',
-                    disabled_fn: (value) => !value.show_out_of_x_axis
+                    disabled_fn: (value) => !value.show_out_of_x_axis 
                         && !value.show_out_of_data_series
                         && !value.show_value
                         && !value.show_x_axis
@@ -6721,8 +6476,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_label: '[X Axis]',
                     value_name: 'show_x_axis',
                     default_value: true,
-                    clickFn: (value) => value.show = value.show
-                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series
+                    clickFn: (value) => value.show = value.show 
+                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series 
                         : value.show,
                 },
                 {
@@ -6730,8 +6485,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_label: '[Data Series]',
                     value_name: 'show_data_series',
                     default_value: true,
-                    clickFn: (value) => value.show = value.show
-                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series
+                    clickFn: (value) => value.show = value.show 
+                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series 
                         : value.show,
                 },
                 {
@@ -6739,8 +6494,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_label: 'Value',
                     value_name: 'show_value',
                     default_value: true,
-                    clickFn: (value) => value.show = value.show
-                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series
+                    clickFn: (value) => value.show = value.show 
+                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series 
                         : value.show,
                 },
                 {
@@ -6748,8 +6503,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_label: '% Out of [X Axis]',
                     value_name: 'show_out_of_x_axis',
                     default_value: false,
-                    clickFn: (value) => value.show = value.show
-                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series
+                    clickFn: (value) => value.show = value.show 
+                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series 
                         : value.show,
                 },
                 {
@@ -6757,8 +6512,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_label: '% Out of [Data Series]',
                     value_name: 'show_out_of_data_series',
                     default_value: false,
-                    clickFn: (value) => value.show = value.show
-                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series
+                    clickFn: (value) => value.show = value.show 
+                        ? value.show_out_of_x_axis || value.show_out_of_data_series || value.show_value || value.show_x_axis || value.show_data_series 
                         : value.show,
                 },
             ]
@@ -6932,16 +6687,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 value_name: 'name',
                 element_label: 'Name',
                 default_value: '_Variance'
-            }, {
-              element_type: 'input',
-              value_name: 'formula',
-              element_label: 'Formula',
-              default_value: 'x2-x1'
             }, {
                 element_type: 'input',
-                value_name: 'color',
-                element_label: 'Color',
-                default_value: ''
+                value_name: 'formula',
+                element_label: 'Formula',
+                default_value: 'x2-x1'
+            }, {
+              element_type: 'input',
+              value_name: 'color',
+              element_label: 'Color',
+              default_value: ''
             }, {
                 element_type: 'radio',
                 value_name: 'chart',
@@ -7064,17 +6819,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             axisTooltipDescription: 'The category (usually an independent variable) is shown on the x-axis and should be between 2 to 5 total columns. ',
             legendTooltipTitle: 'Drag one field to further configure your x-axis.',
             legendTooltipDescription: 'The breakdown subdivides the chart by a category field for further analysis of what’s contributing to the increase or decrease.',
-        },
-        [highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH]: {
-            name: 'Waterfall Walkthrough Chart ',
-            label: 'Waterfall Walkthrough Chart ',
-            title: 'TODO: add text',
-            description: 'TODO: add text',
-            axisName: 'Category',
-            startedMessage: 'TODO: add text',
-            axisTooltipTitle: 'TODO: add text',
-            legendTooltipTitle: 'TODO: add text',
-        },
+        }, 
         'combo-chart': {
             name: 'Combo Chart ',
             label: 'Combo Chart ',
@@ -7730,24 +7475,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             highchartsRenderer.suboptions["legends"],
                         ]
                     },
-                    {
-                        type: highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH,
-                        name:  highchartsRenderer.chartsTypesInfo[highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH].name,
-                        class: 'google-visualization-charteditor-thumbs-columnchart',
-                        render: highchartsRenderer.ptRenderWaterfallWalkthrough,
-                        suboptions: [
-                            highchartsRenderer.suboptions["axisX"],
-                            highchartsRenderer.suboptions["tooltips"],
-                            highchartsRenderer.suboptions["label"],
-                            highchartsRenderer.suboptions["subtitle"],
-                            highchartsRenderer.suboptions["widget_library"],
-                            highchartsRenderer.suboptions["chart"],
-                            highchartsRenderer.suboptions["negative_number_format"],
-                            highchartsRenderer.suboptions["advanced"],
-                            highchartsRenderer.suboptions["legends"],
-                        ],
-                        hidden: true,
-                    },
                 ]
             },
         ];
@@ -7904,7 +7631,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     _.forEach(Object.keys(dates), key => {
                         const dateConfiguration = dates[key];
                         const timestamp = dateConfiguration.timestamp;
-                        if (timestamp) {
+                        if (timestamp) {               
                             const dateTzOffsetInSeconds = new Date(timestamp * 1000).getTimezoneOffset() * 60;
                             dateConfiguration.displayedValue = new Date((timestamp + dateTzOffsetInSeconds) * 1000)
                                 .toLocaleDateString();
@@ -8200,10 +7927,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateFromString = function (dateString, format) {
-        if (!(format && highchartsRenderer.isDateFormat(dateString, format) || highchartsRenderer.isDate(dateString))) {
+        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
             return null;
         }
-        const utcDate = format
+        const utcDate = format 
             ? moment_lib.utc(dateString, format, true)
             : moment_lib.utc(dateString);
         return utcDate.startOf('day').unix();
@@ -8221,7 +7948,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let filters = [];
-
+        
         if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
             const colFilter = highchartsRenderer.createFilterObject(widget.cols[0]);
             const labels = [];
@@ -8249,7 +7976,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             col_value,
                             highchartsRenderer.getDateFieldFormat(widget, widget.cols[index])
                         );
-
+    
                         if ($.isEmptyObject(datetrange)) {
                             return;
                         }
@@ -8354,7 +8081,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filter.is_excluded = false;
             } else {
                 filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
-                filters.push(filter);
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {
@@ -8492,7 +8218,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var data = res;
 
         lodash.forEach(datesFields, function (row) {
-            row.val_not_convert = highchartsRenderer.check_values_not_for_convert(widget, row.name);
+            row.val_not_convert = highchartsRenderer.check_value_not_for_convert(widget, row.name);
         });
 
         if (datesFields.length > 0) {
@@ -8898,14 +8624,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
            return rightPosition;
          case 'none':
             return none;
-         }
-       } else if (isLine) {
-         return useNewUx ? leftPosition : rightPosition;
-       } else if (isPie) {
-           return useNewUx ? rightPosition : topPosition;
        }
+     } else if (isLine) {
+       return useNewUx ? leftPosition : rightPosition;
+     } else if (isPie) {
+         return useNewUx ? rightPosition : topPosition;
+     }
 
-        return useNewUx ? topPosition : bottomPosition;
+     return useNewUx ? topPosition : bottomPosition;
     }
 
     highchartsRenderer.setYAxisMinMax = function (yAxis, axisYOptions) {
@@ -8920,7 +8646,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.getDateFieldFormat = function(widget, dateField) {
-        const aggregationConfig = widget.options && widget.options.date_aggregation_configs
+        const aggregationConfig = widget.options && widget.options.date_aggregation_configs 
             ? _.find(widget.options.date_aggregation_configs, { field_id: dateField.id })
             : null;