@sis-cc/dotstatsuite-components 13.5.6 → 14.0.0

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

@@ -31,6 +31,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var TIME_PERIOD_ID = 'TIME_PERIOD';
+
 var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var locale = options.locale;
@@ -142,14 +144,15 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
 
   var getDimObservations = R.propOr([], 'observation');
   var dimObservations = getDimObservations(dimensions);
+  var timePeriodDimension = (0, _dotstatsuiteSdmxjs.getTimePeriodObservation)(dimObservations);
+  var timePeriodId = timePeriodDimension.id;
 
   var getObservations = function getObservations(locale) {
     return R.addIndex(R.reduce)(function (acc, observation, obsIndex) {
       var id = R.prop('id')(observation);
       var dimAnnotations = (0, _sdmxData.getRelationnalAnnotations)(R.propOr([], 'annotations')(observation))(annotations);
       var isHidden = R.has(id, hiddenIds) || (0, _sdmxData.getIsHidden)(dimAnnotations);
-      var isTime = (0, _dotstatsuiteSdmxjs.isTimePeriodDimension)(observation);
-
+      var isTime = observation.id === timePeriodId;
       var values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([], 'values', observation));
       var ids = R.pipe(R.pluck('id'), R.indexBy(R.identity))(values);
       var groupedByParentsValues = R.groupBy(function (val) {
@@ -178,7 +181,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
           __index: obsIndex,
           name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
           values: sortedValues,
-          role: R.isNil(observation.roles) ? null : R.head(observation.roles)
+          role: isTime ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation))
         }))(acc.observation),
         dimensionsLayout: (0, _sdmxData.setAnnotationsLayout)(id, acc.dimensionsLayout)(dimAnnotations)
       };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "13.5.6",
+  "version": "14.0.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -37,7 +37,7 @@
   "peerDependencies": {
     "@material-ui/core": "^4.x",
     "@sis-cc/dotstatsuite-visions": "^7.x",
-    "@sis-cc/dotstatsuite-sdmxjs": "^6.x",
+    "@sis-cc/dotstatsuite-sdmxjs": "^7.x",
     "react": "16.x"
   }
 }

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

@@ -1,12 +1,14 @@
 import * as R from 'ramda';
 import dateFns from 'date-fns';
-import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getCodeOrder, getRefinedName, getTimePeriodObservation } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
 import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
+const TIME_PERIOD_ID = 'TIME_PERIOD';
+
 export const dataTransformer = (dataNew, options = {}) => {
   const { locale } = options;
   const reportYearStart = getReportingYearStart(dataNew);
@@ -136,13 +138,14 @@ export const dataTransformer = (dataNew, options = {}) => {
 
   const getDimObservations = R.propOr([], 'observation');
   const dimObservations = getDimObservations(dimensions);
+  const timePeriodDimension = getTimePeriodObservation(dimObservations);
+  const timePeriodId = timePeriodDimension.id;
 
   const getObservations = locale => R.addIndex(R.reduce)((acc, observation, obsIndex) => {
     const id = R.prop('id')(observation);
     const dimAnnotations = getRelationnalAnnotations(R.propOr([],'annotations')(observation))(annotations)
     const isHidden = R.has(id, hiddenIds) || getIsHidden(dimAnnotations);
-    const isTime = isTimePeriodDimension(observation);
-
+    const isTime = observation.id === timePeriodId;
     const values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([],'values', observation));
     const ids = R.pipe(R.pluck('id'), R.indexBy(R.identity))(values);
     const groupedByParentsValues = R.groupBy(val => {
@@ -176,7 +179,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         __index: obsIndex,
         name: getRefinedName(observation),
         values: sortedValues,
-        role: R.isNil(observation.roles) ? null : R.head(observation.roles),
+        role: isTime ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation)),
       })(acc.observation),
       dimensionsLayout: setAnnotationsLayout(id, acc.dimensionsLayout)(dimAnnotations),
     });