@datarailsshared/dr_renderer 1.2.400 → 1.2.403

package/package.json

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

package/src/dr_pivottable.js

@@ -158,11 +158,6 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
-        DRPivotData.prototype.getInsight = function(colKey, rowKey) {
-            const key = [rowKey, colKey].join(delim);
-            return this.insights.get(key);
-        }
-
         DRPivotData.prototype.getAttrsKeys = function(record, attrs) {
             const keys = [];
             for (let k = 0; k < attrs.length; k++) {
@@ -179,53 +174,7 @@ let initDRPivotTable = function($, window, document) {
             return keys.join(delim);
         }
 
-        DRPivotData.prototype.buildInsights = function(rows, useServerTotalsCalculation) {
-            for (let index = 0; index < rows.length; index++) {
-                const record = rows[index];
-                const insight = record.insight;
-                delete record.insight;
-
-                if (!insight) continue;
-
-                if (useServerTotalsCalculation) {
-                    const flatRowKey = this.getFlatKey(record, this.rowAttrs);
-                    const flatColKey = this.getFlatKey(record, this.colAttrs);
-
-                    if (flatRowKey || flatColKey) {
-                        this.insights.set([flatRowKey, flatColKey].join(delim), insight);
-                    }
-                    continue;
-                }
-
-                const recordValues = _.values(record);
-                const containsAverage = _.includes(recordValues, 'DR_Average');
-                const containsOthers = _.includes(recordValues, 'DR_Others');
-
-                const rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, containsAverage, containsOthers,  (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, key, []);
-                    };
-                })(this));
-
-                const colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, containsAverage, containsOthers, (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, [], key);
-                    };
-                })(this));
-
-                const flatRowKey = rowKey.join(delim);
-                const flatColKey = colKey.join(delim);
-
-                if (flatRowKey || flatColKey) {
-                    this.insights.set([flatRowKey, flatColKey].join(delim), insight);
-                }
-            }
-        }
-
         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;
@@ -277,9 +226,6 @@ let initDRPivotTable = function($, window, document) {
                     this.tree[flatRowKey][flatColKey].push(record);
                 }
 
-                if (insight && (flatRowKey || flatColKey)) {
-                    this.insights.set([flatRowKey, flatColKey].join(delim), insight);
-                }
                 return;
             }
 
@@ -303,15 +249,6 @@ let initDRPivotTable = function($, window, document) {
                 };
             })(this));
 
