@datarailsshared/dr_renderer 1.2.248-dragons → 1.2.249

package/package.json

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

package/src/highcharts_renderer.js

@@ -1042,7 +1042,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (row_n_value && row_n_value.length > 0) {
                 ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
             }
-
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
@@ -1259,7 +1258,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (opts.trendLine) {
                 const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
                 const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
-
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
@@ -1270,7 +1268,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
                 }
-
                 trendSerieses.push(trendSeries);
             }
             i++;
@@ -1287,7 +1284,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
-
         if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
@@ -1433,8 +1429,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions, total_value_options: opts.total_value_options}),
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions),
             },
-            upColor: lodash.get(waterfallOptions, 'colors.increase'),
-            color: lodash.get(waterfallOptions, 'colors.decrease'),
+            upColor: waterfallOptions.colors.increase,
+            color: waterfallOptions.colors.decrease,
             className: SERIES_CLASSNAMES.WATERFALL_WALKTHROUGH
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
@@ -1461,7 +1457,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 val = 0;
             }
 
-            if (val > 0 && value.trend === 'decrease' || val < 0 && value.trend === 'increase' ) {
+            if (value.trend === 'decrease') {
                 val = val * -1;
             }
 
@@ -1470,7 +1466,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (value.color) {
                 color = value.color;
             } else {
-                color = lodash.get(waterfallOptions, 'colors', {})[value.trend];
+                if (value.trend === 'total') color = waterfallOptions.colors.total;
+                if (value.trend === 'decrease') color = waterfallOptions.colors.decrease;
+                if (value.trend === 'increase') color = waterfallOptions.colors.increase;
             }
 
             resultObject.data.push({
@@ -1487,14 +1485,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             {
                 name: 'Positive',
                 visible: false,
-                color: lodash.get(waterfallOptions, 'colors.increase')
+                color: waterfallOptions.colors.increase
             });
 
         chart_series.push(
             {
                 name: 'Negative',
                 visible: false,
-                color: lodash.get(waterfallOptions, 'colors.decrease'),
+                color: waterfallOptions.colors.decrease
             });
 
         return chart_series;
@@ -5221,7 +5219,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         // 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
+        const isTwoColumnComparisonWidget = widgetOptions.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN 
             && lodash.get(widgetOptions, 'options.breakdown_options.values.totals', []).length === 2;
 
         if (isTwoColumnComparisonWidget) {