@sis-cc/dotstatsuite-components 14.2.5 → 14.3.0

package/lib/rules/src/table/factories/getLayoutData.js

@@ -58,6 +58,9 @@ var getRowData = function getRowData(indexes, dimension) {
     var data = _ref.data,
         missingParents = _ref.missingParents;
 
+    if (R.isNil(_value)) {
+      return { data: data, missingParents: {} };
+    }
     var raw = {
       dimension: R.pick(['id', 'name', '__index'], dimension),
       value: _value
@@ -146,7 +149,7 @@ var getLayoutData = function getLayoutData(layoutIndexes, layout) {
       rest = (0, _objectWithoutProperties3.default)(layoutIndexes, ['header', 'sections']);
 
   var headerData = R.map(function (i) {
-    return indexesToLayoutData(layout.header, i);
+    return R.pipe(indexesToLayoutData, R.filter(R.prop('value')))(layout.header, i);
   }, header);
 
   var sectionsData = R.map(function (_ref2) {
@@ -154,13 +157,12 @@ var getLayoutData = function getLayoutData(layoutIndexes, layout) {
         sectionIndexes = _ref3[0],
         rows = _ref3[1];
 
-    var sectionData = indexesToLayoutData(layout.sections, sectionIndexes);
+    var sectionData = R.pipe(indexesToLayoutData, R.filter(R.prop('value')))(layout.sections, sectionIndexes);
 
     var rowsData = getRowsData(rows, layout.rows);
 
     return [sectionData, rowsData];
   }, sections);
-
   return (0, _extends3.default)({ headerData: headerData, sectionsData: sectionsData }, rest);
 };
 exports.getLayoutData = getLayoutData;

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

@@ -146,15 +146,13 @@ 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 = observation.id === timePeriodId;
+      var isTime = (0, _dotstatsuiteSdmxjs.isTimePeriodDimension)(observation);
       var values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([], 'values', observation));
 
       return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "14.2.5",
+  "version": "14.3.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": "^7.x",
+    "@sis-cc/dotstatsuite-sdmxjs": "^8.x",
     "react": "16.x"
   }
 }

package/src/rules/src/table/factories/getLayoutData.js

@@ -37,6 +37,9 @@ const getRowData = (indexes, dimension) => {
     R.props(indexes),
     R.reduce(
       ({ data, missingParents }, _value) => {
+        if (R.isNil(_value)) {
+          return ({ data, missingParents: {} });
+        }
         const raw = {
           dimension: R.pick(['id', 'name', '__index'], dimension),
           value: _value,
@@ -151,11 +154,11 @@ const getRowsData = (rowsIndexes, dimensions) => {
 
 export const getLayoutData = (layoutIndexes, layout) => {
   const { header, sections, ...rest } = layoutIndexes;
-  const headerData = R.map(i => indexesToLayoutData(layout.header, i), header);
+  const headerData = R.map(i => R.pipe(indexesToLayoutData, R.filter(R.prop('value')))(layout.header, i), header);
 
   const sectionsData = R.map(
     ([sectionIndexes, rows]) => {
-      const sectionData = indexesToLayoutData(layout.sections, sectionIndexes);
+      const sectionData = R.pipe(indexesToLayoutData, R.filter(R.prop('value')))(layout.sections, sectionIndexes);
 
 
       const rowsData = getRowsData(rows, layout.rows);
@@ -164,6 +167,5 @@ export const getLayoutData = (layoutIndexes, layout) => {
     },
     sections
   );
-
   return ({ headerData, sectionsData, ...rest });
 };

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

@@ -1,6 +1,6 @@
 import * as R from 'ramda';
 import dateFns from 'date-fns';
-import { getCodeOrder, getRefinedName, getTimePeriodObservation } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
 import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
@@ -146,14 +146,12 @@ 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 = observation.id === timePeriodId;
+    const isTime = isTimePeriodDimension(observation);
     const values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([],'values', observation));
 
     return ({