@sis-cc/dotstatsuite-components 16.1.2 → 16.1.4

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.pluck('id')(values), R.difference(_hiddenIds[id]));
+      var _idHidden = _hiddenIds[id] && R.isEmpty(R.difference(R.pluck('id')(values), _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: values,
+          values: _idHidden ? [] : 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/getCombinationDefinitions.js

@@ -17,25 +17,27 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var parseCombinationDefinition = exports.parseCombinationDefinition = function parseCombinationDefinition(title, texts) {
-  return R.useWith(function (titles, texts) {
-    return R.addIndex(R.map)(function (title, index) {
-      var split = R.split(':', title);
-      if (R.length(split !== 2)) {
-        return null;
-      }
-
-      var _split = (0, _slicedToArray3.default)(split, 2),
-          id = _split[0],
-          codes = _split[1];
-
-      return {
-        id: id,
-        concepts: R.split(',', codes),
-        name: R.has(locale, texts) ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts) : '[' + id + ']'
-      };
-    }, titles);
-  }, [R.split(';'), R.map(R.split(';'))])(title, texts);
+var parseCombinationDefinition = exports.parseCombinationDefinition = function parseCombinationDefinition(locale) {
+  return function (title, texts) {
+    return R.useWith(function (titles, texts) {
+      return R.addIndex(R.map)(function (title, index) {
+        var split = R.split(':', title);
+        if (R.length(split !== 2)) {
+          return null;
+        }
+
+        var _split = (0, _slicedToArray3.default)(split, 2),
+            id = _split[0],
+            codes = _split[1];
+
+        return {
+          id: id,
+          concepts: R.split(',', codes),
+          name: R.has(locale, texts) ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts) : '[' + id + ']'
+        };
+      }, titles);
+    }, [R.split(';'), R.map(R.split(';'))])(title, texts);
+  };
 };
 
 var getCombinationDefinitions = exports.getCombinationDefinitions = function getCombinationDefinitions(annotations, locale) {
@@ -48,5 +50,5 @@ var getCombinationDefinitions = exports.getCombinationDefinitions = function get
   var title = R.propOr('', 'title', annotation);
   var texts = R.propOr({}, 'texts', annotation);
 
-  return parseCombinationDefinition(title, texts);
+  return parseCombinationDefinition(locale)(title, texts);
 };

package/lib/rules2/src/prepareData.js

@@ -62,7 +62,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, _ref) {
     var concepts = defaultCombinations.concepts,
         names = defaultCombinations.names;
 
-    combinations = (0, _getCombinationDefinitions.parseCombinationDefinition)(concepts, names);
+    combinations = (0, _getCombinationDefinitions.parseCombinationDefinition)(locale)(concepts, names);
   }
   var metadataCoordinates = (0, _getMetadataCoordinates.getMetadataCoordinates)(sdmxJson);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "16.1.2",
+  "version": "16.1.4",
   "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.pluck('id')(values), R.difference(_hiddenIds[id]))
+    const _idHidden = _hiddenIds[id] && R.isEmpty(R.difference(R.pluck('id')(values), _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: values,
+        values: _idHidden ? [] : values,
         role: isTime ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation)),
       })(acc.observation),
       dimensionsLayout: setAnnotationsLayout(id, acc.dimensionsLayout)(dimAnnotations),

package/src/rules2/src/getCombinationDefinitions.js

@@ -1,6 +1,6 @@
 import * as R from 'ramda';
 
-export const parseCombinationDefinition = (title, texts) => R.useWith(
+export const parseCombinationDefinition = (locale) => (title, texts) => R.useWith(
   (titles, texts) =>
     R.addIndex(R.map)((title, index) => {
       const split = R.split(':', title);
@@ -27,5 +27,5 @@ export const getCombinationDefinitions = (annotations, locale) => {
   const title = R.propOr('', 'title', annotation);
   const texts = R.propOr({}, 'texts', annotation);
 
-  return parseCombinationDefinition(title, texts);
+  return parseCombinationDefinition(locale)(title, texts);
 };

package/src/rules2/src/prepareData.js

@@ -25,7 +25,7 @@ export const prepareData = (sdmxJson, { customAttributes, locale, hierarchies, d
   let combinations = getCombinationDefinitions(annotations, locale);
   if (R.isEmpty(combinations) && !R.isEmpty(defaultCombinations)) {
     const { concepts, names } = defaultCombinations;
-    combinations = parseCombinationDefinition(concepts, names);
+    combinations = parseCombinationDefinition(locale)(concepts, names);
   }
   const metadataCoordinates = getMetadataCoordinates(sdmxJson);