@datarailsshared/dr_renderer 1.2.232-dragons → 1.2.233-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -653,9 +653,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (variant_name && rows && rows[0] && variant_name == rows[0]) {
                     rows[0] = variant_name_default_name;
                 }
-                if (isWaterfallWalkthrough) {
-                    cols = [this.key]
-                }
                 try {
                     if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name,"Series ")) {
                         let temp = cols;
@@ -664,7 +661,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
 
                     var category_text = `<span style="font-weight: bold;">
-                        ${ lodash.get(this, 'point.options.colsForTotal') ? cols[0] : cols } ${ isWaterfallBreakdown ? ': ' : ' ' }
+                        ${ lodash.get(this, 'point.options.colsForTotal') ? isWaterfallWalkthrough ? this.key : cols[0] : cols } ${ isWaterfallBreakdown ? ': ' : ' ' }
                     </span>`;
                     if (this.category) {
                         category_text = '';
@@ -689,7 +686,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     let formatted_value_to_return = $.pivotUtilities.getFormattedNumber(y, null, opts);
                     if (aggr.value() || isWaterfallBreakdown) {
                         formatted_value_to_return = $.pivotUtilities.getFormattedNumber(
-                            isWaterfallBreakdown || isTrendSeries ? y : aggr.value(), aggr, opts
+                            isWaterfallBreakdown || isWaterfallWalkthrough || isTrendSeries ? y : aggr.value(), aggr, opts
                         );
                     }
 
@@ -4569,26 +4566,31 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             return null;
         }
 
-        const isWaterfall = widget
-            && (
-                widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN
-                || widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH
-            );
+        const isWalktrough = lodash.get(widget, 'chart_type') === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH;
+        const isBreakdown = lodash.get(widget, 'chart_type')=== highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN;
+        const isWaterfall = isWalktrough || isBreakdown;
 
         if (isWaterfall) {
             const maxCategories = highchartsRenderer.waterfallConstants[widget.chart_type].maxCategoriesCount;
             const minCategories = highchartsRenderer.waterfallConstants[widget.chart_type].minCategoriesCount;
-            const uniqueCategories = lodash.filter(
-                lodash.uniq(
-                    lodash.map(rowData, row => row[widget.cols[0].name])
-                ),
-                value => !!value
-            );
+            let uniqueCategories = [];
+
+            if (isBreakdown) {
+                uniqueCategories = lodash.filter(
+                    lodash.uniq(
+                        lodash.map(rowData, row => row[widget.cols[0].name])
+                    ),
+                    value => !!value
+                );
+            } else {
+                uniqueCategories = lodash.filter(
+                    lodash.get(widget, 'options.walkthrough_options.values.walkthrough'),
+                    (category) => category.trend !== 'total'
+                );
+            }
 
             if (uniqueCategories && (uniqueCategories.length > maxCategories || uniqueCategories.length < minCategories )) {
                 options.error_has_occurred = true;
-                const isDateField = widget.cols[0].type === 'Date';
-                const commonMessagePart = `This chart support a selection of ${minCategories}-${maxCategories} items from the category section. `;
                 options.error_params = {
                     title: 'Data Conflict',
                     text: `Please adjust your dashboard's reference date and filter selections as \