@datarailsshared/dr_renderer 1.2.273 → 1.2.275

package/package.json

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

package/src/highcharts_renderer.js

@@ -2504,6 +2504,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.tooltip = {
             formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
             valueDecimals: 2,
@@ -2583,6 +2586,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.tooltip = {
             formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
             valueDecimals: 2,
@@ -2675,6 +2681,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.tooltip = {
             formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
             valueDecimals: 2,
@@ -2951,6 +2960,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
 
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
@@ -3084,6 +3095,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
+
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.xAxis = {
             type: 'category',
             crosshair: true,
@@ -3265,6 +3280,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
+
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
@@ -3343,6 +3362,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.xAxis = {
             categories: pivotData.getColKeys(),
             title: {
@@ -3452,6 +3474,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 3, false);
         chartOptions.legend.useHTML = true;
         chartOptions.legend.labelFormatter = function() {
@@ -3567,6 +3592,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
+
+        chartOptions.plotOptions.series.point.events.mouseOver = opts.insightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.insightsTooltipFunc;
+
         if (waterfallOptions.colors) {
             chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 3, false);
             chartOptions.legend.useHTML = true;
@@ -4222,155 +4251,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
     };
 
-    highchartsRenderer.createTotalColFiltersArr = function (colKeys, colTotals, totalFilters, pivotData) {
-        var colIndexesToFilter = []
-        if (!totalFilters || !totalFilters.type)
-            return colIndexesToFilter
-
-        var colTotalsWithoutSubTotals = {};
-        var i, flatKey;
-        for (i in colKeys) {
-            flatKey = colKeys[i].join($.pivotUtilities.delim);
-            if (colTotals[flatKey])
-                colTotalsWithoutSubTotals[flatKey] = colTotals[flatKey];
-        }
-
-        var filterFunc = highchartsRenderer.getTotalsFilter(totalFilters.type, totalFilters.value, totalFilters.is_absolute, colTotalsWithoutSubTotals)
-        for (var j in colKeys) {
-            var totalVal = pivotData.getAggregator([], colKeys[j]).value();
-            if (filterFunc(totalVal)) {
-                colIndexesToFilter.push(j)
-            }
-        }
-
-        let keyAttListToFilter = [];
-        for (var attr in pivotData.colAttrs) {
-            for (var key in pivotData.colKeys) {
-                if ($.inArray(key, colIndexesToFilter) >= 0) {
-                    keyAttListToFilter.push(pivotData.colKeys[key])
-                }
-            }
-        }
-        return keyAttListToFilter;
-    };
-
-    highchartsRenderer.createTotalRowFiltersArr = function (rowKeys, rowTotals, totalFilters, pivotData) {
-        var rowIndexesToFilter = [];
-        if (!totalFilters || !totalFilters.type)
-            return rowIndexesToFilter;
-
-        var rowTotalsWithoutSubTotals = {};
-        var i, flatKey;
-        for (i in rowKeys) {
-            flatKey = rowKeys[i].join($.pivotUtilities.delim);
-            if (rowTotals[flatKey])
-                rowTotalsWithoutSubTotals[flatKey] = rowTotals[flatKey];
-        }
-
-        var filterFunc = highchartsRenderer.getTotalsFilter(totalFilters.type, totalFilters.value, totalFilters.is_absolute, rowTotalsWithoutSubTotals)
-        for (var j in rowKeys) {
-            var totalVal = pivotData.getAggregator(rowKeys[j], []).value();
-            if (filterFunc(totalVal)) {
-                rowIndexesToFilter.push(j)
-            }
-        }
-
-        let keyAttListToFilter = [];
-        for (var attr in pivotData.rowAttrs) {
-            for (var key in pivotData.rowKeys) {
-                if ($.inArray(key, rowIndexesToFilter) >= 0) {
-                    keyAttListToFilter.push(pivotData.rowKeys[key])
-                }
-            }
-        }
-        return keyAttListToFilter;
-    };
-
-    highchartsRenderer.getTotalsFilter = function (type, vals, is_absolute, totals) {
-        var filter = (a) => false;
-        switch (type) {
-            case "filter_above":
-                if (is_absolute)
-                    filter = (a) => Math.abs(a) <= vals[0];
-                else
-                    filter = (a) => a <= vals[0];
-                break;
-            case "filter_below":
-                if (is_absolute)
-                    filter = (a) => Math.abs(a) >= vals[0];
-                else
-                    filter = (a) => a >= vals[0];
-                break;
-            case "filter_between":
-                if (is_absolute)
-                    filter = (a) => Math.abs(a) <= vals[0] || Math.abs(a) >= vals[1];
-                else
-                    filter = (a) => a <= vals[0] || a >= vals[1];
-                break;
-            case "filter_out_of_range":
-                if (is_absolute)
-                    filter = (a) => Math.abs(a) >= vals[0] && Math.abs(a) <= vals[1];
-                else
-                    filter = (a) => a >= vals[0] && a <= vals[1];
-                break;
-            case "filter_top_x":
-                var topx;
-                if (is_absolute)
-                    topx = lodash.map(totals, (x) => Math.abs(x.value())).filter((v, i, a) => a.indexOf(v) === i).sort((a, b) => b - a).slice(0, vals[0]).pop();
-                else
-                    topx = lodash.map(totals, (x) => x.value()).filter((v, i, a) => a.indexOf(v) === i).sort((a, b) => b - a).slice(0, vals[0]).pop();
-
-                if (topx != undefined) {
-                    if (is_absolute)
-                        filter = (a) => Math.abs(a) < topx;
-                    else
-                        filter = (a) => a < topx;
-                }
-                break;
-            case "filter_bottom_x":
-                var bottomx;
-                if (is_absolute)
-                    bottomx = lodash.map(totals, (x) => Math.abs(x.value())).filter((v, i, a) => a.indexOf(v) === i).sort((a, b) => a - b).slice(0, vals[0]).pop();
-                else
-                    bottomx = lodash.map(totals, (x) => x.value()).filter((v, i, a) => a.indexOf(v) === i).sort((a, b) => a - b).slice(0, vals[0]).pop();
-
-                if (bottomx != undefined) {
-                    if (is_absolute)
-                        filter = (a) => Math.abs(a) > bottomx;
-                    else
-                        filter = (a) => a > bottomx;
-                }
-                break;
-            case "filter_smallest":
-                const smallest_sumOfFields = lodash.reduce(totals, (acc, curr) => acc += curr.sum, 0);
-                const smallest = Math.floor((smallest_sumOfFields * vals[0])/100);
-
-                if (is_absolute)
-                    filter = (a) =>  Math.abs(a) > smallest;
-                else
-                    filter = (a) =>  a > smallest;
-                break;
-            case "filter_largest":
-                const largest_sumOfFields = lodash.reduce(totals, (acc, curr) => acc += curr.sum, 0);
-                const largest = Math.floor((largest_sumOfFields * vals[0])/100);
-
-                if (is_absolute)
-                    filter = (a) =>  Math.abs(a) < largest;
-                else
-                    filter = (a) =>  a < largest;
-                break;
-            case "filter_out_zero":
-                if (is_absolute)
-                    filter = (a) =>  Math.abs(a) == 0;
-                else
-                    filter = (a) =>  a == 0;
-                break;
-            default:
-
-        }
-        return filter;
-    };
-
     highchartsRenderer.getAxis = function (axis, opts, farceIsTable = false) {
         let is_transpose = lodash.get(opts, 'rendererOptions.chartOptions.table_options.transpose_table', false);
         let is_table = opts.isTable;
@@ -4384,43 +4264,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return axis;
     };
 
-    highchartsRenderer.generateFilteredResult = function (totalFilters, optsFiltered, rowData, opts, pivotData) {
-        let keyAttListToFilter;
-        let axis = highchartsRenderer.getAxis(totalFilters.filter_options.axis, opts);
-
-        if (axis == 'col_total') {
-            keyAttListToFilter = highchartsRenderer.createTotalColFiltersArr(pivotData.colKeys, pivotData.colTotals, totalFilters.filter_options, pivotData);
-            return highchartsRenderer.generateFilteredResultForRowAndCol(keyAttListToFilter, optsFiltered, pivotData.colAttrs, rowData, opts, pivotData);
-        } else if (axis == 'row_total') {
-            keyAttListToFilter = highchartsRenderer.createTotalRowFiltersArr(pivotData.rowKeys, pivotData.rowTotals, totalFilters.filter_options, pivotData);
-            return highchartsRenderer.generateFilteredResultForRowAndCol(keyAttListToFilter, optsFiltered, pivotData.rowAttrs, rowData, opts, pivotData);
-        } else {
-            return opts.renderer(pivotData, opts.rendererOptions);
-        }
-    };
-
-    highchartsRenderer.generateFilteredResultForRowAndCol = function (keyAttListToFilter, optsFiltered, attrs, rowData, opts, pivotData) {
-        let pivotDataFiltered = pivotData;
-        if (!lodash.isEmpty(keyAttListToFilter)) {
-            var myfilter = function (rec) {
-                for (var i in keyAttListToFilter) {
-                    var allsame = true;
-                    var find_one = lodash.find(attrs, function (val, j) {
-                        return ((rec[val] != keyAttListToFilter[i][j]) && !(!rec[val] && keyAttListToFilter[i][j] == "null"))
-                    });
-                    if (find_one == undefined) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            optsFiltered.filter = myfilter;
-
-            pivotDataFiltered = $.pivotUtilities.getPivotDataModel(rowData, optsFiltered);
-        }
-        return opts.renderer(pivotDataFiltered, opts.rendererOptions);
-    };
-
     highchartsRenderer.sanitizeOptions = function (opts) {
         if (opts && opts.rendererOptions) {
             if (opts.rendererOptions.chart_title) {
@@ -5259,7 +5102,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         options.chartOptions = lodash.merge(defaultOptions, options.chartOptions);
     };
 
-    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction) {
+    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction, insightsTooltipFunction) {
         // Check if not rendered data, than it will render
 
         var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplateWOData.fields);
@@ -5269,6 +5112,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var valuesFields = [];
         var drilldownFunc = drilldownFunction;
         var drillDownListFunc = drillDownListFunction;
+        var insightsTooltipFunc = insightsTooltipFunction;
 
         // fill value fields
         lodash.forEach(widgetOptions.vals, function (valObj) {
@@ -5323,7 +5167,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         widgetOptions.pivot.valuesArray = valuesFields;
         widgetOptions.pivot.chartType = widgetOptions.chart_type;
         widgetOptions.pivot.chartOptions = widgetOptions.options;
-        widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc);
+        widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc);
 
         // TODO: remove this logic after BE sort is implemented
         // it is required to do sort by totals for comparative analysis - we need to change deltas if columns swaped vice versa
@@ -5853,7 +5697,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return toReturn;
     };
 
-    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc) {
+    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc) {
         var fnToReturn = null;
 
         if (newChartType == highchartsRenderer.richTextSubType.type) {
@@ -5881,6 +5725,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     opt = {};
                 }
                 opt.drillDownListFunc = drillDownListFunc;
+                opt.insightsTooltipFunc = insightsTooltipFunc;
             } else {
                 opt.drillDownListFunc = null;
             }
@@ -7479,8 +7324,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         },
     };
 
-    highchartsRenderer.chartsData =
-        [
+    highchartsRenderer.chartsData = [
             {
                 type: 'line',
                 name: 'Line',