@sis-cc/dotstatsuite-components 13.0.4 → 13.3.0

package/lib/rules/src/factories/timeline-series.js

@@ -48,12 +48,6 @@ var _findIndex2 = require('lodash/findIndex');
 
 var _findIndex3 = _interopRequireDefault(_findIndex2);
 
-var _concat2 = require('lodash/concat');
-
-var _concat3 = _interopRequireDefault(_concat2);
-
-var _constants = require('../constants');
-
 var _dotstatsuiteSdmxjs = require('@sis-cc/dotstatsuite-sdmxjs');
 
 var _dimensionUtils = require('../dimension-utils');
@@ -62,26 +56,6 @@ var _observationFormater = require('../observation-formater');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getLineCategory = function getLineCategory(oDimensionValuesIndexes, dimensions, timePeriodDimensionIndex, dimensionsWithValuesIndexedById) {
-  return (0, _reduce3.default)(oDimensionValuesIndexes, function (memo, dimensionValueIndex, dimensionIndex) {
-    var dimension = (0, _get3.default)(dimensions, '[' + dimensionIndex + ']', {});
-    if (dimensionIndex !== timePeriodDimensionIndex && (0, _has3.default)(dimensionsWithValuesIndexedById, dimension.id)) {
-      return (0, _concat3.default)(memo, (0, _get3.default)(dimensions, '[' + dimensionIndex + '].values[' + dimensionValueIndex + '].name', ''));
-    }
-    return memo;
-  }, []).join(' - ');
-};
-
-var getLineCategoryId = function getLineCategoryId(oDimensionValuesIndexes, dimensions, timePeriodDimensionIndex, dimensionsWithValuesIndexedById) {
-  return (0, _reduce3.default)(oDimensionValuesIndexes, function (memo, dimensionValueIndex, dimensionIndex) {
-    var dimension = (0, _get3.default)(dimensions, '[' + dimensionIndex + ']', {});
-    if (dimensionIndex !== timePeriodDimensionIndex && (0, _has3.default)(dimensionsWithValuesIndexedById, dimension.id)) {
-      return (0, _concat3.default)(memo, (0, _get3.default)(dimensions, '[' + dimensionIndex + '].values[' + dimensionValueIndex + '].id', ''));
-    }
-    return memo;
-  }, []).join(' - ');
-};
-
 var getDimensionValues = function getDimensionValues(splitObservationKey, dimensions, dimensionsWithValuesIndexedById, rejectedId, display) {
   return (0, _reduce3.default)(splitObservationKey, function (memo, dimensionValueIndex, dimensionIndex) {
     var dimension = (0, _get3.default)(dimensions, '[' + dimensionIndex + ']', {});

package/lib/rules/src/preparators/enhanceObservations.js

@@ -13,8 +13,6 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _getDisplay = require('./getDisplay');
-
 var _formatValue = require('./formatValue');
 
 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; } }
@@ -28,8 +26,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       decimals: id,
       prefscale: id,
     },
-    noDisplayIndexes,
-    notDisplayedCodes,
     unitsArtefacts,
     obsAttributes,
     rejectedValueIds,
@@ -55,11 +51,11 @@ var getUnitsValues = function getUnitsValues(indexes, options) {
       return acc;
     }
     var valueIndex = R.prop(codelist.__index, indexes);
