@sis-cc/dotstatsuite-components 15.0.0 → 15.0.3

package/lib/rules/src/date.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTimePeriodLabel = exports.getReportedTimePeriodNote = exports.getReportedTimePeriod = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
+exports.getTimePeriodLabel = exports.getReportedTimePeriodNote = exports.getReportedTimePeriod = exports.getReportedTimePeriodLabel = exports.getLocale = exports.dateWithoutTZ = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -59,6 +59,10 @@ var isValidDate = function isValidDate(period) {
   })(new Date(period));
 };
 
+var dateWithoutTZ = exports.dateWithoutTZ = function dateWithoutTZ(date) {
+  return _dateFns2.default.addMinutes(date, date.getTimezoneOffset());
+};
+
 var getLocale = exports.getLocale = R.cond([[R.equals('fr'), R.always(_fr2.default)], [R.equals('de'), R.always(_de2.default)], [R.equals('es'), R.always(_es2.default)], [R.equals('ar'), R.always(_ar2.default)], [R.equals('it'), R.always(_it2.default)], [R.equals('nl'), R.always(_nl2.default)], [R.equals('th'), R.always(_th2.default)], [R.T, R.always(_en2.default)]]);
 
 var formaterPeriod = function formaterPeriod(locale, format) {
@@ -120,8 +124,8 @@ var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function g
 };
 
 var getReportedTimePeriod = exports.getReportedTimePeriod = function getReportedTimePeriod(reportYearStart, value, freq) {
-  var start = new Date(R.prop('start', value));
-  var end = new Date(R.prop('end', value));
+  var start = dateWithoutTZ(new Date(R.prop('start', value)));
+  var end = dateWithoutTZ(new Date(R.prop('end', value)));
   if (reportYearStart.month === '01' && reportYearStart.day === '01') {
     return { start: start, end: end };
   }

package/lib/rules/src/table/preparators/prepareData.js

@@ -86,9 +86,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   //------------------------------------------------------------------
   var unitsArtefacts = (0, _getUnitsArtefacts.getUnitsArtefacts)({ unitsDefinitionCodes: unitsDefinitionCodes, data: sdmxJson });
   var headerUnits = (0, _getHeaderUnits.getHeaderUnits)({ unitsArtefacts: unitsArtefacts, unitsDefinitionCodes: unitsDefinitionCodes, rejectedValueIds: rejectedValueIds });
-  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.addIndex(R.map)(function (dim, index) {
-    return R.assoc('index', index, dim);
-  }), R.indexBy(R.prop('id')))(sdmxJson);
+  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.indexBy(R.prop('id')))(sdmxJson);
   var attachmentSeriesIndexes = (0, _getAttachmentSeriesIndexes.getAttachmentSeriesIndexes)({ dimensions: _dimensions, unitsArtefacts: unitsArtefacts });
   //------------------------------------------------------------------
 

package/lib/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -21,5 +21,5 @@ var getAttachmentSeriesIndexes = exports.getAttachmentSeriesIndexes = function g
 
   return R.pipe(R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)), R.filter(function (dim) {
     return !R.isNil(dim);
-  }), R.pluck('index'), R.uniq, R.sortBy(R.identity))(dimensions);
+  }), R.pluck('__index'), R.uniq, R.sortBy(R.identity))(dimensions);
 };

package/lib/rules/src/v8-transformer.js

@@ -86,7 +86,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       return (0, _extends3.default)({}, value, {
         id: R.pipe(R.when(R.isNil, R.always(parent + '-' + __index)), R.when(R.always(isTimeDimension), R.replace(/M/g, '')))(value.id),
         display: !isHidden,
-        name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: value.start })))(name),
+        name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: (0, _date.dateWithoutTZ)(new Date(value.start)) })))(name),
         start: start ? start.toISOString() : null,
         notes: notes,
         __indexPosition: __indexPosition,

package/lib/rules2/src/duplicateObservations.js

