@sis-cc/dotstatsuite-components 16.1.1 → 16.1.2

package/lib/rules2/src/constants.js

@@ -7,4 +7,5 @@ var SDMX_3_0_JSON_DATA_FORMAT = exports.SDMX_3_0_JSON_DATA_FORMAT = 'application
 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';
+var REPYEARSTART = exports.REPYEARSTART = 'REPYEARSTART';
+var REJECTED_VALUE_IDS = exports.REJECTED_VALUE_IDS = ['_L', '_T', '_Z'];

package/lib/rules2/src/enhanceObservations.js

@@ -15,6 +15,8 @@ var R = _interopRequireWildcard(_ramda);
 
 var _formatValue = require('../../rules/src/preparators/formatValue');
 
+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 }; }
@@ -25,11 +27,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       decimals: id,
       prefscale: id,
     },
-    rejectedValueIds,
   }
 */
 
-var parseAttributesValues = function parseAttributesValues(obs, attributes, indexedDimensions, rejectedValueIds) {
+var parseAttributesValues = function parseAttributesValues(obs, attributes, indexedDimensions) {
   var attrValuesIndexes = obs.attrValuesIndexes,
       dimValuesIndexes = obs.dimValuesIndexes;
 
@@ -39,7 +40,7 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
       return acc;
     }
     var value = R.nth(valueIndex, attribute.values || []);
-    if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), rejectedValueIds)) {
+    if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), _constants.REJECTED_VALUE_IDS)) {
       value = null;
     }
     var relationship = R.propOr([], 'relationship', attribute);
@@ -90,7 +91,7 @@ var enhanceObservations = exports.enhanceObservations = function enhanceObservat
     }, {}, dimensions);
 
     return (0, _extends3.default)({}, observation, {
-      attributes: parseAttributesValues(observation, attributes, indexedDimensions, R.propOr([], 'rejectedValueIds', options)),
+      attributes: parseAttributesValues(observation, attributes, indexedDimensions),
       formattedValue: (0, _formatValue.formatValue)(observation, formatAttributesIndexes, attributes),
       indexedDimValIds: indexedDimValIds
     });

package/lib/rules2/src/getAttributesSeries.js

@@ -19,6 +19,13 @@ var getAttributesSeries = exports.getAttributesSeries = function getAttributesSe
     var rejected = acc.rejected;
     R.forEachObjIndexed(function (attribute) {
       if (!R.isNil(attribute.serieKey)) {
+        if (R.isNil(attribute.value)) {
+          res = R.dissocPath([attribute.serieKey, attribute.id], res);
+          rejected = R.assocPath([attribute.serieKey, attribute.id], true, rejected);
+        }
+        if (R.path([attribute.serieKey, attribute.id], rejected)) {
+          return;
+        }
         var valueInRes = R.path([attribute.serieKey, attribute.id, 'value', 'id'], res);
         if (!R.isNil(valueInRes) && valueInRes !== R.path(['value', 'id'], attribute)) {
           res = R.dissocPath([attribute.serieKey, attribute.id], res);

package/lib/rules2/src/getCombinationDefinitions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCombinationDefinitions = undefined;
+exports.getCombinationDefinitions = exports.parseCombinationDefinition = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -17,16 +17,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var getCombinationDefinitions = exports.getCombinationDefinitions = function getCombinationDefinitions(annotations, locale) {
-  var annotation = R.find(function (annot) {
-    return annot.type === 'COMBINED_CONCEPTS';
-  }, annotations);
-  if (R.isNil(annotation)) {
-    return [];
-  }
-  var title = R.propOr('', 'title', annotation);
-  var texts = R.propOr({}, 'texts', annotation);
-
+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);
@@ -45,4 +36,17 @@ var getCombinationDefinitions = exports.getCombinationDefinitions = function get
       };
     }, titles);
   }, [R.split(';'), R.map(R.split(';'))])(title, texts);
