@sis-cc/dotstatsuite-components 16.0.0 → 16.1.1

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

@@ -154,14 +154,14 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var dimAnnotations = (0, _sdmxData.getRelationnalAnnotations)(R.propOr([], 'annotations')(observation))(annotations);
       var isTime = (0, _dotstatsuiteSdmxjs.isTimePeriodDimension)(observation);
       var values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([], 'values', observation));
-      var _idHidden = _hiddenIds[id] && R.isEmpty(R.difference(_hiddenIds[id], R.pluck('id')(values)));
+      var _idHidden = _hiddenIds[id] && R.isEmpty(R.pluck('id')(values), R.difference(_hiddenIds[id]));
       var isHidden = _idHidden || R.has(id, hiddenIds) || (0, _sdmxData.getIsHidden)(dimAnnotations);
       return {
         observation: R.append((0, _extends3.default)({}, observation, {
           display: !isHidden,
           __index: obsIndex,
           name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
-          values: _idHidden ? [] : values,
+          values: values,
           role: isTime ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation))
         }))(acc.observation),
         dimensionsLayout: (0, _sdmxData.setAnnotationsLayout)(id, acc.dimensionsLayout)(dimAnnotations)

package/lib/rules2/src/constants.js

@@ -5,5 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 var SDMX_3_0_JSON_DATA_FORMAT = exports.SDMX_3_0_JSON_DATA_FORMAT = 'application/vnd.sdmx.data+json;version=2.0';
 var SDMX_3_0_CSV_DATA_FORMAT = exports.SDMX_3_0_CSV_DATA_FORMAT = 'application/vnd.sdmx.data+csv;version=2.0';
+var EMPTY_ATTACHMENT_LEVEL_CHAR = exports.EMPTY_ATTACHMENT_LEVEL_CHAR = '~';
 var REPORTING_YEAR_START_DAY = exports.REPORTING_YEAR_START_DAY = 'REPORTING_YEAR_START_DAY';
 var REPYEARSTART = exports.REPYEARSTART = 'REPYEARSTART';

package/lib/rules2/src/parseMetadataSeries.js

@@ -15,6 +15,8 @@ var R = _interopRequireWildcard(_ramda);
 
 var _dotstatsuiteSdmxjs = require('@sis-cc/dotstatsuite-sdmxjs');
 
+var _constants = require('./constants');
+
 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; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -56,8 +58,8 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
       var metaIndexes = R.take(metaAttrLength, indexes);
 
       var evolvedKey = R.pipe(R.split(':'), R.addIndex(R.map)(function (vInd, dInd) {
-        if (R.isEmpty(vInd)) {
-          return vInd;
+        if (R.isEmpty(vInd) || R.equals(_constants.EMPTY_ATTACHMENT_LEVEL_CHAR, vInd)) {
+          return '';
         }
         var dim = R.nth(dInd, dimensions);
         var val = R.nth(Number(vInd), dim.values || []);

package/package.json

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

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

@@ -153,7 +153,7 @@ export const dataTransformer = (dataNew, options = {}) => {
     const dimAnnotations = getRelationnalAnnotations(R.propOr([], 'annotations')(observation))(annotations)
     const isTime = isTimePeriodDimension(observation);
     const values = getValuesEnhanced(locale, annotations, isTime, id)(R.propOr([], 'values', observation));
-    const _idHidden = _hiddenIds[id] && R.isEmpty(R.difference(_hiddenIds[id], R.pluck('id')(values)))
+    const _idHidden = _hiddenIds[id] && R.isEmpty(R.pluck('id')(values), R.difference(_hiddenIds[id]))
     const isHidden = _idHidden || R.has(id, hiddenIds) || getIsHidden(dimAnnotations);
     return ({
       observation: R.append({
@@ -161,7 +161,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         display: !isHidden,
         __index: obsIndex,
         name: getRefinedName(observation),
-        values: _idHidden ? [] : values,
+        values: values,
         role: isTime ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation)),
       })(acc.observation),
       dimensionsLayout: setAnnotationsLayout(id, acc.dimensionsLayout)(dimAnnotations),

package/src/rules2/src/constants.js

@@ -1,4 +1,5 @@
 export const SDMX_3_0_JSON_DATA_FORMAT = 'application/vnd.sdmx.data+json;version=2.0';
 export const SDMX_3_0_CSV_DATA_FORMAT = 'application/vnd.sdmx.data+csv;version=2.0';
+export const EMPTY_ATTACHMENT_LEVEL_CHAR = '~';
 export const REPORTING_YEAR_START_DAY = 'REPORTING_YEAR_START_DAY';
 export const REPYEARSTART = 'REPYEARSTART';

package/src/rules2/src/parseMetadataSeries.js

@@ -1,5 +1,6 @@
 import * as R from 'ramda';
 import { getRefinedName } from '@sis-cc/dotstatsuite-sdmxjs';
+import { EMPTY_ATTACHMENT_LEVEL_CHAR } from './constants';
 
 const dimensionValueDisplay = (display) => data => {
   if (display === 'code') {
@@ -37,8 +38,8 @@ export const parseMetadataSeries = (metadataJson, options) => {
       const evolvedKey = R.pipe(
         R.split(':'),
         R.addIndex(R.map)((vInd, dInd) => {
-          if (R.isEmpty(vInd)) {
-            return vInd;
+          if (R.isEmpty(vInd) || R.equals(EMPTY_ATTACHMENT_LEVEL_CHAR, vInd)) {
+            return '';
           }
           const dim = R.nth(dInd, dimensions);
           const val = R.nth(Number(vInd), dim.values || []);

package/test/mocks/OECD_SNA_TABLE1_1.0_-_AUS_V_metadata.json

@@ -20,8 +20,8 @@
                 1
             ],
             "dimensionGroupAttributes": {
-                "0:::": [null,null,null,0,0],
-                "0::0:": [0,0,0]
+                "0:~:~:~": [null,null,null,0,0],
+                "0:~:0:~": [0,0,0]
             }
         }],
         "structures": [{

package/test/parseMetadataSeries.test.js

@@ -81,7 +81,7 @@ describe('parseMetadataSeries test', () => {
       data: {
         dataSets: [{
           dimensionGroupAttributes: {
-            '::': [0, 0, null, 0, 0, 0, 0]
+            '~:~:~': [0, 0, null, 0, 0, 0, 0]
           }
         }],
         structures: [{