@datarailsshared/dr_renderer 1.2.349 → 1.2.351

package/package.json

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

package/src/highcharts_renderer.js

@@ -8878,13 +8878,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             // if it is breakdown widget - redefine sorting according to breakdown_options
             // TODO: remove this when BE sort will be implemented
+            const isTwoColumnComparisonWidget = lodash.get(widget, 'options.breakdown_options.values.totals', []).length === 2;
             lodash.forEach(rowsAndCols, function (field) {
-                const isBreakdownField = field.id !== widget.cols[0].id;
-                if (isBreakdownField) {
+                const waterfallFieldType = field.id === widget.cols[0].id ? 'totals' : 'breakdown';
+                if (waterfallFieldType !== 'totals' || isTwoColumnComparisonWidget) {
                     field.sorting = {
                         type: 'CustomOrder',
                         values: lodash.map(
-                            widget.options.breakdown_options.values.breakdown,
+                            widget.options.breakdown_options.values[waterfallFieldType],
                             value => value.key
                         ),
                     };
@@ -8992,6 +8993,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
         if (templateNoData) {
 
+            lodash.forEach(templateNoData.fields, field => {
+                field.name = highchartsRenderer.decodeFunc(field.name);
+            });
+
             // we need to assign this before calling getWidgetDataSorters method
             // other way we won't get dateValuesDictionary
             // preserved condition templateNoData == true - not to interfere with further logic