@sis-cc/dotstatsuite-components 17.13.0 → 17.15.0

package/lib/rules/src/get-values-enhanced.js

@@ -46,7 +46,7 @@ var getName = function getName(_ref) {
       start = _ref.start,
       reportYearStart = _ref.reportYearStart;
   return function (value) {
-    if (!isTimeDimension) return (0, _dotstatsuiteSdmxjs.getRefinedName)(value);
+    if (!isTimeDimension) return R.prop('name')(value);
     return (0, _date.getReportedTimePeriodLabel)(options.frequency, options.timeFormat, locale)(reportYearStart, {
       id: value.id,
       reportedStart: start,

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

@@ -35,7 +35,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       _hiddenIds = options.hiddenIds;
 
   var reportYearStart = (0, _getReportingYearStart.getReportingYearStart)(dataNew);
-
+  var getName = R.prop('name');
   //---------------------------------------------------------------------------------------Annotations
   var getStructure = R.pathOr({}, ['data', 'structure']);
   var structure = getStructure(dataNew);
@@ -56,7 +56,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
   var sender = getSender(meta);
 
   var resHeader = (0, _extends3.default)({}, meta, {
-    sender: (0, _extends3.default)({}, sender, { name: (0, _dotstatsuiteSdmxjs.getRefinedName)(sender) })
+    sender: (0, _extends3.default)({}, sender, { name: getName(sender) })
   });
 
   //----------------------------------------------------------------------------------------Attributes
@@ -71,7 +71,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     return (0, _extends3.default)({}, observation, {
       __index: index,
       display: !R.has(observation.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(obsAnnotations),
-      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
+      name: getName(observation),
       values: (0, _getValuesEnhanced.getValuesEnhanced)({
         locale: locale,
         annotations: annotations,
@@ -89,7 +89,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     var attrAnnotations = R.props(attr.annotations || [], annotations);
     return (0, _extends3.default)({}, attr, {
       display: !R.has(attr.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(attrAnnotations),
-      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(attr),
+      name: getName(attr),
       values: (0, _getValuesEnhanced.getValuesEnhanced)({
         locale: locale,
         annotations: annotations,
@@ -134,7 +134,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         observation: R.append((0, _extends3.default)({}, observation, {
           display: !isHidden,
           __index: obsIndex,
-          name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
+          name: getName(observation),
           values: _idHidden ? [] : values,
           role: isTimeDimension ? TIME_PERIOD_ID : R.head(R.propOr([], 'roles', observation))
         }))(acc.observation),
@@ -150,7 +150,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       observation = _getObservations.observation;
 
   var resStructure = (0, _extends3.default)({}, structure, {
-    name: (0, _dotstatsuiteSdmxjs.getRefinedName)((0, _extends3.default)({}, structure, { id: options.dataflowId })),
+    name: getName((0, _extends3.default)({}, structure, { id: options.dataflowId })),
     annotations: annotations,
     attributes: resAttributes,
     dimensions: { observation: observation }

package/lib/rules2/src/index.js

@@ -19,15 +19,6 @@ Object.defineProperty(exports, 'SDMX_3_0_CSV_DATA_FORMAT', {
   }
 });
 
-var _getSidebarData = require('./getSidebarData');
-
-Object.defineProperty(exports, 'getSidebarData', {
-  enumerable: true,
-  get: function get() {
-    return _getSidebarData.getSidebarData;
-  }
-});
-
 var _parseMetadataSeries = require('./parseMetadataSeries');
 
 Object.defineProperty(exports, 'parseMetadataSeries', {

package/lib/rules2/src/parseMetadataSeries.js

@@ -13,8 +13,6 @@ var _ramda = require('ramda');
 
 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; } }
@@ -26,7 +24,7 @@ var dimensionValueDisplay = function dimensionValueDisplay(display) {
     if (display === 'code') {
       return R.prop('id', data);
     }
-    var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(data);
+    var name = R.prop('name')(data);
     if (display === 'both') {
       return R.prop('id', data) + ': ' + name;
     }

package/lib/rules2/src/table/getLayoutData2.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
 	value: true
 });
-exports.getLayoutData = exports.getSerieDatas = undefined;
+exports.getLayoutData = exports.getSerieDataWithoutMissingLines = exports.getSerieDataWithMissingLines = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -30,10 +30,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var getValueData = function getValueData(index, dimension, parentsIndexes) {
+	var missingParents = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
 	return {
 		dimension: R.pick(['id', 'name', '__index'], dimension),
 		value: (0, _extends3.default)({}, R.pipe(R.pathOr({}, ['values', index]), R.pick(['id', 'name']))(dimension), {
-			parents: parentsIndexes
+			parents: parentsIndexes,
+			missingParents: missingParents
 		})
 	};
 };
@@ -55,8 +57,8 @@ var combinedValueDataSetter = function combinedValueDataSetter(valueData) {
 };
 
 var addValueToSerieData = function addValueToSerieData(dataSetter) {
-	return function (index, parentsIndexes, dimension, serieData) {
-		var valueData = getValueData(index, dimension, parentsIndexes);
+	return function (index, parentsIndexes, dimension, serieData, missingParents) {
+		var valueData = getValueData(index, dimension, parentsIndexes, missingParents);
 		var valueId = R.path(['value', 'id'], valueData);
 		return (0, _extends3.default)({}, serieData, {
 			data: dataSetter(valueData, R.prop('data', serieData)),
@@ -92,7 +94,7 @@ var getAttributesSeries = function getAttributesSeries(validator, attributesSeri
 		var attr = R.head(R.values(attrs));
 		var coordinates = R.propOr({}, 'coordinates', attr);
 		var isValid = validator(coordinates);
-		if (!isValid && !attr.isObs) {
+		if (!isValid && !R.prop('isObs', attr)) {
 			return acc;
 		}
 		return (0, _extends3.default)({}, acc, attrs);
@@ -128,27 +130,8 @@ var getSerieFlagsAndSideProps = function getSerieFlagsAndSideProps(coordinates,
 	return { flags: flags, sideProps: sideProps };
 };
 
-var getSerieDatas = exports.getSerieDatas = function getSerieDatas(serie, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates) {
-	var lines = [];
-
-	var serieCoordinates = getCoordinates(serie.indexes, topCoordinates, definition);
-	var coordinatesValidator = (0, _utils.getLayoutCoordinatesValidator)(serieCoordinates, topCoordinates);
-	var attributesValues = getAttributesSeries(coordinatesValidator, attributesSeries);
-
-	var addMissingParentsLines = function addMissingParentsLines(dataSetter) {
-		return function (missingParentsIndexes, parentsIndexes, dim, serieData) {
-			return R.reduce(function (parents, index) {
-				var missingParentData = addValueToSerieData(dataSetter)(index, parents, dim, serieData);
-				lines.push(R.assoc('isEmpty', true, missingParentData));
-				return R.append(index, parents);
-			}, parentsIndexes, missingParentsIndexes);
-		};
-	};
-
-	var addSimpleMissingParentsLines = addMissingParentsLines(simpleValueDataSetter);
-	var addCombinedMissingParentsLines = addMissingParentsLines(combinedValueDataSetter);
-
-	var serieData = R.addIndex(R.reduce)(function (onGoingSerie, entry, index) {
+var getSerieDimensionsData = function getSerieDimensionsData(serie, definition, attributesValues, missingParentsGetter) {
+	return R.addIndex(R.reduce)(function (onGoingSerie, entry, index) {
 		if (R.has('dimensions', entry)) {
 			var combValuesIndexes = R.pathOr([], ['indexes', index], serie);
 			var combParentsIndexes = R.pathOr([], ['parentsIndexes', index], serie);
@@ -158,33 +141,90 @@ var getSerieDatas = exports.getSerieDatas = function getSerieDatas(serie, defini
 				var valueIndex = Math.abs(R.nth(dimIndex, combValuesIndexes));
 				var _parentsIndexes = R.nth(dimIndex, combParentsIndexes) || [];
 				var missingParentsIndexes = R.nth(dimIndex, combMissingParentsIndexes) || [];
-				var parentsIndexes = addCombinedMissingParentsLines(missingParentsIndexes, _parentsIndexes, dimension, combSerie);
-				var next = addCombinedValueToSerieData(valueIndex, parentsIndexes, dimension, combSerie);
+
+				var _missingParentsGetter = missingParentsGetter(combinedValueDataSetter)(missingParentsIndexes, _parentsIndexes, dimension, combSerie),
+				    parentsIndexes = _missingParentsGetter.parentsIndexes,
+				    missingParents = _missingParentsGetter.missingParents;
+
+				var next = addCombinedValueToSerieData(valueIndex, parentsIndexes, dimension, combSerie, missingParents);
 				var value = R.pipe(R.prop('data'), R.last, R.prop('values'), R.last)(next);
 				combDimValues = R.assoc(dimension.id, value, combDimValues);
 				return next;
 			}, R.over(R.lensProp('data'), R.append({ dimension: R.pick(['id', 'name'], entry), values: [] }))(onGoingSerie), R.propOr([], 'dimensions', entry));
 
-			var combined = combineConcepts(combDimValues, entry, attributesValues)(res);
-			attributesValues = R.omit(entry.concepts, attributesValues);
-			return combined;
+			var combined = combineConcepts(combDimValues, entry, onGoingSerie.attributes)(res);
+			return R.over(R.lensProp('attributes'), R.omit(entry.concepts), combined);
 		}
 
 		var valueIndex = Math.abs(R.path(['indexes', index], serie));
 		var _parentsIndexes = R.pathOr([], ['parentsIndexes', index], serie);
 		var missingParentsIndexes = R.pathOr([], ['missingIndexes', index], serie);
-		var parentsIndexes = addSimpleMissingParentsLines(missingParentsIndexes, _parentsIndexes, entry, onGoingSerie);
-		return addSimpleValueToSerieData(valueIndex, parentsIndexes, entry, onGoingSerie);
-	}, { data: [], coordinates: {}, key: '', sideProps: null, flags: [] }, definition);
 
-	var _getSerieFlagsAndSide = getSerieFlagsAndSideProps(serieCoordinates, coordinatesValidator, attributesValues, customAttributes, metadataCoordinates),
+		var _missingParentsGetter2 = missingParentsGetter(simpleValueDataSetter)(missingParentsIndexes, _parentsIndexes, entry, onGoingSerie),
+		    parentsIndexes = _missingParentsGetter2.parentsIndexes,
+		    missingParents = _missingParentsGetter2.missingParents;
+
+		return addSimpleValueToSerieData(valueIndex, parentsIndexes, entry, onGoingSerie, missingParents);
+	}, { data: [], key: '', attributes: attributesValues }, definition);
+};
+
+var getSerieDataWithMissingLines = function getSerieDataWithMissingLines(serie, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates) {
+	var lines = [];
+
+	var serieCoordinates = getCoordinates(serie.indexes, topCoordinates, definition);
+	var coordinatesValidator = (0, _utils.getLayoutCoordinatesValidator)(serieCoordinates, topCoordinates);
+	var attributesValues = getAttributesSeries(coordinatesValidator, attributesSeries);
+
+	var getMissingParents = function getMissingParents(dataSetter) {
+		return function (missingParentsIndexes, _parentsIndexes, dim, serieData) {
+			return R.reduce(function (acc, index) {
+				var missingParentData = addValueToSerieData(dataSetter)(index, acc.parentsIndexes, dim, serieData);
+				lines.push((0, _extends3.default)({}, R.dissoc('attributes', missingParentData), { sideProps: null, flags: [], isEmpty: true }));
+				return R.over(R.lensProp('parentsIndexes'), R.append(index), acc);
+			}, { parentsIndexes: _parentsIndexes, missingParents: [] }, missingParentsIndexes);
+		};
+	};
+
+	var _getSerieDimensionsDa = getSerieDimensionsData(serie, definition, attributesValues, getMissingParents),
+	    attributes = _getSerieDimensionsDa.attributes,
+	    serieData = (0, _objectWithoutProperties3.default)(_getSerieDimensionsDa, ['attributes']);
+
+	var _getSerieFlagsAndSide = getSerieFlagsAndSideProps(serieCoordinates, coordinatesValidator, attributes, customAttributes, metadataCoordinates),
 	    flags = _getSerieFlagsAndSide.flags,
 	    sideProps = _getSerieFlagsAndSide.sideProps;
 
-	lines.push((0, _extends3.default)({}, serieData, { flags: flags, sideProps: sideProps }));
-	return lines;
+	return R.append((0, _extends3.default)({}, serieData, { flags: flags, sideProps: sideProps }), lines);
+};
+
+exports.getSerieDataWithMissingLines = getSerieDataWithMissingLines;
+var getSerieDataWithoutMissingLines = function getSerieDataWithoutMissingLines(serie, definition, topCoordinates, attributesSeries, customAttributes, metadataCoordinates) {
+	var serieCoordinates = getCoordinates(serie.indexes, topCoordinates, definition);
+	var coordinatesValidator = (0, _utils.getLayoutCoordinatesValidator)(serieCoordinates, topCoordinates);
+	var attributesValues = getAttributesSeries(coordinatesValidator, attributesSeries);
+
+	var getMissingParents = function getMissingParents() {
+		return function (missingParentsIndexes, _parentsIndexes, dim) {
+			return R.reduce(function (acc, index) {
+				return {
+					parentsIndexes: R.append(index, acc.parentsIndexes),
+					missingParents: R.append(R.prop('value', getValueData(index, dim, acc.parentsIndexes)), acc.missingParents)
+				};
+			}, { parentsIndexes: _parentsIndexes, missingParents: [] }, missingParentsIndexes);
+		};
+	};
+
+	var _getSerieDimensionsDa2 = getSerieDimensionsData(serie, definition, attributesValues, getMissingParents),
+	    attributes = _getSerieDimensionsDa2.attributes,
+	    serieData = (0, _objectWithoutProperties3.default)(_getSerieDimensionsDa2, ['attributes']);
+
+	var _getSerieFlagsAndSide2 = getSerieFlagsAndSideProps(serieCoordinates, coordinatesValidator, attributes, customAttributes, metadataCoordinates),
+	    flags = _getSerieFlagsAndSide2.flags,
+	    sideProps = _getSerieFlagsAndSide2.sideProps;
+
+	return (0, _extends3.default)({}, serieData, { flags: flags, sideProps: sideProps });
 };
 
+exports.getSerieDataWithoutMissingLines = getSerieDataWithoutMissingLines;
 var getLayoutData = function getLayoutData(layoutIndexes, layout, _ref) {
 	var metadataCoordinates = _ref.metadataCoordinates,
 	    attributesSeries = _ref.attributesSeries,
@@ -197,7 +237,7 @@ var getLayoutData = function getLayoutData(layoutIndexes, layout, _ref) {
 
 
 	var headerData = R.reduce(function (acc, serie) {
-		var datas = getSerieDatas(serie, layout.header, topCoordinates, attributesSeries, customAttributes, metadataCoordinates);
+		var datas = getSerieDataWithMissingLines(serie, layout.header, topCoordinates, attributesSeries, customAttributes, metadataCoordinates);
 		return R.concat(acc, datas);
 	}, [], header);
 
@@ -206,9 +246,9 @@ var getLayoutData = function getLayoutData(layoutIndexes, layout, _ref) {
 		    sectionSerie = _ref3[0],
 		    rowsSeries = _ref3[1];
 
-		var sectionData = getSerieDatas(sectionSerie, layout.sections, topCoordinates, attributesSeries, customAttributes, metadataCoordinates);
-		return [R.last(sectionData), R.reduce(function (acc, serie) {
-			var datas = getSerieDatas(serie, layout.rows, sectionData.coordinates, attributesSeries, customAttributes, metadataCoordinates);
+		var sectionData = getSerieDataWithoutMissingLines(sectionSerie, layout.sections, topCoordinates, attributesSeries, customAttributes, metadataCoordinates, false);
+		return [sectionData, R.reduce(function (acc, serie) {
+			var datas = getSerieDataWithMissingLines(serie, layout.rows, R.propOr(topCoordinates, 'coordinates', sectionData), attributesSeries, customAttributes, metadataCoordinates);
 			return R.concat(acc, datas);
 		}, [], rowsSeries)];
 	}, sections);

package/lib/rules2/src/table/parseSeriesIndexesHierarchies.js

@@ -13,6 +13,14 @@ var _set = require('babel-runtime/core-js/set');
 
 var _set2 = _interopRequireDefault(_set);
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
@@ -21,76 +29,81 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var registerParsedIndexes = function registerParsedIndexes(_ref, register) {
+  var isSameSerie = _ref.isSameSerie,
+      parsed = (0, _objectWithoutProperties3.default)(_ref, ['isSameSerie']);
+
+  var merged = R.mergeWith(function (a, b) {
+    return R.append(a || [], b);
+  }, parsed, register);
+  return (0, _extends3.default)({}, merged, { isSameSerie: isSameSerie });
+};
+
 var parseSerieIndexesHierarchies = function parseSerieIndexesHierarchies(serieIndexes, previousSerie, dimensions) {
-  var isSameSerie = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var defaultIsSameSerie = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
   return R.addIndex(R.reduce)(function (acc, _valueIndex, dimensionIndex) {
     if (R.is(Array, _valueIndex)) {
-      var previous = R.isEmpty(previousSerie) ? {} : {
-        indexes: R.nth(dimensionIndex, previousSerie.indexes || []),
-        parentsIndexes: R.nth(dimensionIndex, previousSerie.parentsIndexes || []),
-        missingIndexes: R.nth(dimensionIndex, previousSerie.missingIndexes || []),
-        registeredIndexes: R.nth(dimensionIndex, previousSerie.registeredIndexes || [])
-      };
+      var previous = R.isEmpty(previousSerie) ? {} : R.map(R.nth(dimensionIndex), previousSerie);
       var parsed = parseSerieIndexesHierarchies(_valueIndex, previous, R.pathOr([], [dimensionIndex, 'dimensions'], dimensions), acc.isSameSerie);
-      return {
-        parentsIndexes: R.append(parsed.parentsIndexes, acc.parentsIndexes),
-        missingIndexes: R.append(parsed.missingIndexes, acc.missingIndexes),
-        registeredIndexes: R.append(parsed.registeredIndexes, acc.registeredIndexes),
-        isSameSerie: parsed.isSameSerie
-      };
+      return registerParsedIndexes(parsed, acc);
     }
     var valueIndex = Math.abs(_valueIndex);
-    var _parentsIndexes = R.pathOr([], [dimensionIndex, 'values', valueIndex, 'parents'], dimensions);
+    var parents = R.pathOr([], [dimensionIndex, 'values', valueIndex, 'parents'], dimensions);
     var previousIndex = acc.isSameSerie ? R.pathOr(-1, ['indexes', dimensionIndex], previousSerie) : -1;
     var previousRegisteredIndexes = acc.isSameSerie ? R.pathOr(new _set2.default(), ['registeredIndexes', dimensionIndex], previousSerie) : new _set2.default();
     var registeredIndexes = new _set2.default(previousRegisteredIndexes);
 
-    var _R$reduce = R.reduce(function (_acc, ind) {
-      if (previousRegisteredIndexes.has(ind)) {
-        return R.over(R.lensIndex(0), R.append(ind), _acc);
-      } else if (ind > previousIndex && R.pathOr(false, [dimensionIndex, 'values', ind, 'isSelected'], dimensions)) {
-        registeredIndexes.add(ind);
-        return R.over(R.lensIndex(1), R.append(ind), _acc);
+    var _R$reduce = R.reduce(function (_acc, i) {
+      if (previousRegisteredIndexes.has(i)) {
+        return R.over(R.lensProp('presentParentsIndexes'), function (p) {
+          return R.isNil(p) ? [i] : R.append(i, p);
+        }, _acc);
+      } else if (i > previousIndex && R.pathOr(false, [dimensionIndex, 'values', i, 'isSelected'], dimensions)) {
+        registeredIndexes.add(i);
+        return R.over(R.lensProp('missingParentsIndexes'), function (m) {
+          return R.isNil(m) ? [i] : R.append(i, m);
+        }, _acc);
       }
       return _acc;
-    }, [[], []], _parentsIndexes),
-        _R$reduce2 = (0, _slicedToArray3.default)(_R$reduce, 2),
-        parentsIndexes = _R$reduce2[0],
-        missingParentsIndexes = _R$reduce2[1];
+    }, {}, parents),
+        presentParentsIndexes = _R$reduce.presentParentsIndexes,
+        missingParentsIndexes = _R$reduce.missingParentsIndexes;
 
     registeredIndexes.add(valueIndex);
-    return {
-      parentsIndexes: R.append(parentsIndexes, acc.parentsIndexes),
-      missingIndexes: R.append(missingParentsIndexes, acc.missingIndexes),
-      registeredIndexes: R.append(registeredIndexes, acc.registeredIndexes),
-      isSameSerie: acc.isSameSerie && valueIndex === previousIndex
-    };
-  }, { parentsIndexes: [], missingIndexes: [], registeredIndexes: [], isSameSerie: isSameSerie }, serieIndexes);
+    return registerParsedIndexes({ parentsIndexes: presentParentsIndexes, missingIndexes: missingParentsIndexes, registeredIndexes: registeredIndexes, isSameSerie: acc.isSameSerie && valueIndex === previousIndex }, acc);
+  }, { parentsIndexes: [], missingIndexes: [], registeredIndexes: [], isSameSerie: defaultIsSameSerie }, serieIndexes);
 };
 
-var parseSeriesIndexesHierarchies = exports.parseSeriesIndexesHierarchies = function parseSeriesIndexesHierarchies(seriesIndexes, dimensions) {
+var parseSeriesIndexesHierarchies = function parseSeriesIndexesHierarchies(seriesIndexes, dimensions) {
   return R.reduce(function (acc, serieIndexes) {
     var previousSerie = R.last(acc) || {};
 
     var _parseSerieIndexesHie = parseSerieIndexesHierarchies(serieIndexes, previousSerie, dimensions),
-        parentsIndexes = _parseSerieIndexesHie.parentsIndexes,
-        missingIndexes = _parseSerieIndexesHie.missingIndexes,
-        registeredIndexes = _parseSerieIndexesHie.registeredIndexes;
+        isSameSerie = _parseSerieIndexesHie.isSameSerie,
+        parsed = (0, _objectWithoutProperties3.default)(_parseSerieIndexesHie, ['isSameSerie']);
 
-    return R.append({ indexes: serieIndexes, parentsIndexes: parentsIndexes, missingIndexes: missingIndexes, registeredIndexes: registeredIndexes }, acc);
+    return R.append(R.assoc('indexes', serieIndexes, parsed), acc);
   }, [], seriesIndexes);
 };
 
+exports.parseSeriesIndexesHierarchies = parseSeriesIndexesHierarchies;
 var parseLayoutIndexesHierarchies = exports.parseLayoutIndexesHierarchies = function parseLayoutIndexesHierarchies(layoutIndexes, layout) {
   var header = parseSeriesIndexesHierarchies(layoutIndexes.header, layout.header);
-  var sections = R.map(function (_ref) {
-    var _ref2 = (0, _slicedToArray3.default)(_ref, 2),
-        sectionIndexes = _ref2[0],
-        rowsIndexes = _ref2[1];
+  var sections = R.pipe(R.transpose, function (_ref2) {
+    var _ref3 = (0, _slicedToArray3.default)(_ref2, 2),
+        _sections = _ref3[0],
+        _sectionsRows = _ref3[1];
 
-    return [{ indexes: sectionIndexes, parentsIndexes: [], missingIndexes: [] }, parseSeriesIndexesHierarchies(rowsIndexes, layout.rows)];
-  }, layoutIndexes.sections);
+    if (R.isNil(_sections)) {
+      return [];
+    }
+    var sections = parseSeriesIndexesHierarchies(_sections, layout.sections);
+    var sectionsRows = R.map(function (rows) {
+      return parseSeriesIndexesHierarchies(rows, layout.rows);
+    }, _sectionsRows);
+    return R.transpose([sections, sectionsRows]);
+  })(layoutIndexes.sections);
 
   return { header: header, sections: sections };
 };

package/package.json

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

package/src/rules/src/get-values-enhanced.js

@@ -1,6 +1,6 @@
 import * as R from 'ramda';
 import dateFns from 'date-fns';
-import { getCodeOrder, getRefinedName } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getCodeOrder } from '@sis-cc/dotstatsuite-sdmxjs';
 import { getIsHidden } from './sdmx-data';
 import {
   getReportedTimePeriodLabel,
@@ -21,18 +21,18 @@ const getId = (value, fallbackId) => {
 
 const getName =
   ({ isTimeDimension, options, locale, start, reportYearStart }) =>
-  (value) => {
-    if (!isTimeDimension) return getRefinedName(value);
-    return getReportedTimePeriodLabel(
-      options.frequency,
-      options.timeFormat,
-      locale,
-    )(reportYearStart, {
-      id: value.id,
-      reportedStart: start,
-      start: new Date(value.start),
-    });
-  };
+    (value) => {
+      if (!isTimeDimension) return R.prop('name')(value);
+      return getReportedTimePeriodLabel(
+        options.frequency,
+        options.timeFormat,
+        locale,
+      )(reportYearStart, {
+        id: value.id,
+        reportedStart: start,
+        start: new Date(value.start),
+      });
+    };
 
 export const getValuesEnhanced = ({
   locale = '',
@@ -115,23 +115,23 @@ const defaultSorts = [byIndexPosition, byOrder];
 
 const getTimePeriodAttributes =
   ({ reportYearStart, options }) =>
-  (value) => {
-    const reported = getReportedTimePeriod(
-      reportYearStart,
-      value,
-      options.frequency,
-    );
-    const start = reported.start;
-    const end = reported.end;
-    const reportTimeNote = getReportedTimePeriodNote(
-      reportYearStart,
-      start,
-      end,
-      options.frequency,
-      options.isRtl,
-    );
-    const notes = R.isNil(reportTimeNote)
-      ? []
-      : R.append(reportTimeNote, []);
-    return { start, notes };
-  };
+    (value) => {
+      const reported = getReportedTimePeriod(
+        reportYearStart,
+        value,
+        options.frequency,
+      );
+      const start = reported.start;
+      const end = reported.end;
+      const reportTimeNote = getReportedTimePeriodNote(
+        reportYearStart,
+        start,
+        end,
+        options.frequency,
+        options.isRtl,
+      );
+      const notes = R.isNil(reportTimeNote)
+        ? []
+        : R.append(reportTimeNote, []);
+      return { start, notes };
+    };

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

@@ -1,6 +1,5 @@
 import * as R from 'ramda';
 import {
-  getRefinedName,
   isTimePeriodDimension,
 } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
@@ -17,7 +16,7 @@ const TIME_PERIOD_ID = 'TIME_PERIOD';
 export const dataTransformer = (dataNew, options = {}) => {
   const { locale, hiddenIds: _hiddenIds } = options;
   const reportYearStart = getReportingYearStart(dataNew);
-
+  const getName = R.prop('name')
   //---------------------------------------------------------------------------------------Annotations
   const getStructure = R.pathOr({}, ['data', 'structure']);
   const structure = getStructure(dataNew);
@@ -42,7 +41,7 @@ export const dataTransformer = (dataNew, options = {}) => {
 
   const resHeader = {
     ...meta,
-    sender: { ...sender, name: getRefinedName(sender) },
+    sender: { ...sender, name: getName(sender) },
   };
 
   //----------------------------------------------------------------------------------------Attributes
@@ -59,7 +58,7 @@ export const dataTransformer = (dataNew, options = {}) => {
       __index: index,
       display:
         !R.has(observation.id, hiddenIds) && !getIsHidden(obsAnnotations),
-      name: getRefinedName(observation),
+      name: getName(observation),
       values: getValuesEnhanced({
         locale,
         annotations,
@@ -78,7 +77,7 @@ export const dataTransformer = (dataNew, options = {}) => {
     return {
       ...attr,
       display: !R.has(attr.id, hiddenIds) && !getIsHidden(attrAnnotations),
-      name: getRefinedName(attr),
+      name: getName(attr),
       values: getValuesEnhanced({
         locale,
         annotations,
@@ -131,7 +130,7 @@ export const dataTransformer = (dataNew, options = {}) => {
             ...observation,
             display: !isHidden,
             __index: obsIndex,
-            name: getRefinedName(observation),
+            name: getName(observation),
             values: _idHidden ? [] : values,
             role: isTimeDimension
               ? TIME_PERIOD_ID
@@ -151,7 +150,7 @@ export const dataTransformer = (dataNew, options = {}) => {
     getObservations(locale)(dimObservations);
   const resStructure = {
     ...structure,
-    name: getRefinedName({ ...structure, id: options.dataflowId }),
+    name: getName({ ...structure, id: options.dataflowId }),
     annotations,
     attributes: resAttributes,
     dimensions: { observation },

package/src/rules2/src/index.js

@@ -3,7 +3,6 @@ export {
   SDMX_3_0_CSV_DATA_FORMAT
 } from './constants';
 
-export { getSidebarData } from './getSidebarData';
 export { parseMetadataSeries } from './parseMetadataSeries';
 export { sdmx_3_0_DataFormatPatch } from './sdmx3.0DataFormatPatch';
 export { getDataflowTooltipAttributesIds } from './getDataflowTooltipAttributesIds';

package/src/rules2/src/parseMetadataSeries.js

@@ -1,13 +1,12 @@
 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') {
     return R.prop('id', data);
   }
-  const name = getRefinedName(data);
-  if (display ===  'both') {
+  const name = R.prop('name')(data);
+  if (display === 'both') {
     return `${R.prop('id', data)}: ${name}`;
   }
   return name;
@@ -110,9 +109,9 @@ export const parseMetadataSeries = (metadataJson, options) => {
 
       return R.assoc(evolvedKey, attributes, acc);
     },
-    {},
-    R.keys(series)
-  ))(metadataJson);
+      {},
+      R.keys(series)
+    ))(metadataJson);
 
   return metadataSeries;
 };