@datarailsshared/dr_renderer 1.2.408 → 1.2.410

package/package.json

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

package/src/highcharts_renderer.js

@@ -5165,10 +5165,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 else if (format == 'week')
                     return highchartsRenderer.returnRawDataWeekValue(tryParse);
 
-                format = format.replace('dd', 'DD');
-                format = format.replace('yyyy', 'YYYY');
-                format = format.replace('yy', 'YY');
-                format = lodash.replace(format, /h/g, 'H');
+                format = highchartsRenderer.adjustFormatToSupportedByMoment(format);
 
                 const timeframe = highchartsRenderer.getTimeframeByFormat(format);
                 const fiscalYearMonthsModifier = highchartsRenderer.getFiscalYearMonthModifier();
@@ -8543,8 +8540,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const fiscalYearMonthsModifier = highchartsRenderer.getFiscalYearMonthModifier();
 
         if (format) {
-            format = format.replace(/y/g, 'Y');
-            format = format.replace(/d/g, 'D');
+            format = highchartsRenderer.adjustFormatToSupportedByMoment(format);
         } else if (colName === 'VT_Month') {
             format = 'MMM YYYY';
         }
@@ -9429,7 +9425,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (aggregationConfig && aggregationConfig.aggregate_by && aggregationConfig.is_formatting_by_aggregation_method) {
             return highchartsRenderer.getDateFormatByTimeframe(aggregationConfig.aggregate_by, dateField.format);
         }
-        return dateField.format;
+        return highchartsRenderer.adjustFormatToSupportedByMoment(dateField.format);
     }
 
     highchartsRenderer.getDateFormatByTimeframe = function(timeframe, defaultDateFormat) {
@@ -9808,6 +9804,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         disableAnimation = disabled;
     };
 
+    highchartsRenderer.adjustFormatToSupportedByMoment = function(format) {
+        return typeof format === 'string'
+            ? format.replace(/y/g, 'Y').replace(/d/g, 'D').replace(/h/g, 'H')
+            : format;
+    }
+
     return highchartsRenderer;
 };
 

package/tests/highcharts_renderer.test.js

@@ -4551,14 +4551,14 @@ describe('highcharts_renderer', () => {
 
             dateField = {
                 id: 1,
-                format: '%Y-%m-%d',
+                format: '%y-%m-%d',
             };
         });
 
-        it('returns format as is when there is no aggregation config', () => {
+        it('returns field format adjusted to moment when there is no aggregation config', () => {
             widget.options.date_aggregation_configs = [];
             const result = highchartsRenderer.getDateFieldFormat(widget, dateField);
-            expect(result).toEqual('%Y-%m-%d');
+            expect(result).toEqual('%Y-%m-%D');
         });
 
         it('returns format by time frame when there is an aggregation config', () => {
@@ -4566,10 +4566,10 @@ describe('highcharts_renderer', () => {
             expect(result).toEqual('[Q]Q-YY');
         });
 
-        it('returns format as is when there is an aggregation config but no time frame specified', () => {
+        it('returns field format adjusted to moment when there is an aggregation config but no time frame specified', () => {
             widget.options.date_aggregation_configs[0].aggregate_by = null;
             const result = highchartsRenderer.getDateFieldFormat(widget, dateField);
-            expect(result).toEqual('%Y-%m-%d');
+            expect(result).toEqual('%Y-%m-%D');
         });
     });