@datarailsshared/dr_renderer 1.2.153-dragons → 1.2.155-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -425,7 +425,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const othersName = opts.total_value_options ?
             lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others' :
             undefined;
-        var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && (keys.includes('DR_Others') || keys.includes(othersName)));
+        var drOthersInColumn = lodash.find(
+            pivotData.getColKeys(), 
+            keys => keys.length && (lodash.includes(keys, 'DR_Others') || lodash.includes(keys, othersName))
+        );
 
         var func = function () {
             var value = parseFloat(this.y);
@@ -7780,8 +7783,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         datesFields = lodash.filter(widget.rows, element => element.type == 'Date');
         datesFields = datesFields.concat(lodash.filter(widget.cols, element => element.type == 'Date'));
 
-        const aggregationConfigs = widget.options?.date_aggregation_configs;
-        if (aggregationConfigs?.length && datesFields?.length) {
+        const aggregationConfigs = widget.options ? widget.options.date_aggregation_configs || [] : [];
+        if (aggregationConfigs.length && datesFields && datesFields.length) {
             highchartsRenderer.formatDatesWithAggregationIfRequired(aggregationConfigs, datesFields, defaultDateFormat);
         }
 
@@ -8215,8 +8218,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.formatDatesWithAggregationIfRequired = function(aggregationConfigs, datesFields, defaultDateFormat) {
         _.forEach(aggregationConfigs, aggregationConfig => {
-            const aggregationTimeframe = aggregationConfig?.aggregate_by;
-            const isFormattingByAggregation = aggregationConfig?.is_formatting_by_aggregation_method;
+            const aggregationTimeframe = aggregationConfig ? aggregationConfig.aggregate_by : null;
+            const isFormattingByAggregation = aggregationConfig ? aggregationConfig.is_formatting_by_aggregation_method : false;
 
             if (aggregationTimeframe && isFormattingByAggregation) {
                 const dateField = lodash.find(