@@ -12,6 +12,10 @@ var R = _interopRequireWildcard(_ramda);
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observations) {
+  var obsValues = R.values(observations);
+  if (R.length(obsValues) < 2 || R.length(dims) === 0) {
+    return observations;
+  }
   var duplicated = R.reduce(function (obs, dim) {
     var groupedObs = R.groupBy(function (o) {
       return R.prop(dim.id, o.indexedDimValIds);
@@ -29,7 +33,7 @@ var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observatio
       }, matchingObs);
     }, dim.values);
     return R.unnest(enhancedObs);
-  }, R.values(observations), dims);
+  }, obsValues, dims);
   var res = R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);
   return res;
 };

package/package.json

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

package/src/rules/src/date.js

@@ -12,6 +12,8 @@ import th from 'date-fns/locale/th';
 const isValidDate = period =>
   R.and(dateFns.isDate, date => R.not(R.equals(date.getTime(date), NaN)))(new Date(period));
 
+export const dateWithoutTZ = date => dateFns.addMinutes(date, date.getTimezoneOffset());
+
 export const getLocale = R.cond([
   [R.equals('fr'), R.always(fr)],
   [R.equals('de'), R.always(de)],
@@ -58,8 +60,8 @@ export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYear
 };
 
 export const getReportedTimePeriod = (reportYearStart, value, freq) => {
-  let start = new Date(R.prop('start', value));
-  let end = new Date(R.prop('end', value));
+  let start = dateWithoutTZ(new Date(R.prop('start', value)));
+  let end = dateWithoutTZ(new Date(R.prop('end', value)));
   if(reportYearStart.month === '01' && reportYearStart.day === '01') {
     return ({ start, end });
   }

package/src/rules/src/table/preparators/prepareData.js

@@ -50,7 +50,6 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options=
     const headerUnits = getHeaderUnits({ unitsArtefacts, unitsDefinitionCodes, rejectedValueIds });
     const _dimensions = R.pipe(
       R.pathOr([], ['data', 'structure', 'dimensions', 'observation']),
-      R.addIndex(R.map)((dim, index) => R.assoc('index', index, dim)),
       R.indexBy(R.prop('id'))
     )(sdmxJson);
     const attachmentSeriesIndexes = getAttachmentSeriesIndexes({ dimensions: _dimensions, unitsArtefacts });

package/src/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -2,7 +2,7 @@ import * as R from 'ramda';
 
 export const getAttachmentSeriesIndexes = ({
   unitsArtefacts,
-  dimensions // { id: { index, ...dim } }
+  dimensions // { id: { __index, ...dim } }
 }) => {
   const targettedDimensionsCodes = R.pipe(
     R.pathOr({}, ['attributes', 'series']),
@@ -20,7 +20,7 @@ export const getAttachmentSeriesIndexes = ({
   return R.pipe(
     R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)),
     R.filter(dim => !R.isNil(dim)),
-    R.pluck('index'),
+    R.pluck('__index'),
     R.uniq,
     R.sortBy(R.identity)
   )(dimensions);

package/src/rules/src/v8-transformer.js

@@ -3,7 +3,7 @@ import dateFns from 'date-fns';
 import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
-import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
+import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod, dateWithoutTZ } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
@@ -75,7 +75,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         display: !isHidden,
         name: R.when(
           R.always(isTimeDimension),
-          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start:value.start }))
+          R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: dateWithoutTZ(new Date(value.start)) }))
         )(name),
         start: start ? start.toISOString() : null,
         notes,

package/src/rules2/src/duplicateObservations.js

@@ -1,6 +1,10 @@
 import * as R from 'ramda';
 
 export const duplicateObs = (dims, observations) => {
+  const obsValues = R.values(observations);
+  if ((R.length(obsValues) < 2) || R.length(dims) === 0) {
+    return observations;
+  }
   const duplicated = R.reduce(
     (obs, dim) => {
       const groupedObs = R.groupBy(o => R.prop(dim.id, o.indexedDimValIds), obs);
@@ -23,7 +27,7 @@ export const duplicateObs = (dims, observations) => {
       );
       return R.unnest(enhancedObs);
     },
-    R.values(observations),
+    obsValues,
     dims
   );
   const res =  R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);