@sis-cc/dotstatsuite-components 17.10.0 → 17.11.0

package/lib/rules/src/chart/getAxisOptions.js

@@ -85,7 +85,7 @@ var getTimeProc = exports.getTimeProc = function getTimeProc(frequency) {
   }
   var format = R.pipe(R.mergeRight(defaultTimeFormats), R.ifElse(R.has(frequency), R.prop(frequency), R.prop('A')))(timeFormats);
   return function (datum) {
-    return _dateFns2.default.format(datum, format, { locale: (0, _date.getLocale)(locale) });
+    return _dateFns2.default.format((0, _date.dateWithoutTZ)(new Date(datum)), format, { locale: (0, _date.getLocale)(locale) });
   };
 };
 

package/lib/rules/src/chart/getTooltipOptions.js

@@ -58,7 +58,7 @@ var getTooltipOptions = exports.getTooltipOptions = function getTooltipOptions(d
     }
   })], [R.always(R.equals(_constants.TIMELINE, type)), R.mergeRight({
     layout: function layout(serie, datum, color) {
-      return '\n            <div style="' + primaryFonts(color) + '">\n              <div style="text-align: right;">\n                ' + R.pipe(R.propOr({}, 'dimensionValues'), R.values, R.pluck('name'), R.join('<br />'))(datum) + '\n              </div>\n              <div style="text-align: right;">\n                ' + timeFormatter(datum.x) + '\n              </div>\n              <div style="text-align: right; ' + secondaryFonts + '">\n                ' + (datum.formatedValue || valueFormatter(datum.y)) + '\n              </div>\n            </div>\n          ';
+      return '\n            <div style="' + primaryFonts(color) + '">\n              <div style="text-align: right;">\n                ' + R.pipe(R.propOr({}, 'dimensionValues'), R.values, R.pluck('name'), R.join('<br />'))(datum) + '\n              </div>\n              <div style="text-align: right;">\n                ' + datum.timeLabel + '\n              </div>\n              <div style="text-align: right; ' + secondaryFonts + '">\n                ' + (datum.formatedValue || valueFormatter(datum.y)) + '\n              </div>\n            </div>\n          ';
     }
   })], [R.always(R.equals(_constants.H_SYMBOL, type)), R.mergeRight({
     layout: function layout(serie, datum, color) {

package/lib/rules/src/factories/timeline-series.js

@@ -80,6 +80,7 @@ var series = function series(observations, dimensions, dimensionsWithValuesIndex
     var datapoint = {
       x: timePeriod.start,
       y: (0, _head3.default)(o),
+      timeLabel: timePeriod.name,
       formatedValue: (0, _observationFormater.getFormatedObservation)(o, formaterAttrs),
       dimensionValues: getDimensionValues(oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, timePeriodDimension.id, display)
       //index: Number(timePeriodDimensionValueIndex)

package/lib/rules2/src/refineTimePeriod.js

@@ -67,11 +67,6 @@ var getFormat = function getFormat(freqDisplay) {
 var getEndDate = function getEndDate(start, mult, duration) {
   var adder = getAdder(duration);
   var endDate = adder(start, Number(mult));
-  var startTZ = start.getTimezoneOffset();
-  var endTZ = endDate.getTimezoneOffset();
-  if (startTZ !== endTZ) {
-    endDate = dateFns.addMinutes(endDate, Math.abs(endTZ) - Math.abs(startTZ));
-  }
   return dateFns.subSeconds(endDate, 1);
 };
 
@@ -106,9 +101,12 @@ var computeName = function computeName(start, end, freqDisplay, locale, format)
 
 var getStartDate = exports.getStartDate = function getStartDate(start) {
   if (!R.includes('T', start) && !R.endsWith('Z', start)) {
-    return new Date(start);
+    return (0, _date.dateWithoutTZ)(new Date(start));
   }
-  var date = new Date(start);
+  return new Date(start);
+};
+
+var dateWithTZ = function dateWithTZ(date) {
   return dateFns.addMinutes(date, -date.getTimezoneOffset());
 };
 
@@ -122,7 +120,7 @@ var refineTimePeriod = exports.refineTimePeriod = function refineTimePeriod(time
   if (R.length(split) !== 2) {
     var _start = getStartDate(R.prop('start', timePeriod));
     var end = getStartDate(R.prop('end', timePeriod));
-    return (0, _extends3.default)({}, timePeriod, { start: _start.toISOString(), end: end.toISOString() });
+    return (0, _extends3.default)({}, timePeriod, { start: dateWithTZ(_start).toISOString(), end: dateWithTZ(end).toISOString() });
   }
 
   var _split = (0, _slicedToArray3.default)(split, 2),
@@ -145,11 +143,12 @@ var refineTimePeriod = exports.refineTimePeriod = function refineTimePeriod(time
   var endDate = getEndDate(startDate, mult, duration);
   var freqDisplay = computeDisplayFreq(start, duration);
   var format = freqDisplay === 'M' ? monthlyFormat : getFormat(freqDisplay);
-  var name = computeName((0, _date.dateWithoutTZ)(startDate), (0, _date.dateWithoutTZ)(endDate), freqDisplay, locale, format);
+  var name = computeName(startDate, endDate, freqDisplay, locale, format);
+
   return (0, _extends3.default)({}, timePeriod, {
     id: id,
     name: name,
-    start: startDate.toISOString(),
-    end: endDate.toISOString()
+    start: dateWithTZ(startDate).toISOString(),
+    end: dateWithTZ(endDate).toISOString()
   });
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "17.10.0",
+  "version": "17.11.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

package/src/rules/src/chart/getAxisOptions.js

@@ -9,7 +9,7 @@ import isFriday from 'date-fns/is_friday';
 import isSaturday from 'date-fns/is_saturday';
 import isSunday from 'date-fns/is_sunday';
 import getISOWeek from 'date-fns/get_iso_week';
-import { getLocale } from '../date';
+import { getLocale, dateWithoutTZ } from '../date';
 import {
   BAR,
   CHORO,
@@ -53,7 +53,7 @@ export const getTimeProc = (frequency, timeFormats = {}, locale) => {
       R.prop('A')
     )
   )(timeFormats);
-  return datum => dateFns.format(datum, format, { locale: getLocale(locale) });
+  return datum => dateFns.format(dateWithoutTZ(new Date(datum)), format, { locale: getLocale(locale) });
 };
 
 const getTimeFrequency = (data) => {

package/src/rules/src/chart/getTooltipOptions.js

@@ -109,7 +109,7 @@ export const getTooltipOptions =  (data, type, options, fonts={}, timeFormats={}
                 ${R.pipe(R.propOr({}, 'dimensionValues'), R.values, R.pluck('name'), R.join('<br />'))(datum)}
               </div>
               <div style="text-align: right;">
-                ${timeFormatter(datum.x)}
+                ${datum.timeLabel}
               </div>
               <div style="text-align: right; ${secondaryFonts}">
                 ${datum.formatedValue || valueFormatter(datum.y)}

package/src/rules/src/factories/timeline-series.js

@@ -39,6 +39,7 @@ const series = (
       const datapoint = {
         x: timePeriod.start,
         y: head(o),
+        timeLabel: timePeriod.name,
         formatedValue: getFormatedObservation(o, formaterAttrs),
         dimensionValues: getDimensionValues(
           oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, timePeriodDimension.id, display

package/src/rules2/src/refineTimePeriod.js

@@ -52,12 +52,7 @@ const getFormat = (freqDisplay) => {
 
 const getEndDate = (start, mult, duration) => {
   const adder = getAdder(duration);
-  let endDate = adder(start, Number(mult));
-  const startTZ = start.getTimezoneOffset();
-  const endTZ = endDate.getTimezoneOffset();
-  if (startTZ !== endTZ) {
-    endDate = dateFns.addMinutes(endDate, (Math.abs(endTZ) - Math.abs(startTZ)));
-  }
+  const endDate = adder(start, Number(mult));
   return dateFns.subSeconds(endDate, 1);
 };
 
@@ -94,19 +89,20 @@ const computeName = (start, end, freqDisplay, locale, format) => {
 
 export const getStartDate = (start) => {
   if (!R.includes('T', start) && !R.endsWith('Z', start)) {
-    return new Date(start);
+    return dateWithoutTZ(new Date(start));
   }
-  const date = new Date(start);
-  return dateFns.addMinutes(date, -date.getTimezoneOffset());
+  return new Date(start);
 };
 
+const dateWithTZ = date => dateFns.addMinutes(date, -date.getTimezoneOffset());
+
 export const refineTimePeriod = (timePeriod, { locale, monthlyFormat='YYYY-MMM' }) => {
   const { id } = timePeriod;
   const split = R.split('/', id);
   if (R.length(split) !== 2) {
     const start = getStartDate(R.prop('start', timePeriod));
     const end = getStartDate(R.prop('end', timePeriod))
-    return ({ ...timePeriod, start: start.toISOString(), end: end.toISOString() });
+    return ({ ...timePeriod, start: dateWithTZ(start).toISOString(), end: dateWithTZ(end).toISOString() });
   }
   const [start, range] = split;
   const startDate = getStartDate(start);
@@ -119,12 +115,13 @@ export const refineTimePeriod = (timePeriod, { locale, monthlyFormat='YYYY-MMM'
   const endDate = getEndDate(startDate, mult, duration);
   const freqDisplay = computeDisplayFreq(start, duration);
   const format = freqDisplay === 'M' ? monthlyFormat : getFormat(freqDisplay);
-  const name = computeName(dateWithoutTZ(startDate), dateWithoutTZ(endDate), freqDisplay, locale, format);
+  const name = computeName(startDate, endDate, freqDisplay, locale, format);
+
   return ({
     ...timePeriod,
     id,
     name,
-    start: startDate.toISOString(),
-    end: endDate.toISOString()
+    start: dateWithTZ(startDate).toISOString(),
+    end: dateWithTZ(endDate).toISOString()
   })
 };