+};
+
+var getCombinationDefinitions = exports.getCombinationDefinitions = function getCombinationDefinitions(annotations, locale) {
+  var annotation = R.find(function (annot) {
+    return annot.type === 'COMBINED_CONCEPTS';
+  }, annotations);
+  if (R.isNil(annotation)) {
+    return [];
+  }
+  var title = R.propOr('', 'title', annotation);
+  var texts = R.propOr({}, 'texts', annotation);
+
+  return parseCombinationDefinition(title, texts);
 };

package/lib/rules2/src/getDataflowAttributes.js

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDataflowAttributes = undefined;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+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 }; }
+
+var getDataflowAttributes = exports.getDataflowAttributes = function getDataflowAttributes(attributes, combinations) {
+  var combinationsConceptsIds = R.pipe(R.pluck('concepts'), R.unnest)(combinations);
+  return R.reduce(function (acc, attribute) {
+    if (!R.prop('header', attribute) || !R.isEmpty(attribute.relationship) || R.includes(attribute.id, combinationsConceptsIds)) {
+      return acc;
+    }
+    var value = R.head(attribute.values);
+    if (!R.propOr(true, 'display', attribute) || R.isNil(value) || !R.propOr(true, 'display', value) || R.includes(R.prop('id', value), _constants.REJECTED_VALUE_IDS)) {
+      return acc;
+    }
+    return R.assoc(attribute.id, (0, _extends3.default)({}, R.pick(['id', 'name'], attribute), { value: value }), acc);
+  }, {}, attributes);
+};

package/lib/rules2/src/getHeaderTitle.js

@@ -0,0 +1,29 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getHeaderTitle = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+var _src = require('../../rules/src');
+
+var _getFlagsAndNotes = require('./table/getFlagsAndNotes');
+
+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 getHeaderTitle = exports.getHeaderTitle = function getHeaderTitle(dataflow, attributes, display, customAttributes) {
+  return {
+    label: (0, _src.dimensionValueDisplay)(display)(dataflow),
+    flags: R.pipe(_getFlagsAndNotes.getFlagsAndNotes, R.map(function (entry) {
+      return {
+        code: entry.code,
+        header: (0, _src.dimensionValueDisplay)(display)(entry) + ':',
+        label: (0, _src.dimensionValueDisplay)(display)(entry.value)
+      };
+    }))(attributes, customAttributes)
+  };
+};

package/lib/rules2/src/getOneValueDimensions.js

@@ -17,6 +17,8 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
+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 }; }
@@ -27,7 +29,7 @@ var getOneValueDimensions = exports.getOneValueDimensions = function getOneValue
       return acc;
     }
     var value = R.path(['values', 0], attr);
-    if (R.isNil(value) || !R.prop('display', value)) {
+    if (R.isNil(value) || !R.prop('display', value) || R.includes(R.prop('id', value), _constants.REJECTED_VALUE_IDS)) {
       return acc;
     }
     var dim = R.head(attr.relationship);

package/lib/rules2/src/getSidebarData.js

@@ -13,23 +13,14 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
+var _src = require('../../rules/src');
+
+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 }; }
 
