@datarailsshared/dr_renderer 1.2.276 → 1.2.278

package/package.json

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

package/src/dr_pivottable.js

@@ -149,6 +149,9 @@ let initDRPivotTable = function($, window, document) {
         }
 
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
+            const insight = record.insight;
+            delete record.insight;
+            
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
                     this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
@@ -213,13 +216,12 @@ let initDRPivotTable = function($, window, document) {
                     this.tree[flatRowKey][flatColKey].push(record);
                 }
 
-                if (flatRowKey || flatColKey) {
+                if (insight && (flatRowKey || flatColKey)) {
                     this.insights.push({
                         colKey: flatColKey,
                         rowKey: flatRowKey,
-                        insight: record.insight || null,
+                        insight: insight,
                     });
-                    delete record.insight;
                 }
 
                 return;
@@ -245,6 +247,19 @@ let initDRPivotTable = function($, window, document) {
                 };
             })(this));
 
+            if (insight) {
+                const flatRowKeyForInsight = rowKey.join(delim);
+                const flatColKeyForInsight = colKey.join(delim);
+
+                if (flatRowKeyForInsight || flatColKeyForInsight) {
+                    this.insights.push({
+                        colKey: flatColKeyForInsight,
+                        rowKey: flatRowKeyForInsight,
+                        insight: insight,
+                    });
+                }
+            }
+
             m = rowKey.length - 1;
             n = colKey.length - 1;
             if (m < 0 || n < 0) {

package/src/highcharts_renderer.js

@@ -2528,8 +2528,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(colAttrs.length > 1 || !opts.insightsTooltipFunc) {
             chartOptions.tooltip = {
@@ -2614,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),
@@ -2709,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),
@@ -2991,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);
 
@@ -3127,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',
@@ -3312,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);
 
@@ -3393,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(),
@@ -3505,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;
@@ -3624,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);
@@ -5133,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);
@@ -5144,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) {
@@ -5198,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
@@ -5728,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) {
@@ -5757,6 +5758,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
                 opt.drillDownListFunc = drillDownListFunc;
                 opt.insightsTooltipFunc = insightsTooltipFunc;
+                opt.trackUserInsightsTooltipFunc = trackUserInsightsTooltipFunc;
             } else {
                 opt.drillDownListFunc = null;
             }