@datarailsshared/dr_renderer 1.2.150 → 1.2.152-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -7780,6 +7780,11 @@ 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) {
+            this.formatDatesWithAggregationIfRequired(aggregationConfigs, datesFields, defaultDateFormat);
+        }
+
         const isCustomSorting = widget.options.sortingFields && Array.isArray(widget.options.sortingFields) && widget.options.sortingFields.length > 0;
         if (isCustomSorting) {
             lodash.forEach(datesFields, function (field) {
@@ -8208,6 +8213,37 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         yAxis.max = !isNaN(maxNumber) ? maxNumber : null;
     }
 
+    highchartsRenderer.formatDatesWithAggregationIfRequired = function(aggregationConfigs, datesFields, defaultDateFormat) {
+        _.forEach(aggregationConfigs, aggregationConfig => {
+            const aggregationTimeframe = aggregationConfig?.aggregate_by;
+            const isFormattingByAggregation = aggregationConfig?.is_formatting_by_aggregation_method;
+
+            if (aggregationTimeframe && isFormattingByAggregation) {
+                const dateField = lodash.find(
+                    datesFields,
+                    (element) => element.id === aggregationConfig.field_id
+                );
+                if (dateField) {
+                    dateField.format = highchartsRenderer.getDateFormatByAggregation(aggregationTimeframe, defaultDateFormat);
+                }
+            }
+        });
+    }
+
+    highchartsRenderer.getDateFormatByAggregation = function(timeframe, defaultDateFormat) {
+        switch (timeframe) {
+            case 'month':
+                return 'MMM-YY';
+            case 'year':
+                return 'YYYY';
+            case 'quarter':
+                return '[Q]Q-YY';
+            case 'day':
+            default:
+                return defaultDateFormat;
+        }
+    }
+
     return highchartsRenderer;
 };