@datarailsshared/dr_renderer 1.2.274 → 1.2.276

package/package.json

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

package/src/dr_pivottable.js

@@ -143,6 +143,11 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
+        DRPivotData.prototype.getInsight = function(colKey, rowKey) {
+            const insightInfo = _.find(this.insights, insight => insight.colKey === colKey && insight.rowKey === rowKey);
+            return _.get(insightInfo, 'insight', null);
+        }
+
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
@@ -207,6 +212,16 @@ let initDRPivotTable = function($, window, document) {
                     this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
                     this.tree[flatRowKey][flatColKey].push(record);
                 }
+
+                if (flatRowKey || flatColKey) {
+                    this.insights.push({
+                        colKey: flatColKey,
+                        rowKey: flatRowKey,
+                        insight: record.insight || null,
+                    });
+                    delete record.insight;
+                }
+
                 return;
             }
 

package/src/highcharts_renderer.js

@@ -666,6 +666,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return func;
     };
 
+    highchartsRenderer.customFormatterTooltipInsights = function(pivotData, opts) {
+        return {
+        useHTML: true,
+        outside: true,
+        backgroundColor: 'transparent',
+        borderWidth: 0,
+        borderRadius: 0,
+        shadow: false,
+        shape: 'square',
+        padding: 0,
+        stickOnContact: true,
+        formatter: function () {
+            const rowKey = pivotData.rowAttrs.length ? _.get(this.point, 'series.name') || "" : "";
+            const colKey = _.get(this.point, 'name') || this.x.name[0] || "";
+            const insight = pivotData.getInsight(colKey, rowKey) || {};
+            setTimeout(() => {
+                var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
+                const formatted_value_to_return = aggr.bind(this)();
+                opts.insightsTooltipFunc({...this, formatted_value_to_return, ...insight});
+            });
+        }
+    }
+    }
+
     highchartsRenderer.defaultFormatterToTooltip = function (pivotData, opts, is_drill_down_pie) {
         var variant_name = null;
         var variant_name_default_name = null;
@@ -673,7 +697,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             variant_name = opts.chartOptions.delta_column.name.replace('_', '');
             variant_name_default_name = opts.chartOptions.delta_column.name;
         }
-
         const tooltipOptions = lodash.get(opts, 'chartOptions.tooltips');
 
         let percentageLabels = {
@@ -2444,6 +2467,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.ptRenderBasicLine = function (pivotData, opts) {
         var chartOptions = {};
         var rowAttrs = pivotData.rowAttrs;
+        var colAttrs = pivotData.colAttrs;
 
         var additionOptions = opts.chartOptions ? opts.chartOptions : highchartsRenderer.getDefaultValueForChart('line-chart');
 
@@ -2507,10 +2531,14 @@ 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,
-        };
+        if(colAttrs.length > 1 || !opts.insightsTooltipFunc) {
+            chartOptions.tooltip = {
+                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+                valueDecimals: 2,
+            };
+        } else {
+            chartOptions.tooltip = highchartsRenderer.customFormatterTooltipInsights(pivotData, opts);
+        }
 
         chartOptions.xAxis = {
             categories: pivotData.getColKeys(),
@@ -2918,10 +2946,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
         }
 
-        chartOptions.tooltip = {
-            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-            valueDecimals: 2,
-        };
+
+        chartOptions.tooltip = opts.insightsTooltipFunc
+            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
+            : {
+                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+                valueDecimals: 2,
+            };
 
         highchartsRenderer.handleGridLines(additionOptions, chartOptions);
 
@@ -4251,155 +4282,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;
@@ -4413,43 +4295,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) {
@@ -7510,8 +7355,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         },
     };
 
-    highchartsRenderer.chartsData =
-        [
+    highchartsRenderer.chartsData = [
             {
                 type: 'line',
                 name: 'Line',
@@ -8668,7 +8512,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return $.pivotUtilities.getPivotTableFormula(rowData, opts, func, axisFields, legendFields, aggregationDefaults, utils);
     };
 
-
     // widget Renderer
     highchartsRenderer.updateSelectedOverrideValues = function (widget, override_values, res) {
         if (override_values && override_values.length > 0) {

package/src/pivottable.js

@@ -684,6 +684,7 @@ let initPivotTable = function($, window, document) {
                 return true;
             });
             this.tree = {};
+            this.insights = [];
             this.rowKeys = [];
             this.colKeys = [];
             this.rowTotals = {};