@datarailsshared/dr_renderer 1.2.134-tigers → 1.2.136-tigers

package/package.json

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

package/src/highcharts_renderer.js

@@ -7235,11 +7235,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (fieldFilter.datetypevalues.datetype === "frame") {
                     displayname += ` (${fieldFilter.datetypevalues.val.timeframe})`;
                 } else if (fieldFilter.datetypevalues.datetype === "range") {
-                    const fromDate = new Date(fieldFilter.datetypevalues.val.fromdate * 1000);
-                    const dateWithTimezone = new Date(fieldFilter.datetypevalues.val.todate * 1000);
-                    const toDate = new Date(dateWithTimezone - Math.abs(dateWithTimezone.getTimezoneOffset()) * 1000 * 60);
-                    const today = fieldFilter.datetypevalues.val.todate === '' ? 'Today' : null;
-                    displayname += ` (${fromDate.toLocaleDateString("short")}-${today || toDate.toLocaleDateString("short")})`;
+                    const dates = {
+                        from: { timestamp: fieldFilter.datetypevalues.val.fromdate, displayedValue: '' },
+                        to: { timestamp: fieldFilter.datetypevalues.val.todate, displayedValue: 'Today' }
+                    };
+
+                    // range timestamps currently are set presupposing that user selects UTC dates,
+                    // that is why for consistency we also should show in filters values which user selected
+                    // and not local dates, that can differ
+                    _.forEach(Object.keys(dates), key => {
+                        const dateConfiguration = dates[key];
+                        const timestamp = dateConfiguration.timestamp;
+                        if (timestamp) {               
+                            const dateTzOffsetInSeconds = new Date(timestamp * 1000).getTimezoneOffset() * 60;
+                            dateConfiguration.displayedValue = new Date((timestamp + dateTzOffsetInSeconds) * 1000)
+                                .toLocaleDateString("short");
+                        }
+                    });
+                    displayname += ` (${dates.from.displayedValue}-${dates.to.displayedValue})`;
                 } else {
                     displayname += ' (All)';
                 }