@datarailsshared/dr_renderer 1.2.239 → 1.2.240

package/package.json

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

package/src/highcharts_renderer.js

@@ -3358,7 +3358,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.ptRenderWaterfallWalkthrough = function (pivotData, opts) {
         let chartOptions = {};
-        const waterfallOptions = opts?.walkthrough_options;
+        const waterfallOptions = lodash.get(opts, 'walkthrough_options');
         const additionOptions = opts.chartOptions
             ? opts.chartOptions
             : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH);
@@ -3454,7 +3454,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chartOptions.legend.labelFormatter = function() {
                 const name = this.options.className ? 'Total': this.name;
                 const findTotal = _.find(this.options.data, {isTotal: true});
-                const color = findTotal?.color ? findTotal.color : this.color;
+                const color = lodash.get(findTotal, 'color') ? findTotal.color : this.color;
                 return '<span style="margin: 5px; vertical-align: middle; display:inline-block; background-color: '+ color + '; width: 12px; height: 12px; border-radius: 50%"></span><span style="color: #000; display: inline-block; margin: 5px; vertical-align: middle;">' + name + '</span>';
             }
 
@@ -8676,6 +8676,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             lodash.forEach(rowsAndCols, function (field) {
                 const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
+
+                // if it is breakdown widget - redefine sorting according to breakdown_options
+                // TODO: remove this when BE sort will be implemented
+                if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN) {
+                    const waterfallFieldType = field.id === widget.cols[0].id ? 'totals' : 'breakdown';
+                    field.sorting = {
+                        type: "CustomOrder",
+                        values: lodash.map(
+                            widget.options.breakdown_options.values[waterfallFieldType],
+                            value => value.key
+                        ),
+                    };
+                }
             });
         }