@datarailsshared/dr_renderer 1.2.161-dragons → 1.2.162

package/package.json

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

package/src/highcharts_renderer.js

@@ -7801,7 +7801,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         datesFields = lodash.map(datesFields, function (row) {
-            return {"format": highchartsRenderer.getDateFieldFormat(widget, row), "name": row.name, "type": row.type, "values": [], "sorting": row.sorting} //'MMM - yyyy' format
+            return { "format": highchartsRenderer.getDateFieldFormat(widget, row), "name": row.name, "type": row.type, "values": [], "sorting": row.sorting } //'MMM - yyyy' format
         });
 
         var data = res;
@@ -8222,16 +8222,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.getDateFieldFormat = function(widget, dateField) {
         const aggregationConfig = widget.options && widget.options.date_aggregation_configs 
-            ? _.find(widget.options.date_aggregation_configs, {field_id: dateField.id})
+            ? _.find(widget.options.date_aggregation_configs, { field_id: dateField.id })
             : null;
 
-        if (aggregationConfig) {
-            const aggregationTimeframe = aggregationConfig ? aggregationConfig.aggregate_by : null;
-            const isFormattingByAggregation = aggregationConfig ? aggregationConfig.is_formatting_by_aggregation_method : false;
-
-            if (aggregationTimeframe && isFormattingByAggregation) {
-                return highchartsRenderer.getDateFormatByTimeframe(aggregationTimeframe, dateField.format);
-            }
+        if (aggregationConfig && aggregationConfig.aggregate_by && aggregationConfig.is_formatting_by_aggregation_method) {
+            return highchartsRenderer.getDateFormatByTimeframe(aggregationConfig.aggregate_by, dateField.format);
         }
         return dateField.format;
     }