-var dimensionValueDisplay = function dimensionValueDisplay(display) {
-  return function (data) {
-    var name = R.isNil(data.name) ? '[' + data.id + ']' : data.name;
-    if (display === 'code') {
-      return R.prop('id', data);
-    }
-    if (display === 'both') {
-      return R.prop('id', data) + ': ' + name;
-    }
-    return name;
-  };
-};
-
 var sortByCoordinates = function sortByCoordinates(a, b) {
   var splitACoord = a.splitCoord;
   var splitBCoord = b.splitCoord;
@@ -65,11 +56,11 @@ var getSidebarData = exports.getSidebarData = function getSidebarData(attributes
       var dim = R.nth(dimIndex, dimensions);
       var values = R.propOr([], 'values', dim || {});
       var value = R.nth(Number(valIndex), values);
-      if (!value || !R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value)) {
+      if (!value || !R.propOr(true, 'display', dim) || !R.propOr(true, 'display', value) || R.includes(R.prop('id', value), _constants.REJECTED_VALUE_IDS)) {
         return (0, _extends3.default)({}, acc, { split: R.append('', acc.split) });
       }
-      var dimLabel = dimensionValueDisplay(options.display)(dim);
-      var valLabel = dimensionValueDisplay(options.display)(value);
+      var dimLabel = (0, _src.dimensionValueDisplay)(options.display)(dim);
+      var valLabel = (0, _src.dimensionValueDisplay)(options.display)(value);
       return {
         labels: R.append(dimLabel + ': ' + valLabel, acc.labels),
         split: R.append(valIndex, acc.split)
@@ -78,7 +69,7 @@ var getSidebarData = exports.getSidebarData = function getSidebarData(attributes
         split = _R$addIndex.split,
         labels = _R$addIndex.labels;
 
-    var label = R.isEmpty(labels) ? dimensionValueDisplay(options.display)(dataflow) : R.join(' - ', labels);
+    var label = R.isEmpty(labels) ? (0, _src.dimensionValueDisplay)(options.display)(dataflow) : R.join(' - ', labels);
 
     return {
       id: R.join(':', split),

package/lib/rules2/src/index.js

@@ -220,6 +220,24 @@ Object.defineProperty(exports, 'getOneValueDimensions', {
   }
 });
 
+var _getDataflowAttributes = require('./getDataflowAttributes');
+
+Object.defineProperty(exports, 'getDataflowAttributes', {
+  enumerable: true,
+  get: function get() {
+    return _getDataflowAttributes.getDataflowAttributes;
+  }
+});
+
+var _getHeaderTitle = require('./getHeaderTitle');
+
+Object.defineProperty(exports, 'getHeaderTitle', {
+  enumerable: true,
+  get: function get() {
+    return _getHeaderTitle.getHeaderTitle;
+  }
+});
+
 var _getHeaderSubtitle = require('./getHeaderSubtitle');
 
 Object.defineProperty(exports, 'getHeaderSubtitle', {
@@ -292,6 +310,15 @@ Object.defineProperty(exports, 'getCellsAttributesIds', {
   }
 });
 
+var _getCellsMetadataCoordinates = require('./table/getCellsMetadataCoordinates');
+
+Object.defineProperty(exports, 'getCellsMetadataCoordinates', {
+  enumerable: true,
+  get: function get() {
+    return _getCellsMetadataCoordinates.getCellsMetadataCoordinates;
+  }
+});
+
 var _getIndexedCombinationsByDisplay = require('./table/getIndexedCombinationsByDisplay');
 
 Object.defineProperty(exports, 'getIndexedCombinationsByDisplay', {

package/lib/rules2/src/parseCombinations.js

@@ -37,16 +37,18 @@ var parseCombinations = exports.parseCombinations = function parseCombinations(c
         relationship = R.length(values) > 1 ? R.append(concept, relationship) : relationship;
         ids = (0, _extends4.default)({}, ids, (0, _defineProperty3.default)({}, concept, concept));
         return R.length(values) > 1;
+      } else if (!R.has(concept, indexedAttributes)) {
+        return false;
       }
       var attribute = R.prop(concept, indexedAttributes);
       relationship = attribute.series ? 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;
-      return true;
+      return attribute.series;
     }, comb.concepts);
 
-    if (R.isEmpty(seriesConcepts) || R.isEmpty(relationship)) {
+    if (R.isEmpty(seriesConcepts)) {
       return (0, _extends4.default)({}, comb, { header: true });
     }
     return (0, _extends4.default)({}, comb, { series: true, relationship: relationship });

package/lib/rules2/src/prepareData.js

@@ -35,14 +35,35 @@ var _hierarchiseDimensionWithNativeHierarchy = require('./hierarchiseDimensionWi
 
 var _hierarchiseDimensionWithAdvancedHierarchy = require('./hierarchiseDimensionWithAdvancedHierarchy');
 
+var _getDataflowAttributes = require('./getDataflowAttributes');
+
+var _getHeaderTitle = require('./getHeaderTitle');
+
+var _getHeaderSubtitle = require('./getHeaderSubtitle');
+
+var _getHeaderCombinations = require('./getHeaderCombinations');
+
 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 prepareData = exports.prepareData = function prepareData(sdmxJson, customAttributes, locale, hierarchies) {
+var prepareData = exports.prepareData = function prepareData(sdmxJson, _ref) {
+  var customAttributes = _ref.customAttributes,
+      locale = _ref.locale,
+      hierarchies = _ref.hierarchies,
+      dataflow = _ref.dataflow,
+      display = _ref.display,
+      defaultCombinations = _ref.defaultCombinations;
+
   var dimensions = R.pathOr([], ['data', 'structure', 'dimensions', 'observation'], sdmxJson);
   var attributes = R.pathOr([], ['data', 'structure', 'attributes', 'observation'], sdmxJson);
   var annotations = R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson);
   var observations = (0, _src.getObservations)(sdmxJson);
   var combinations = (0, _getCombinationDefinitions.getCombinationDefinitions)(annotations, locale);
+  if (R.isEmpty(combinations) && !R.isEmpty(defaultCombinations)) {
+    var concepts = defaultCombinations.concepts,
+        names = defaultCombinations.names;
+
+    combinations = (0, _getCombinationDefinitions.parseCombinationDefinition)(concepts, names);
+  }
   var metadataCoordinates = (0, _getMetadataCoordinates.getMetadataCoordinates)(sdmxJson);
 
   var parsedAttributes = (0, _parseAttributes.parseAttributes)(attributes, dimensions, customAttributes);
@@ -62,6 +83,11 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   }, manyValuesDimensions);
   var duplicatedObservations = (0, _duplicateObservations.duplicateObs)(R.values(hierarchisedDimensions), enhancedObservations);
 
+  var dataflowAttributes = (0, _getDataflowAttributes.getDataflowAttributes)(parsedAttributes, parsedCombinations);
+  var headerTitle = (0, _getHeaderTitle.getHeaderTitle)(dataflow, dataflowAttributes, display, customAttributes);
+  var headerSubtitle = (0, _getHeaderSubtitle.getHeaderSubtitle)(oneValueDimensions, parsedCombinations, customAttributes, display);
+  var headerCombinations = (0, _getHeaderCombinations.getHeaderCombinations)(parsedCombinations, oneValueDimensions, refinedAttributes, display);
+
   return {
     observations: duplicatedObservations,
     dimensions: hierarchisedDimensions,
@@ -69,6 +95,11 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
     oneValueDimensions: oneValueDimensions,
     attributesSeries: attributesSeries,
     metadataCoordinates: metadataCoordinates,
-    attributes: refinedAttributes
+    attributes: refinedAttributes,
+    header: {
+      title: headerTitle,
+      subtitle: headerSubtitle,
+      combinations: headerCombinations
+    }
   };
 };

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

@@ -25,6 +25,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var getCellRelevantAttributes = exports.getCellRelevantAttributes = function getCellRelevantAttributes(attributes, attributesSeries, cellAttributeIds) {
   return R.filter(function (attr) {
+    if (R.isNil(attr.value)) {
+      return false;
+    }
     if (R.has(attr.id, cellAttributeIds)) {
       return true;
     }
@@ -56,9 +59,8 @@ var getCells = exports.getCells = function getCells(customAttributes, cellsAttri
 
     return R.mapObjIndexed(function (obs) {
       var relevantAttributes = getCellRelevantAttributes(obs.attributes, attributesSeries, cellsAttributesId);
-      var flagsAndNotes = (0, _getFlagsAndNotes.getFlagsAndNotes)(relevantAttributes, _customAttributes);
+      var flagsAndNotes = (0, _getFlagsAndNotes.getFlagsAndNotes)(R.omit(attributesInCellsCombination, relevantAttributes), _customAttributes);
       var combinedAttributes = getCellCombinedAttributes(relevantAttributes, combinations.cells || []);
-
       var hasAdvancedAttributes = R.pipe(R.omit(R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination])), R.isEmpty, R.not)(relevantAttributes);
 
       var hasMetadata = (0, _hasCellMetadata.hasCellMetadata)(metadataCoordinates, obs.indexedDimValIds);

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

@@ -0,0 +1,30 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCellsMetadataCoordinates = undefined;
+
+var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
+
+var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
+
+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 getCellsMetadataCoordinates = exports.getCellsMetadataCoordinates = function getCellsMetadataCoordinates(metadataCoordinates, oneValueDimensions, layoutIds) {
+  var oneValueDimsIds = R.pluck('id', oneValueDimensions);
+  return R.reject(function (coordinates) {
+    var columnIds = R.concat(layoutIds.header, oneValueDimsIds);
+    if (R.isEmpty(R.omit(columnIds, coordinates))) {
+      return true;
+    }
+    var rowsIds = [].concat((0, _toConsumableArray3.default)(layoutIds.sections), (0, _toConsumableArray3.default)(layoutIds.rows), (0, _toConsumableArray3.default)(oneValueDimsIds));
+    return R.isEmpty(R.omit(rowsIds, coordinates));
+  }, metadataCoordinates);
+};

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

@@ -26,16 +26,17 @@ var getCombinationDimensionsData = exports.getCombinationDimensionsData = functi
     var dimension = R.nth(dimIndex, dimensions);
     var value = R.nth(Math.abs(valIndex), R.propOr([], 'values', dimension));
     hasAdvancedAttributes = !hasAdvancedAttributes ? value.hasAdvancedAttributes : true;
-    if (!value) {
-      return acc;
-    }
     coordinates = R.assoc(dimension.id, value.id, coordinates);
     ids = R.append(dimension.id + '=' + value.id, ids);
     var previousValue = R.propOr({}, dimension.id, previous);
     if (value.id === R.prop('id', previousValue || {}) && _sameSerie) {
       return R.assoc(dimension.id, previousValue, acc);
     } else {
-      var parsedValue = (0, _parseValueHierarchy.parseValueHierarchy)(value, _sameSerie ? previousValue || {} : {}, dimension.indexedValues);
+      var _parsedValue = (0, _parseValueHierarchy.parseValueHierarchy)(value, _sameSerie ? previousValue || {} : {}, dimension.indexedValues);
+      var parsedValue = R.over(R.lensProp('display'), function () {
+        var display = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+        return display && R.propOr(true, 'display', dimension);
+      })(_parsedValue);
       if (!R.isNil(previous)) {
         _sameSerie = false;
       }

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

@@ -29,6 +29,8 @@ var _getCombinationDimensionsData = require('./getCombinationDimensionsData');
 
 var _parseValueHierarchy = require('./parseValueHierarchy');
 
+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 }; }
@@ -36,7 +38,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
   var metadataCoordinates = _ref.metadataCoordinates,
       attributesSeries = _ref.attributesSeries,
-      customAttributes = _ref.customAttributes;
+      customAttributes = _ref.customAttributes,
+      _ref$topCoordinates = _ref.topCoordinates,
+      topCoordinates = _ref$topCoordinates === undefined ? {} : _ref$topCoordinates;
 
   var getHasAdvancedAttributes = function getHasAdvancedAttributes(attrValues) {
     return R.pipe(R.omit(R.concat(customAttributes.flags, customAttributes.notes)), R.isEmpty, R.not)(attrValues);
@@ -68,7 +72,7 @@ var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
     var sameSerie = true;
     var i = 0;
     var hasAdvancedAttributes = false;
-    var coordinates = {};
+    var coordinates = topCoordinates;
     var ids = [];
     while (i < serie.length) {
       var entry = serie[i];
@@ -137,7 +141,11 @@ var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
       var fixedDimValues = R.propOr([], 'fixedDimValues', def);
       var values = R.reduce(function (_acc, id) {
         if (R.has(id, dimValues)) {
-          return R.append(R.prop(id, dimValues), _acc);
+          var _value = R.prop(id, dimValues);
+          if (!R.propOr(true, 'display', _value) || R.includes(R.prop('id', _value), _constants.REJECTED_VALUE_IDS)) {
+            return _acc;
+          }
+          return R.append(R.dissoc('display', _value), _acc);
         }
         if (R.has(id, fixedDimValues)) {
           return R.append(R.prop(id, fixedDimValues), _acc);
@@ -162,7 +170,7 @@ var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
     var sideProps = hasMetadata || hasAdvancedAttributes ? { hasMetadata: hasMetadata, hasAdvancedAttributes: hasAdvancedAttributes, coordinates: coordinates } : null;
 
     return {
-      res: R.append({ data: data, key: R.join(':', ids), flags: flags, sideProps: sideProps }, acc.res),
+      res: R.append({ data: data, key: R.join(':', ids), flags: flags, sideProps: sideProps, coordinates: coordinates }, acc.res),
       previous: next
     };
   }, { res: [], previous: [] }, series),
@@ -190,8 +198,9 @@ var getLayoutData = function getLayoutData(layoutIndexes, layout, _ref2) {
       return [];
     }
     var _sectionsData = getSubLayoutData(sections, layout.sections, opts);
-    var rowsData = R.map(function (rows) {
-      return getSubLayoutData(rows, layout.rows, opts);
+    var rowsData = R.addIndex(R.map)(function (rows, sectionIndex) {
+      var sectionCoordinates = R.path([sectionIndex, 'coordinates'], _sectionsData);
+      return getSubLayoutData(rows, layout.rows, R.assoc('topCoordinates', sectionCoordinates, opts));
     }, sectionsRows);
 
     return R.transpose([_sectionsData, rowsData]);

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

@@ -34,19 +34,20 @@ var parseValueHierarchy = exports.parseValueHierarchy = function parseValueHiera
   }, parentsIds),
       _R$addIndex2 = (0, _slicedToArray3.default)(_R$addIndex, 2),
       presentIds = _R$addIndex2[0],
-      missingIds = _R$addIndex2[1];
-  //console.log({ presentIds, missingIds });
-
-
+      _missingIds = _R$addIndex2[1];
+
+  var __previousParentsIds = R.pipe(R.propOr([], 'parents'), R.pluck('id'))(previousValue);
+  var missingIds = R.pipe(R.takeLastWhile(function (id) {
+    return !R.includes(id, __previousParentsIds) && id !== R.prop('id', previousValue);
+  }), function (ids) {
+    return R.concat(ids, _missingIds);
+  })(presentIds);
   var _previousParents = R.propOr([], 'parents', previousValue);
   var previousParents = R.isNil(previousValue) ? [] : R.append(R.pick(['id', 'name'], previousValue), _previousParents);
-  //console.log('previousParents', previousParents);
   var parents = R.takeWhile(function (p) {
     return R.includes(p.id, presentIds);
   }, previousParents);
-  var missingParents = R.concat(R.includes(R.prop('id', previousValue), presentIds) ? [] : R.takeWhile(function (p) {
-    return R.includes(p.id, presentIds);
-  }, R.propOr([], 'missingParents', previousValue)), R.props(missingIds, indexedValues));
+  var missingParents = R.props(missingIds, indexedValues);
   return (0, _extends3.default)({}, value, {
     parents: parents,
     parentsIds: parentsIds,

package/package.json

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

package/src/rules2/src/constants.js

@@ -3,3 +3,4 @@ export const SDMX_3_0_CSV_DATA_FORMAT = 'application/vnd.sdmx.data+csv;version=2
 export const EMPTY_ATTACHMENT_LEVEL_CHAR = '~';
 export const REPORTING_YEAR_START_DAY = 'REPORTING_YEAR_START_DAY';
 export const REPYEARSTART = 'REPYEARSTART';
+export const REJECTED_VALUE_IDS = ['_L', '_T', '_Z'];

package/src/rules2/src/enhanceObservations.js

@@ -1,5 +1,6 @@
 import * as R from 'ramda';
 import { formatValue } from '../../rules/src/preparators/formatValue';
+import { REJECTED_VALUE_IDS } from './constants';
 
 /*
   options = {
@@ -7,11 +8,10 @@ import { formatValue } from '../../rules/src/preparators/formatValue';
       decimals: id,
       prefscale: id,
     },
-    rejectedValueIds,
   }
 */
 
-const parseAttributesValues = (obs, attributes, indexedDimensions, rejectedValueIds) => {
+const parseAttributesValues = (obs, attributes, indexedDimensions) => {
   const { attrValuesIndexes, dimValuesIndexes } = obs;
   return R.addIndex(R.reduce)(
     (acc, valueIndex, attrIndex) => {
@@ -20,7 +20,7 @@ const parseAttributesValues = (obs, attributes, indexedDimensions, rejectedValue
         return acc;
       }
       let value = R.nth(valueIndex, attribute.values || []);
-      if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), rejectedValueIds)) {
+      if (!R.propOr(true, 'display', value) || R.includes(R.prop('id', value), REJECTED_VALUE_IDS)) {
         value = null;
       }
       const relationship = R.propOr([], 'relationship', attribute);
@@ -78,7 +78,7 @@ export const enhanceObservations = (dimensions = [], observations = {}, attribut
 
       return ({
         ...observation,
-        attributes: parseAttributesValues(observation, attributes, indexedDimensions, R.propOr([], 'rejectedValueIds', options)),
+        attributes: parseAttributesValues(observation, attributes, indexedDimensions),
         formattedValue: formatValue(observation, formatAttributesIndexes, attributes),
         indexedDimValIds,
       });

package/src/rules2/src/getAttributesSeries.js

@@ -9,6 +9,13 @@ export const getAttributesSeries = observations => R.pipe(
       R.forEachObjIndexed(
         (attribute) => {
           if (!R.isNil(attribute.serieKey)) {
+            if (R.isNil(attribute.value)) {
+              res = R.dissocPath([attribute.serieKey, attribute.id], res);
+              rejected = R.assocPath([attribute.serieKey, attribute.id], true, rejected);
+            }
+            if (R.path([attribute.serieKey, attribute.id], rejected)) {
+              return ;
+            }
             const valueInRes = R.path([attribute.serieKey, attribute.id, 'value', 'id'], res);
             if (!R.isNil(valueInRes) && valueInRes !== R.path(['value', 'id'], attribute)) {
               res = R.dissocPath([attribute.serieKey, attribute.id], res);

package/src/rules2/src/getCombinationDefinitions.js

@@ -1,5 +1,24 @@
 import * as R from 'ramda';
 
+export const parseCombinationDefinition = (title, texts) => R.useWith(
+  (titles, texts) =>
+    R.addIndex(R.map)((title, index) => {
+      const split = R.split(':', title);
+      if (R.length(split !== 2)) {
+        return null;
+      }
+      const [id, codes] = split;
+      return {
+        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);
+
 export const getCombinationDefinitions = (annotations, locale) => {
   const annotation = R.find(annot => annot.type === 'COMBINED_CONCEPTS', annotations);
   if (R.isNil(annotation)) {
@@ -8,22 +27,5 @@ export const getCombinationDefinitions = (annotations, locale) => {
   const title = R.propOr('', 'title', annotation);
   const texts = R.propOr({}, 'texts', annotation);
 
-  return R.useWith(
-    (titles, texts) =>
-      R.addIndex(R.map)((title, index) => {
-        const split = R.split(':', title);
-        if (R.length(split !== 2)) {
-          return null;
-        }
-        const [id, codes] = split;
-        return {
-          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);
+  return parseCombinationDefinition(title, texts);
 };