@datarailsshared/dr_renderer 1.2.238-dragons → 1.2.240

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.238-dragons",
+  "version": "1.2.240",
   "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});
@@ -3362,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);
@@ -3458,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>';
             }
 
@@ -5382,7 +5378,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 fields: [],
             },
             dataType: {
-                regex: /data[_\s]type[_\s]by/i,
+                regex: /^(data[_\s]type[_\s]by|data[_\s]type)$/i,
                 allowedFieldTypes: ['Text'],
                 fields: [],
             },
@@ -8680,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
+                        ),
+                    };
+                }
             });
         }