@datarailsshared/dr_renderer 1.2.252 → 1.2.253

package/package.json

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

package/src/highcharts_renderer.js

@@ -1455,7 +1455,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 keys = value.key;
             } else {
                 _.forEach(value.key, (item) => {
-                    const findKeyByValue = Object.keys(pivotData.dateValuesDictionary || {}).find(key => pivotData.dateValuesDictionary[key] === item);
+                    const findKeyByValue = lodash.find(
+                        Object.keys(pivotData.dateValuesDictionary || {}),
+                        key => pivotData.dateValuesDictionary[key] === item
+                    );
                     keys.push(findKeyByValue ? findKeyByValue : item);
                  })
             }
@@ -1493,7 +1496,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             resultObject.data.push({
                 y: val,
-                name: lodash.unescape(name).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                name: lodash.replace(lodash.unescape(name), 'DR_Others', highchartsRenderer.getOthersName(opts)),
                 totalIndex: value.trend === 'total' ? index : undefined,
                 isSum: value.trend === 'total',
                 isTotal: value.trend === 'total',
@@ -8915,12 +8918,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let pivot = {};
+
+        let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
+        if (templateNoData) {
+
+            // 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
+            widget_obj.pivot = pivot;
+        }
+
         pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
         pivot.rowData = res;
         widget_obj.options = highchartsRenderer.parseOptionsToObject(widget_obj.options);
-        let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
+        
         if (templateNoData) {
-            widget_obj.pivot = pivot;
             let hasServerDrill = widget_obj.chart_type.indexOf("column-chart") > -1 && widget_obj.cols && widget_obj.cols.length >= 1;
             if (hasServerDrill)
                 highchartsRenderer.addPivotOptions(templateNoData, widget_obj, drillDownFunction, openDrillDownListFunction);