-    if (R.isNil(valueIndex) || !(0, _getDisplay.getDisplay)(options)(codelist)) {
+    if (R.isNil(valueIndex) || !R.propOr(true, 'display', codelist)) {
       return acc;
     }
     var value = R.path(['values', Number(valueIndex)], codelist);
-    if (R.isNil(value) || R.includes(value.id, R.propOr([], 'rejectedValueIds', options)) || !(0, _getDisplay.getDisplay)(options)((0, _extends3.default)({}, value, { parent: codelist.id }))) {
+    if (R.isNil(value) || R.includes(value.id, R.propOr([], 'rejectedValueIds', options)) || !R.propOr(true, 'display', value)) {
       return acc;
     }
     return R.assoc(id, (0, _extends3.default)({}, R.pick(['id', 'name', '__index'], codelist), {
@@ -97,12 +93,12 @@ var getFormatAttributesIndexes = function getFormatAttributesIndexes(attributes,
 };
 
 var getAttributeValue = function getAttributeValue(attribute, valueIndex, options) {
-  if (!(0, _getDisplay.getDisplay)(options)(attribute)) {
+  if (!R.propOr(true, 'display', attribute)) {
     return null;
   }
   var value = R.pipe(R.propOr([], 'values'), R.nth(valueIndex))(attribute);
 
-  if (R.isNil(value) || !(0, _getDisplay.getDisplay)(options)((0, _extends3.default)({}, value, { parent: attribute.id }))) {
+  if (R.isNil(value) || !R.propOr(true, 'display', value)) {
     return null;
   }
 

package/lib/rules/src/sdmx-data/index.js

@@ -50,7 +50,6 @@ var getRelationnalAnnotations = exports.getRelationnalAnnotations = function get
 
 var hiddenFormat = exports.hiddenFormat = { isHidden: true };
 
-var getIsHidden = exports.getIsHidden = R.reduce(function (acc, annotation) {
-  if (R.equals(getType(annotation), NOT_DISPLAYED)) return hiddenFormat;
-  return acc;
-}, {});
+var getIsHidden = exports.getIsHidden = function getIsHidden(annotations) {
+  return R.pipe(R.find(R.propEq('type', NOT_DISPLAYED)), R.complement(R.isNil))(annotations);
+};

package/lib/rules/src/table/preparators/getOneValueDimensions.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getOneValueDimensions = undefined;
 
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
@@ -17,20 +13,12 @@ var _getAttributeValue = require('./getAttributeValue');
 
 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 }; }
-
-var getOneValueDimensions = exports.getOneValueDimensions = function getOneValueDimensions(dimensions, attributesIds, attributes, getDisplay) {
+var getOneValueDimensions = exports.getOneValueDimensions = function getOneValueDimensions(dimensions, attributesIds, attributes) {
   return R.map(function (dimension) {
     var dimensionAttributes = R.pipe(R.mapObjIndexed(function (attr) {
       return (0, _getAttributeValue.getAttributeValue)(attr, 0);
     }), R.filter(R.complement(R.isNil)))(R.pick(R.propOr([], dimension.id, attributesIds), attributes));
 
-    var display = getDisplay(dimension);
-
-    var value = R.pipe(R.path(['values', 0]), R.assoc('attributes', dimensionAttributes), function (val) {
-      return R.assoc('display', getDisplay((0, _extends3.default)({}, val, { parent: dimension.id })), val);
-    })(dimension);
-
-    return R.pipe(R.assoc('display', display), R.assocPath(['values', 0], value))(dimension);
+    return R.over(R.lensPath(['values', 0]), R.assoc('attributes', dimensionAttributes))(dimension);
   }, dimensions);
 };

package/lib/rules/src/table/preparators/parseAttributes.js

@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseAttributes = undefined;
 
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
 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 }; }
-
 var registerAttrId = function registerAttrId(path, id) {
   return R.over(R.lensPath(R.prepend('attributesIdsIndexedByTargets', path)), R.ifElse(R.isNil, R.always([id]), R.append(id)));
 };
@@ -62,17 +56,16 @@ var getAttributeRegisters = function getAttributeRegisters(attribute, parsedDime
 var parseAttributes = exports.parseAttributes = function parseAttributes(_ref) {
   var attributes = _ref.attributes,
       parsedDimensionsIds = _ref.parsedDimensionsIds,
-      customAttributes = _ref.customAttributes,
-      getDisplay = _ref.getDisplay;
+      customAttributes = _ref.customAttributes;
   return R.addIndex(R.reduce)(function (acc, attribute, attributeIndex) {
     var values = R.propOr([], 'values', attribute);
 
-    if (R.isEmpty(values) || !getDisplay(attribute) || R.includes(attribute.id, R.propOr([], 'units', customAttributes))) {
+    if (R.isEmpty(values) || !R.propOr(true, 'display', attribute) || R.includes(attribute.id, R.propOr([], 'units', customAttributes))) {
       return acc;
     }
 
     var registers = getAttributeRegisters(R.pipe(R.assoc('index', attributeIndex), R.over(R.lensProp('values'), R.map(function (value) {
-      if (!getDisplay((0, _extends3.default)({}, value, { parent: attribute.id }))) {
+      if (!R.propOr(true, 'display', value)) {
         return null;
       }
       return value;

package/lib/rules/src/table/preparators/prepareData.js

@@ -17,10 +17,6 @@ var _getObservationsType = require('../../properties/getObservationsType');
 
 var _parseDimensionsIds = require('./parseDimensionsIds');
 
-var _getNoDisplayAnnotationsIndexes = require('./getNoDisplayAnnotationsIndexes');
-
-var _getNoDisplayCodes = require('./getNoDisplayCodes');
-
 var _parseAttributes2 = require('./parseAttributes');
 
 var _getDimensionsAttributesRegisters = require('./getDimensionsAttributesRegisters');
@@ -45,8 +41,6 @@ var _getAttachmentSeriesIndexes = require('../units/getAttachmentSeriesIndexes')
 
 var _getUnitsSeries = require('../units/getUnitsSeries');
 
-var _getDisplay2 = require('../../preparators/getDisplay');
-
 var _getObservations = require('../../preparators/getObservations');
 
 var _enhanceObservations = require('../../preparators/enhanceObservations');
@@ -80,18 +74,8 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
 
   var parsedDimensionsIds = (0, _parseDimensionsIds.parseDimensionsIds)(dimensions);
 
-  var annotations = R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson);
-
-  var noDisplayIndexes = (0, _getNoDisplayAnnotationsIndexes.getNoDisplayAnnotationsIndexes)(annotations);
-  var notDisplayedCodes = (0, _getNoDisplayCodes.getNoDisplayCodes)({
-    noDisplayIndexes: noDisplayIndexes,
-    annotations: annotations,
-    datasetIndexes: R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson)
-  });
-  var _getDisplay = (0, _getDisplay2.getDisplay)({ noDisplayIndexes: noDisplayIndexes, notDisplayedCodes: notDisplayedCodes });
-
   //------------------------------------------------------------------
-  var unitsArtefacts = (0, _getUnitsArtefacts.getUnitsArtefacts)({ unitsDefinitionCodes: unitsDefinitionCodes, data: sdmxJson, getDisplay: _getDisplay });
+  var unitsArtefacts = (0, _getUnitsArtefacts.getUnitsArtefacts)({ unitsDefinitionCodes: unitsDefinitionCodes, data: sdmxJson });
   var headerUnits = (0, _getHeaderUnits.getHeaderUnits)({ unitsArtefacts: unitsArtefacts, unitsDefinitionCodes: unitsDefinitionCodes, rejectedValueIds: rejectedValueIds });
   var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.addIndex(R.map)(function (dim, index) {
     return R.assoc('index', index, dim);
@@ -104,7 +88,6 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   var _parseAttributes = (0, _parseAttributes2.parseAttributes)({
     attributes: R.concat(attributes, R.pathOr([], ['data', 'structure', 'attributes', 'dataSet'], sdmxJson)),
     parsedDimensionsIds: parsedDimensionsIds,
-    getDisplay: _getDisplay,
     customAttributes: _customAttributes
   }),
       attributesIndexedByIds = _parseAttributes.attributesIndexedByIds,
@@ -120,8 +103,6 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   var options = {
     attachmentSeriesIndexes: attachmentSeriesIndexes,
     customAttributes: customAttributes,
-    noDisplayIndexes: noDisplayIndexes,
-    notDisplayedCodes: notDisplayedCodes,
     attributesIds: R.concat(seriesAttributesIds, observationsAttributesIds),
     unitsIds: obsUnitsIds
   };
@@ -134,14 +115,14 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   //------------------------------------------------------------------   
   var attributesRegisters = (0, _getDimensionsAttributesRegisters.getDimensionsAttributesRegisters)(attributesIdsIndexedByTargets, attributesIndexedByIds);
 
-  var dimensionsAttributesValues = (0, _parseAttributesValuesFromObservations.parseAttributesValuesFromObservations)( // => { series: { key: { attrId: [...indexes] } }, dimensions: {} }
+  var dimensionsAttributesValues = (0, _parseAttributesValuesFromObservations.parseAttributesValuesFromObservations)( // => { series: { key: { attrId: [...indexes] } }, dimensions: {}   }
   observations, attributesRegisters);
 
   var dataflowAttributes = R.mapObjIndexed(function (attribute) {
     return (0, _getAttributeValue.getAttributeValue)(attribute, 0);
   }, R.pipe(R.pick(R.propOr([], 'dataflow', attributesIdsIndexedByTargets)), R.filter(R.complement(R.isNil)))(attributesIndexedByIds));
 
-  var oneValueDimensions = (0, _getOneValueDimensions.getOneValueDimensions)(R.pipe(R.pick(R.keys(parsedDimensionsIds.oneValue)), R.omit(unitsDefinitionCodes))(dimensionsIndexedByIds), attributesIdsIndexedByTargets.oneValueDimensions, attributesIndexedByIds, _getDisplay);
+  var oneValueDimensions = (0, _getOneValueDimensions.getOneValueDimensions)(R.pipe(R.pick(R.keys(parsedDimensionsIds.oneValue)), R.omit(unitsDefinitionCodes))(dimensionsIndexedByIds), attributesIdsIndexedByTargets.oneValueDimensions, attributesIndexedByIds);
 
   var manyValuesDimensions = (0, _getManyValuesDimensions.getManyValuesDimensions)(dimensionsIndexedByIds, parsedDimensionsIds.manyValues, dimensionsAttributesValues.dimensions, attributesIndexedByIds);
 
@@ -156,9 +137,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
     return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.notes || []);
   }))(headerAttributesIds);
 
-  var dataflowAdvancedAttributes = (0, _getAdvancedAttributes.getDataflowAdvancedAttributes)(headerAttributes,
-  //oneValueDimensions,
-  R.pick(R.keys(parsedDimensionsIds.oneValue), dimensionsIndexedByIds), headerAdvancedAttrIds, R.length(dimensions));
+  var dataflowAdvancedAttributes = (0, _getAdvancedAttributes.getDataflowAdvancedAttributes)(headerAttributes, R.pick(R.keys(parsedDimensionsIds.oneValue), dimensionsIndexedByIds), headerAdvancedAttrIds, R.length(dimensions));
 
   var observationsAdvancedAttributesIds = R.filter(function (id) {
     return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.notes || []);

package/lib/rules/src/table/units/getUnitsArtefacts.js

@@ -17,19 +17,14 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getRelevantLength = exports.getRelevantLength = function getRelevantLength(getDisplay) {
-  return function (attr) {
-    return R.pipe(R.propOr([], 'values'), R.filter(function (val) {
-      return getDisplay(R.assoc('parent', attr.id, val));
-    }), R.length)(attr);
-  };
+var getRelevantLength = exports.getRelevantLength = function getRelevantLength(attr) {
+  return R.pipe(R.propOr([], 'values'), R.filter(R.propOr(true, 'display')), R.length)(attr);
 };
 
 var getUnitsArtefacts = exports.getUnitsArtefacts = function getUnitsArtefacts(_ref) {
   var _ref$unitsDefinitionC = _ref.unitsDefinitionCodes,
       unitsDefinitionCodes = _ref$unitsDefinitionC === undefined ? [] : _ref$unitsDefinitionC,
-      data = _ref.data,
-      getDisplay = _ref.getDisplay;
+      data = _ref.data;
 
   var dimensions = R.pathOr([], ['data', 'structure', 'dimensions', 'observation'], data);
   var parsedUnitsDimensions = R.addIndex(R.reduce)(function (acc, dimension, index) {
@@ -50,11 +45,11 @@ var getUnitsArtefacts = exports.getUnitsArtefacts = function getUnitsArtefacts(_
 
   var parsedUnitsAttributes = R.converge(function (datasetLevel, observationLevel) {
     return R.over(R.lensProp('header'), R.merge(datasetLevel))(observationLevel);
-  }, [R.pipe(R.pathOr([], ['data', 'structure', 'attributes', 'dataSet']), R.filter(R.pipe(R.propOr([], 'values'), R.length, R.equals(1))), R.indexBy(R.prop('id')), R.pick(unitsDefinitionCodes), R.filter(getDisplay), R.mapObjIndexed(R.assoc('datasetLevel', true))), R.pipe(R.pathOr([], ['data', 'structure', 'attributes', 'observation']), R.addIndex(R.reduce)(function (acc, attr, index) {
-    if (!R.includes(attr.id, unitsDefinitionCodes) || R.length(R.propOr([], 'values', attr)) === 0 || !getDisplay(attr)) {
+  }, [R.pipe(R.pathOr([], ['data', 'structure', 'attributes', 'dataSet']), R.filter(R.pipe(R.propOr([], 'values'), R.length, R.equals(1))), R.indexBy(R.prop('id')), R.pick(unitsDefinitionCodes), R.filter(R.propOr(true, 'display')), R.mapObjIndexed(R.assoc('datasetLevel', true))), R.pipe(R.pathOr([], ['data', 'structure', 'attributes', 'observation']), R.addIndex(R.reduce)(function (acc, attr, index) {
+    if (!R.includes(attr.id, unitsDefinitionCodes) || R.length(R.propOr([], 'values', attr)) === 0 || !R.propOr(true, 'display', attr)) {
       return acc;
     }
-    var length = getRelevantLength(getDisplay)(attr);
+    var length = getRelevantLength(attr);
     if (length === 0) {
       return acc;
     }

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

@@ -25,29 +25,46 @@ var _date = require('./date');
 
 var _getReportingYearStart = require('./preparators/getReportingYearStart');
 
+var _src = require('../../rules2/src');
+
 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 }; }
 
 var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var locale = options.locale;
 
-  var getLanguage = R.pipe(R.pathOr('', ['meta', 'contentLanguages']), R.head());
-  var locale = getLanguage(dataNew);
   var reportYearStart = (0, _getReportingYearStart.getReportingYearStart)(dataNew);
-  var getProp = function getProp(prop, locale) {
-    return R.pathOr(null, [prop, locale]);
+
+  //---------------------------------------------------------------------------------------Annotations
+  var getStructure = R.pathOr({}, ['data', 'structure']);
+  var structure = getStructure(dataNew);
+  var getAnnotations = R.propOr([], 'annotations');
+  var annotations = getAnnotations(structure);
+  var getDataSets = R.pathOr({}, ['data', 'dataSets']);
+  var dataSets = getDataSets(dataNew);
+
+  var dataSetsAnnotations = R.props(R.pathOr([], [0, 'annotations'], dataSets), annotations);
+
+  var hiddenIds = (0, _src.getNotDisplayedIds)(dataSetsAnnotations);
+
+  //--------------------------------------------------------------------------------------------------
+  var getValues = function getValues(values, parent) {
+    return R.map(function (value) {
+      var valAnnotations = R.props(value.annotations || [], annotations);
+      return (0, _extends3.default)({}, value, {
+        display: !R.has(parent + '.' + value.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(valAnnotations),
+        name: (0, _dotstatsuiteSdmxjs.getRefinedName)(value)
+      });
+    }, values);
   };
-  var getLocalisedProp = R.curry(function (prop, collection) {
-    return getProp(prop, locale)(collection);
-  });
-  var getValues = R.map(function (value) {
-    return (0, _extends3.default)({}, value, { name: getLocalisedProp('names', value) });
-  });
-  var getValuesEnhanced = function getValuesEnhanced(locale, annotations, isTimeDimension) {
+
+  var getValuesEnhanced = function getValuesEnhanced(locale, annotations, isTimeDimension, parent) {
     return R.pipe(R.addIndex(R.map)(function (value, __index) {
       var valueAnnotations = R.pipe(R.propOr([], 'annotations'), R.flip(R.props)(annotations))(value);
-      var name = getLocalisedProp('names')(value);
+      var isHidden = R.has(parent + '.' + value.id, hiddenIds) || (0, _sdmxData.getIsHidden)(valueAnnotations);
+      var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(value);
       var __indexPosition = NaN;
       var start = null;
       if (isTimeDimension) {
@@ -58,11 +75,12 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         __indexPosition = _dateFns2.default.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
-        __indexPosition = (0, _dotstatsuiteSdmxjs.getCodeOrder)(locale)({ annotations: valueAnnotations });
+        __indexPosition = (0, _dotstatsuiteSdmxjs.getCodeOrder)({ annotations: valueAnnotations });
       }
       var timeFormat = R.prop('timeFormat', options);
       return (0, _extends3.default)({}, value, {
         id: R.when(R.always(isTimeDimension), R.replace(/M/g, ''))(value.id),
+        display: !isHidden,
         name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: value.start })))(name),
         start: start ? start.toISOString() : null,
         __indexPosition: __indexPosition,
@@ -73,12 +91,6 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     }));
   };
 
-  var getDataSets = R.pathOr({}, ['data', 'dataSets']);
-  var dataSets = getDataSets(dataNew);
-
-  var getStructure = R.pathOr({}, ['data', 'structure']);
-  var structure = getStructure(dataNew);
-
   //--------------------------------------------------------------------------------------------Header
   var getMeta = R.propOr({}, 'meta');
   var meta = getMeta(dataNew);
@@ -87,17 +99,9 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
   var sender = getSender(meta);
 
   var resHeader = (0, _extends3.default)({}, meta, {
-    sender: (0, _extends3.default)({}, sender, { name: getLocalisedProp('names', sender) })
+    sender: (0, _extends3.default)({}, sender, { name: (0, _dotstatsuiteSdmxjs.getRefinedName)(sender) })
   });
 
-  //---------------------------------------------------------------------------------------Annotations
-  var getAnnotations = R.propOr([], 'annotations');
-  var annotations = getAnnotations(structure);
-
-  var dataSetsAnnotations = (0, _sdmxData.getRelationnalAnnotations)(R.pathOr([], [0, 'annotations'])(dataSets))(annotations);
-
-  var hiddenIds = R.pipe(R.find(R.propEq('type', 'NOT_DISPLAYED')), R.propOr('', 'title'), R.ifElse(R.isEmpty, R.always([]), R.split(',')))(annotations);
-
   //----------------------------------------------------------------------------------------Attributes
   var getAttributes = R.propOr({}, 'attributes');
   var attributes = getAttributes(structure);
@@ -106,17 +110,21 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
   var attrObservations = getAttrObservations(attributes);
 
   var resAttrObservations = R.map(function (observation) {
+    var obsAnnotations = R.props(observation.annotations || [], annotations);
     return (0, _extends3.default)({}, observation, {
-      name: getLocalisedProp('names', observation),
-      values: getValues(observation.values || []),
+      display: !R.has(observation.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(obsAnnotations),
+      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
+      values: getValues(observation.values || [], observation.id),
       roles: !R.isNil(observation.role) ? R.head(observation.role) : null
     });
   }, attrObservations);
 
   var datasetAttributes = R.map(function (attr) {
+    var attrAnnotations = R.props(attr.annotations || [], annotations);
     return (0, _extends3.default)({}, attr, {
-      name: getLocalisedProp('names', observation),
-      values: getValues(attr.values || [])
+      display: !R.has(attr.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(attrAnnotations),
+      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
+      values: getValues(attr.values || [], attr.id)
     });
   }, R.propOr([], 'dataSet', attributes));
 
@@ -135,10 +143,10 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     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.includes(id)(hiddenIds) ? _sdmxData.hiddenFormat : (0, _sdmxData.getIsHidden)(dimAnnotations);
+      var isHidden = R.has(id, hiddenIds) || (0, _sdmxData.getIsHidden)(dimAnnotations);
       var isTime = (0, _dotstatsuiteSdmxjs.isTimePeriodDimension)(observation);
 
-      var values = getValuesEnhanced(locale, annotations, isTime)(R.propOr([], 'values', observation));
+      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) {
         var parentId = R.propOr('##ROOT', 'parent', val);
@@ -162,11 +170,12 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
 
       return {
         observation: R.append((0, _extends3.default)({}, observation, {
+          display: !isHidden,
           __index: obsIndex,
-          name: getLocalisedProp('names', observation),
+          name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
           values: sortedValues,
           role: R.isNil(observation.roles) ? null : R.head(observation.roles)
-        }, isHidden))(acc.observation),
+        }))(acc.observation),
         dimensionsLayout: (0, _sdmxData.setAnnotationsLayout)(id, acc.dimensionsLayout)(dimAnnotations)
       };
     }, { observation: [], dimensionsLayout: {} });
@@ -179,7 +188,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       observation = _getObservations.observation;
 
   var resStructure = (0, _extends3.default)({}, structure, {
-    name: getLocalisedProp('names', structure),
+    name: (0, _dotstatsuiteSdmxjs.getRefinedName)((0, _extends3.default)({}, structure, { id: options.dataflowId })),
     annotations: annotations,
     attributes: resAttributes,
     dimensions: { observation: observation }

package/lib/rules2/src/getNotDisplayedIds.js

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getNotDisplayedIds = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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; } }
+
+var getNotDisplayedIds = exports.getNotDisplayedIds = function getNotDisplayedIds(annotations) {
+  return R.pipe(R.find(R.propEq('type', 'NOT_DISPLAYED')), function (annot) {
+    if (R.isNil(annot)) {
+      return {};
+    }
+    var ids = R.split(',', annot.title || '');
+    return R.reduce(function (acc, entry) {
+      if (R.isEmpty(entry)) {
+        return acc;
+      }
+      var parsed = R.split('=', entry);
+      var dimensionId = parsed[0];
+      if (R.length(parsed) === 1) {
+        return R.assoc(dimensionId, dimensionId, acc);
+      }
+      var values = R.split('+', parsed[1]);
+      if (R.length(values) === 1 && R.isEmpty(values[0])) {
+        return R.assoc(dimensionId, dimensionId, acc);
+      }
+      return R.reduce(function (_acc, val) {
+        if (R.isEmpty(val)) {
+          return _acc;
+        }
+        var key = dimensionId + '.' + val;
+        return R.assoc(key, key, _acc);
+      }, acc, values);
+    }, {}, ids);
+  })(annotations);
+};

package/lib/rules2/src/getSidebarData.js

@@ -5,12 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSidebarData = undefined;
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
 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 }; }
+
 var dimensionValueDisplay = function dimensionValueDisplay(display) {
   return function (data) {
     var name = R.isNil(data.name) ? '[' + data.id + ']' : data.name;
@@ -51,27 +57,44 @@ var getSidebarData = exports.getSidebarData = function getSidebarData(attributes
     var metadata = R.prop(coordinate, metadataSeries);
     var children = R.concat(R.isNil(attributes) ? [] : [{ id: coordinate + '-attr', label: options.attributesLabel, children: attributes }], R.isNil(metadata) ? [] : metadata);
     var splitCoord = R.split(':', coordinate);
-    var label = null;
-    if (R.all(R.isEmpty, splitCoord)) {
-      label = dimensionValueDisplay(options.display)(dataflow);
-    } else {
-      label = R.pipe(R.addIndex(R.reduce)(function (acc, valIndex, dimIndex) {
-        if (R.isEmpty(valIndex)) {
-          return acc;
-        }
-        var dim = R.nth(dimIndex, dimensions);
-        var dimLabel = dimensionValueDisplay(options.display)(dim);
-        var value = R.nth(Number(valIndex), dim.values);
-        var valLabel = dimensionValueDisplay(options.display)(value);
-        return R.append(dimLabel + ': ' + valLabel, acc);
-      }, []), R.join(' - '))(splitCoord);
-    }
+
+    var _R$addIndex = R.addIndex(R.reduce)(function (acc, valIndex, dimIndex) {
+      if (R.isEmpty(valIndex)) {
+        return (0, _extends3.default)({}, acc, { split: R.append('', acc.split) });
+      }
+      var dim = R.nth(dimIndex, dimensions);
+      var value = R.nth(Number(valIndex), dim.values);
+      if (!R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
+        return (0, _extends3.default)({}, acc, { split: R.append('', acc.split) });
+      }
+      var dimLabel = dimensionValueDisplay(options.display)(dim);
+      var valLabel = dimensionValueDisplay(options.display)(value);
+      return {
+        labels: R.append(dimLabel + ': ' + valLabel, acc.labels),
+        split: R.append(valIndex, acc.split)
+      };
+    }, { split: [], labels: [] }, splitCoord),
+        split = _R$addIndex.split,
+        labels = _R$addIndex.labels;
+
+    var label = R.isEmpty(labels) ? dimensionValueDisplay(options.display)(dataflow) : R.join(' - ', labels);
 
     return {
-      id: coordinate,
-      splitCoord: splitCoord,
+      id: R.join(':', split),
+      splitCoord: split,
       label: label,
       children: R.filter(R.identity, children)
     };
-  }), R.sort(sortByCoordinates))(coordinates);
+  }), function (series) {
+    // after removed non displayed dim vals, some series might be duplicated
+    var grouped = R.groupBy(R.prop('id'), series);
+    return R.pipe(R.map(function (entries) {
+      if (R.length(entries) === 1) {
+        return R.head(entries);
+      }
+      var head = R.head(entries);
+      var children = R.pipe(R.pluck('children'), R.unnest)(entries);
+      return R.assoc('children', children, head);
+    }), R.values)(grouped);
+  }, R.sort(sortByCoordinates))(coordinates);
 };

package/lib/rules2/src/index.js

@@ -62,4 +62,13 @@ Object.defineProperty(exports, 'getMSDInformations', {
   get: function get() {
     return _getMSDInformations.getMSDInformations;
   }
+});
+
+var _getNotDisplayedIds = require('./getNotDisplayedIds');
+
+Object.defineProperty(exports, 'getNotDisplayedIds', {
+  enumerable: true,
+  get: function get() {
+    return _getNotDisplayedIds.getNotDisplayedIds;
+  }
 });

package/lib/rules2/src/parseMetadataSeries.js

@@ -13,15 +13,16 @@ var _dotstatsuiteSdmxjs = require('@sis-cc/dotstatsuite-sdmxjs');
 
 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; } }
 
-var dimensionValueDisplay = function dimensionValueDisplay(locale, display) {
+var dimensionValueDisplay = function dimensionValueDisplay(display) {
   return function (data) {
     if (display === 'code') {
       return R.prop('id', data);
     }
+    var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(data);
     if (display === 'both') {
-      return R.prop('id', data) + ': ' + (0, _dotstatsuiteSdmxjs.getLocalisedName)(locale)(data);
+      return R.prop('id', data) + ': ' + name;
     }
-    return (0, _dotstatsuiteSdmxjs.getLocalisedName)(locale)(data);
+    return name;
   };
 };
 // options = { locale, display, dimensions = [], attributes = { [id]: { format, parent } } };
@@ -64,7 +65,7 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
           return acc;
         }
         var attribute = R.nth(attrIndex, metadataAttributes);
-        var label = dimensionValueDisplay(options.locale, options.display)(attribute);
+        var label = dimensionValueDisplay(options.display)(attribute);
 
         var value = R.prop('value', R.nth(valueIndex, attribute.values || []));