@datarailsshared/dr_renderer 1.2.241 → 1.2.243

package/package.json

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

package/src/highcharts_renderer.js

@@ -1438,7 +1438,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             let keys = [];
             if (value.trend === 'total') {
-                keys = ['Total'];
+                keys = value.key;
             } else {
                 _.forEach(value.key, (item) => {
                     const findKeyByValue = Object.keys(pivotData.dateValuesDictionary || {}).find(key => pivotData.dateValuesDictionary[key] === item);
@@ -5217,6 +5217,38 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         widgetOptions.pivot.chartOptions = widgetOptions.options;
         widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc);
 
+        // 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
+        const isTwoColumnComparisonWidget = widgetOptions.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN 
+            && lodash.get(widgetOptions, 'options.breakdown_options.values.totals', []).length === 2;
+
+        if (isTwoColumnComparisonWidget) {
+            const totalsField = xaxisFields[0];
+            const isScenarioInTotals = /scenario/i.test(totalsField.name);
+
+            if (isScenarioInTotals) {
+                const breakdownField = legendFields[0];
+                const valuesField = valuesFields[0];
+
+                // getting first total value encounter from response rows - it's value to which delta is attached
+                const firstTotalValueInResponse = lodash.get(widgetOptions, `pivot.rowData[0].${totalsField.name}`);
+
+                // getting first total value from breakdown options (after sort is done)
+                const firstTotalValueAfterSort = lodash.get(widgetOptions, 'options.breakdown_options.values.totals[0].key');
+
+                // if two columns changed places (swaped)
+                // then we need to replace keys in response rows and multiply delta to -1
+                if (firstTotalValueInResponse && firstTotalValueAfterSort && firstTotalValueInResponse !== firstTotalValueAfterSort) {
+                    lodash.forEach(widgetOptions.pivot.rowData, row => {
+                        const isDeltaRow = row[totalsField.name] && row[breakdownField.name];
+                        if (isDeltaRow) {
+                            row[totalsField.name] = firstTotalValueAfterSort;
+                            row[valuesField.name] *= -1;
+                        }
+                    });
+                }
+            }
+        }
     };
 
     highchartsRenderer.addTemplateDataToExTableOptions = function (selectedTemplate, exTableOptions) {
@@ -8827,6 +8859,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         res = highchartsRenderer.setNewFieldNames(res);
 
+        if (widget_obj.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
+            res = highchartsRenderer.addTotalsToWalkthroughRowData(widget_obj, res);
+        }
+
         let pivot = {};
         pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
         pivot.rowData = res;
@@ -9113,6 +9149,39 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return series.name ? 'Trend Line (' + series.name + ')' : 'Trend Line';
     }
 
+    highchartsRenderer.addTotalsToWalkthroughRowData = function(widget, rowDataInitial) {
+        const walkthroughValues = widget.options.walkthrough_options.values.walkthrough;
+        const categoryFields = widget.cols;
+        const valueField = widget.vals[0];
+        const rowData = lodash.cloneDeep(rowDataInitial);
+        const modifiedRowData = [];
+
+        let sum = 0;
+        lodash.forEach(walkthroughValues, (value) => {
+
+            // if it is not total value - then add it as rowData data row and sum it up
+            // else - add total with calculated sum as new rowData data row (totals do not initially exist in BE response)
+            if (value.trend !== 'total') {
+                const rowIndex = lodash.findIndex(rowData, (responseRow) =>
+                    lodash.every(categoryFields, (field, fieldKey) => responseRow[field.name] === value.key[fieldKey])
+                );
+                modifiedRowData.push(rowData[rowIndex]);
+                sum += rowData[rowIndex][valueField.name];
+                rowData.splice(rowIndex, 1);
+            } else {
+                const totalRow = {};
+                _.forEach(categoryFields, (field, fieldKey) => {
+                    totalRow[field.name] = value.key[fieldKey];
+                });
+                totalRow[valueField.name] = sum;
+                modifiedRowData.push(totalRow);
+                sum = 0;
+            }
+        });
+
+        return lodash.concat(modifiedRowData, rowData);
+    }
+
     return highchartsRenderer;
 };