@sis-cc/dotstatsuite-components 17.18.0 → 17.20.0

package/lib/rules/src/index.js

@@ -403,7 +403,7 @@ var _extractSdmxArtefacts = function _extractSdmxArtefacts(data) {
     name: extractDataName(data),
     observations: R.pipe(R.pathOr({}, ['dataSets', 0, 'observations']), R.mapObjIndexed(function (obs) {
       return R.over(R.lensIndex(0), function (val) {
-        return Number(val);
+        return R.isNil(val) ? null : Number(val);
       })(obs);
     }), R.reject(R.pipe(R.head, R.anyPass([R.isNil, isNaN]))))(data),
     source: (0, _get3.default)(data, 'header.links[0].href', null)

package/lib/rules2/src/parseCombinations.js

@@ -75,7 +75,7 @@ var parseCombinations = exports.parseCombinations = function parseCombinations(c
       relationship = attribute.series && isDisplayable ? R.pipe(R.reject(function (id) {
         return R.has(id, ids);
       }), R.concat(relationship))(attribute.relationship) : relationship;
-      ids = attribute.series ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
+      ids = attribute.series && isDisplayable ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
       displayable_values_count = isDisplayable ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
       return attribute.series && isDisplayable;
     }, comb.concepts);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "17.18.0",
+  "version": "17.20.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@react-hook/size": "^2.1.1",
-    "@sis-cc/dotstatsuite-d3-charts": "^8.2.0",
+    "@sis-cc/dotstatsuite-d3-charts": "^8.3.0",
     "date-fns": "^1.30.1",
     "lodash": "^4.17.2",
     "lodash.compose": "^2.4.1",

package/src/rules/src/index.js

@@ -64,7 +64,7 @@ const _extractSdmxArtefacts = (data) => {
     name: extractDataName(data),
     observations: R.pipe(
       R.pathOr({}, ['dataSets', 0, 'observations']),
-      R.mapObjIndexed(obs => R.over(R.lensIndex(0), val => Number(val))(obs)),
+      R.mapObjIndexed(obs => R.over(R.lensIndex(0), val => R.isNil(val) ? null : Number(val))(obs)),
       R.reject(R.pipe(R.head, R.anyPass([R.isNil, isNaN]))),
     )(data),
     source: get(data, 'header.links[0].href', null),

package/src/rules2/src/parseCombinations.js

@@ -72,7 +72,7 @@ export const parseCombinations = (
                 R.concat(relationship),
               )(attribute.relationship)
             : relationship;
-        ids = attribute.series
+        ids = attribute.series  && isDisplayable
           ? { ...ids, ...R.indexBy(R.identity, attribute.relationship) }
           : ids;
         displayable_values_count = isDisplayable

package/test/parseCombinations.test.js

@@ -17,6 +17,7 @@ describe('parseCombinations tests', () => {
       { id: 'COMB11', concepts: ['DIM4', 'DIM7'] },
       { id: 'COMB12', concepts: ['DIM4', 'ATTR7'] },
       { id: 'COMB13', concepts: ['DIM7', 'ATTR7'] },
+      { id: 'COMB14', concepts: ['DIM3', 'ATTR5', 'ATTR8'] }
     ];
 
     const dimensions = [
@@ -78,6 +79,12 @@ describe('parseCombinations tests', () => {
         relationship: [],
         values: [],
       },
+      {
+        id: 'ATTR8',
+        series: true,
+        relationship: ['DIM5'],
+        values: [{ id: 'v' }],
+      },
     ];
 
     expect(
@@ -159,6 +166,13 @@ describe('parseCombinations tests', () => {
         display: false,
         header: true,
       },
+      {
+        id: 'COMB14',
+        concepts: ['DIM3', 'ATTR5', 'ATTR8'],
+        relationship: ['DIM3', 'DIM5'],
+        display: true,
+        series: true,
+      },
     ]);
   });
 });