@datarailsshared/dr_renderer 1.2.275 → 1.2.277

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.275",
+  "version": "1.2.277",
   "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');
 
@@ -2504,13 +2528,17 @@ 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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
-        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(),
@@ -2586,8 +2614,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.tooltip = {
             formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
@@ -2681,8 +2709,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.tooltip = {
             formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
@@ -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);
 
@@ -2960,8 +2991,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
@@ -3096,8 +3127,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.xAxis = {
             type: 'category',
@@ -3281,8 +3312,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
@@ -3362,8 +3393,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.xAxis = {
             categories: pivotData.getColKeys(),
@@ -3474,8 +3505,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 3, false);
         chartOptions.legend.useHTML = true;
@@ -3593,8 +3624,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.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
+        chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
 
         if (waterfallOptions.colors) {
             chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, 3, false);
@@ -5102,7 +5133,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         options.chartOptions = lodash.merge(defaultOptions, options.chartOptions);
     };
 
-    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction, insightsTooltipFunction) {
+    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction, insightsTooltipFunction, trackUserInsightsTooltipFunction) {
         // Check if not rendered data, than it will render
 
         var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplateWOData.fields);
@@ -5113,6 +5144,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var drilldownFunc = drilldownFunction;
         var drillDownListFunc = drillDownListFunction;
         var insightsTooltipFunc = insightsTooltipFunction;
+        var trackUserInsightsTooltipFunc = trackUserInsightsTooltipFunction;
 
         // fill value fields
         lodash.forEach(widgetOptions.vals, function (valObj) {
@@ -5167,7 +5199,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, insightsTooltipFunc);
+        widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc, trackUserInsightsTooltipFunc);
 
         // 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
@@ -5697,7 +5729,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return toReturn;
     };
 
-    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc) {
+    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc, trackUserInsightsTooltipFunc) {
         var fnToReturn = null;
 
         if (newChartType == highchartsRenderer.richTextSubType.type) {
@@ -5726,6 +5758,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
                 opt.drillDownListFunc = drillDownListFunc;
                 opt.insightsTooltipFunc = insightsTooltipFunc;
+                opt.trackUserInsightsTooltipFunc = trackUserInsightsTooltipFunc;
             } else {
                 opt.drillDownListFunc = null;
             }
@@ -8481,7 +8514,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 = {};