-            if (insight) {
-                const flatRowKeyForInsight = rowKey.join(delim);
-                const flatColKeyForInsight = colKey.join(delim);
-
-                if (flatRowKeyForInsight || flatColKeyForInsight) {
-                    this.insights.set([flatRowKeyForInsight, flatColKeyForInsight].join(delim), insight);
-                }
-            }
-
             m = rowKey.length - 1;
             n = colKey.length - 1;
             if (m < 0 || n < 0) {

package/src/graph-table-renderer.js

@@ -15,7 +15,6 @@
 
 /**
  * @typedef {Object} PivotModel
- * @property {(rows: Rows, useTotalsCalculation: boolean) => void} buildInsights
  */
 
 /**

package/src/highcharts_renderer.js

@@ -713,33 +713,6 @@ 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,
-        hideDelay: 300,
-        destroyWhenHiding: true,
-        formatter: function () {
-            const rowKey = pivotData.rowAttrs.length ? lodash.get(this.point, 'series.name') || "" : "";
-            const colKey = lodash.get(this.point, 'initialName') || lodash.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(lodash.merge(lodash.cloneDeep(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;
@@ -1262,7 +1235,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
                 trendSeries.dashStyle = 'shortdot';
                 trendSeries.type = 'line';
-                trendSeries.data = trendSeries.data.map((el, index) => a + b * (index + 1));
+                trendSeries.data = trendSeries.data.map(
+                    (data, index) => lodash.get(data, 'name')
+                        ? { name: data.name, initialName: data.initialName, y: a + b * (index + 1) }
+                        : a + b * (index + 1)
+                );
 
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
@@ -1451,7 +1428,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
                 trendSeries.dashStyle = 'shortdot';
                 trendSeries.type = 'line';
-                trendSeries.data = trendSeries.data.map((data, index) => ({name: data.name, y: a + b * (index + 1)}));
+                trendSeries.data = trendSeries.data.map(
+                    (data, index) => ({ name: data.name, initialName: data.initialName, y: a + b * (index + 1) })
+                );
 
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
@@ -2679,17 +2658,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            chartOptions.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
-            chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
-        }
-
-        chartOptions.tooltip = opts.insightsTooltipFunc
-            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
-            : {
-                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-                valueDecimals: 2,
-            };
+        chartOptions.tooltip = {
+            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+            valueDecimals: 2,
+        };
 
         chartOptions.xAxis = {
             categories: highchartsRenderer.getFormattedColKeys(pivotData, null),
@@ -2765,11 +2737,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            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,
@@ -2862,11 +2829,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            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,
@@ -3103,12 +3065,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
 
-        chartOptions.tooltip = opts.insightsTooltipFunc
-            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
-            : {
-                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-                valueDecimals: 2,
-            };
+        chartOptions.tooltip = {
+            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+            valueDecimals: 2,
+        };
 
         highchartsRenderer.handleGridLines(additionOptions, chartOptions);
 
@@ -3148,11 +3108,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            chartOptions.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
-            chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
-        }
-
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
         chartOptions.drilldown = highchartsRenderer.getDataLabelsStylesForDrillDown(additionOptions);
@@ -3236,12 +3191,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
-        chartOptions.tooltip = opts.insightsTooltipFunc
-            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
-            : {
-                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-                valueDecimals: 2,
-            };
+        chartOptions.tooltip = {
+            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+            valueDecimals: 2,
+        };
 
         if (additionOptions && additionOptions.chart) {
             chartOptions.colors = highchartsRenderer.getColorsWithOffset(additionOptions.chart.colors_offset);
@@ -3282,11 +3235,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            chartOptions.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
-            chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
-        }
-
         chartOptions.xAxis = {
             type: 'category',
             crosshair: true,
@@ -3423,12 +3371,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (additionOptions) {
             highchartsRenderer.setYAxisMinMax(chartOptions.yAxis, additionOptions.axisY);
         }
-        chartOptions.tooltip = opts.insightsTooltipFunc
-            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
-            : {
-                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
-                valueDecimals: 2,
-            };
+        chartOptions.tooltip = {
+            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts),
+            valueDecimals: 2,
+        };
 
         if (additionOptions && additionOptions.chart) {
             chartOptions.colors = highchartsRenderer.getColorsWithOffset(additionOptions.chart.colors_offset);
@@ -3474,11 +3420,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            chartOptions.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
-            chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
-        }
-
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
@@ -3537,11 +3478,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
         chartOptions.legend.reversed = true;
 
-        chartOptions.tooltip = opts.insightsTooltipFunc
-            ? highchartsRenderer.customFormatterTooltipInsights(pivotData, opts)
-            : {
-                formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts)
-            };
+        chartOptions.tooltip = {
+            formatter: highchartsRenderer.defaultFormatterToTooltip(pivotData, opts)
+        };
 
         if (additionOptions && additionOptions.chart) {
             chartOptions.colors = highchartsRenderer.getColorsWithOffset(additionOptions.chart.colors_offset);
@@ -3563,11 +3502,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            chartOptions.plotOptions.series.point.events.mouseOver = opts.trackUserInsightsTooltipFunc;
-            chartOptions.plotOptions.series.point.events.mouseOut = opts.trackUserInsightsTooltipFunc;
-        }
-
         chartOptions.xAxis = {
             categories: highchartsRenderer.getFormattedColKeys(pivotData, null),
             title: {
@@ -3679,11 +3613,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            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;
         chartOptions.legend.labelFormatter = function() {
@@ -3800,11 +3729,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         }
 
-        if (lodash.get(chartOptions, 'plotOptions.series.point.events')) {
-            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);
             chartOptions.legend.useHTML = true;
@@ -5530,7 +5454,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         options.chartOptions = lodash.merge(defaultOptions, options.chartOptions);
     };
 
-    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction, insightsTooltipFunction, trackUserInsightsTooltipFunction) {
+    highchartsRenderer.addPivotOptions = function (selectedTemplateWOData, widgetOptions, drilldownFunction, drillDownListFunction) {
         // Check if not rendered data, than it will render
 
         var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplateWOData.fields);
@@ -5540,8 +5464,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var valuesFields = [];
         var drilldownFunc = drilldownFunction;
         var drillDownListFunc = drillDownListFunction;
-        var insightsTooltipFunc = insightsTooltipFunction;
-        var trackUserInsightsTooltipFunc = trackUserInsightsTooltipFunction;
 
         // fill value fields
         lodash.forEach(widgetOptions.vals, function (valObj) {
@@ -5596,7 +5518,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, trackUserInsightsTooltipFunc);
+        widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc);
 
         if (highchartsRenderer.isSortingOnBackendEnabled) return;
         // TODO: remove this logic after BE sort is implemented
@@ -6125,7 +6047,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return toReturn;
     };
 
-    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc, insightsTooltipFunc, trackUserInsightsTooltipFunc) {
+    highchartsRenderer.getChartRendererFunction = function (newChartType, drilldownFunc, drillDownListFunc) {
         var fnToReturn = null;
 
         if (newChartType == highchartsRenderer.richTextSubType.type) {
@@ -6156,8 +6078,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     highchartsRenderer.modifyEventPointForDrilldown(e, pivotData);
                     drillDownListFunc(e);
                 };
-                opt.insightsTooltipFunc = insightsTooltipFunc;
-                opt.trackUserInsightsTooltipFunc = trackUserInsightsTooltipFunc;
             } else {
                 opt.drillDownListFunc = null;
             }

package/src/pivottable.js

@@ -688,7 +688,6 @@ let initPivotTable = function($, window, document) {
                 return true;
             });
             this.tree = {};
-            this.insights = new Map();
 
             this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object' && helpers.backendSortingKeysAreNotEmpty(opts.keysObject);
             if (this.isKeysSortingDoneOnBackendSide) {

package/tests/highcharts_renderer.test.js

@@ -6804,14 +6804,17 @@ describe('highcharts_renderer', () => {
                 {
                     data: [
                         {
+                            initialName: 'col 1',
                             name: 'col 1',
                             y: 11728
                         },
                         {
+                            initialName: 'col 2',
                             name: 'col 2',
                             y: 55555
                         },
                         {
+                            initialName: 'Others',
                             name: 'Others',
                             y: 99382
                         }
@@ -6837,14 +6840,17 @@ describe('highcharts_renderer', () => {
                 {
                     data: [
                         {
+                            initialName: 'col 1',
                             name: 'col 1',
                             y: 89913.5
                         },
                         {
+                            initialName: 'col 2',
                             name: 'col 2',
                             y: 78184
                         },
                         {
+                            initialName: 'Others',
                             name: 'Others',
                             y: 66454.5
                         }
@@ -7320,9 +7326,21 @@ describe('highcharts_renderer', () => {
                 },
                 {
                     data: [
-                        11728,
-                        55555,
-                        99382
+                        {
+                            initialName: 'col 1',
+                            name: 'col 1',
+                            y: 11728
+                        },
+                        {
+                            initialName: 'col 2',
+                            name: 'col 2',
+                            y: 55555
+                        },
+                        {
+                            initialName: 'Others',
+                            name: 'Others',
+                            y: 99382
+                        }
                     ],
                     initialName: 'row 1',
                     name: 'Trend Line (row 1)',
@@ -7333,9 +7351,21 @@ describe('highcharts_renderer', () => {
                 },
                 {
                     data: [
-                        89913.5,
-                        78184,
-                        66454.5
+                        {
+                            initialName: 'col 1',
+                            name: 'col 1',
+                            y: 89913.5
+                        },
+                        {
+                            initialName: 'col 2',
+                            name: 'col 2',
+                            y: 78184
+                        },
+                        {
+                            initialName: 'Others',
+                            name: 'Others',
+                            y: 66454.5
+                        }
                     ],
                     initialName: 'row 2',
                     name: 'Trend Line (row 2)',

package/tests/mock/widgets.json

@@ -345,7 +345,6 @@
           "variance_color": "#3DC5AA"
         }
       },
-      "insightsTooltipFunc": null,
       "chart_series": [
         "Actuals"
       ],

package/types/graph-table-renderer.d.ts

@@ -12,7 +12,6 @@
  */
 /**
  * @typedef {Object} PivotModel
- * @property {(rows: Rows, useTotalsCalculation: boolean) => void} buildInsights
  */
 /**
  * @typedef {Object} GTROptions
@@ -57,9 +56,7 @@ export type PivotUtilities = {
 export type JQuery = {
     pivotUtilities: PivotUtilities;
 };
-export type PivotModel = {
-    buildInsights: (rows: Rows, useTotalsCalculation: boolean) => void;
-};
+export type PivotModel = Object;
 export type GTROptions = Object;
 /**
  * - BE data response