@sis-cc/dotstatsuite-components 13.2.0 → 13.4.0

package/lib/rules/src/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OBS_TYPE_STRING = exports.OBS_TYPE_NUMERICAL_STRING = exports.OBS_TYPE_NUMBER = exports.V8_SDMX_JSON = exports.DEFAULT_MAJOR_ATTRIBUTES = exports.DIMENSION_DISPLAY_PARTS = exports.DEFAULT_REJECTED_SUBTITLE_IDS = exports.DEFAULT_REJECTED_UPR_VALUES_IDS = exports.DEFAULT_UPR_IDS = exports.FREQ_M = exports.FREQ_Q = exports.FREQ_S = exports.FREQ_A = exports.TYPES = exports.VALUES = exports.PERCENT = exports.CHORO = exports.STACKED_ROW = exports.STACKED_BAR = exports.V_SYMBOL = exports.H_SYMBOL = exports.TIMELINE = exports.SCATTER = exports.ROW = exports.BAR = undefined;
+exports.REPYEARSTART = exports.REPORTING_YEAR_START_DAY = exports.OBS_TYPE_STRING = exports.OBS_TYPE_NUMERICAL_STRING = exports.OBS_TYPE_NUMBER = exports.V8_SDMX_JSON = exports.DEFAULT_MAJOR_ATTRIBUTES = exports.DIMENSION_DISPLAY_PARTS = exports.DEFAULT_REJECTED_SUBTITLE_IDS = exports.DEFAULT_REJECTED_UPR_VALUES_IDS = exports.DEFAULT_UPR_IDS = exports.FREQ_M = exports.FREQ_Q = exports.FREQ_S = exports.FREQ_A = exports.TYPES = exports.VALUES = exports.PERCENT = exports.CHORO = exports.STACKED_ROW = exports.STACKED_BAR = exports.V_SYMBOL = exports.H_SYMBOL = exports.TIMELINE = exports.SCATTER = exports.ROW = exports.BAR = undefined;
 
 var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
 
@@ -63,4 +63,6 @@ var V8_SDMX_JSON = exports.V8_SDMX_JSON = "application/vnd.sdmx.data+json;versio
 
 var OBS_TYPE_NUMBER = exports.OBS_TYPE_NUMBER = 'OBS_TYPE_NUMBER';
 var OBS_TYPE_NUMERICAL_STRING = exports.OBS_TYPE_NUMERICAL_STRING = 'OBS_TYPE_NUMERICAL_STRING';
-var OBS_TYPE_STRING = exports.OBS_TYPE_STRING = 'OBS_TYPE_STRING';
+var OBS_TYPE_STRING = exports.OBS_TYPE_STRING = 'OBS_TYPE_STRING';
+var REPORTING_YEAR_START_DAY = exports.REPORTING_YEAR_START_DAY = 'REPORTING_YEAR_START_DAY';
+var REPYEARSTART = exports.REPYEARSTART = 'REPYEARSTART';

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/getReportingYearStart.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 }; }
@@ -32,7 +34,11 @@ var getReportingYearStart = exports.getReportingYearStart = function getReportin
     return [].concat((0, _toConsumableArray3.default)(dataSet), (0, _toConsumableArray3.default)(observation), (0, _toConsumableArray3.default)(series));
   })(sdmxJson);
 
-  var reportYearStartAttr = R.find(R.propEq('id', 'REPORTING_YEAR_START_DAY'), attributes) || {};
+  var reportYearStartAttr = R.find(function (_ref2) {
+    var id = _ref2.id;
+
+    return id === _constants.REPORTING_YEAR_START_DAY || id === _constants.REPYEARSTART;
+  }, attributes) || {};
   var reportYearStart = R.pathOr('--01-01', ['values', 0, 'name'], reportYearStartAttr);
 
   var _R$match = R.match(/[\d]{2}/g, reportYearStart),

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

@@ -9,6 +9,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; } }
 
 var registerAttrId = function registerAttrId(path, id) {
@@ -63,6 +65,7 @@ var parseAttributes = exports.parseAttributes = function parseAttributes(_ref) {
     if (R.isEmpty(values) || !R.propOr(true, 'display', attribute) || R.includes(attribute.id, R.propOr([], 'units', customAttributes))) {
       return acc;
     }
+    if (R.includes(attribute.id, [_constants.REPORTING_YEAR_START_DAY, _constants.REPYEARSTART])) return acc;
 
     var registers = getAttributeRegisters(R.pipe(R.assoc('index', attributeIndex), R.over(R.lensProp('values'), R.map(function (value) {
       if (!R.propOr(true, 'display', value)) {

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

@@ -33,16 +33,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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]);
-  };
-  var getLocalisedProp = R.curry(function (prop, collection) {
-    return getProp(prop, locale)(collection);
-  });
 
   //---------------------------------------------------------------------------------------Annotations
   var getStructure = R.pathOr({}, ['data', 'structure']);
@@ -62,7 +55,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var valAnnotations = R.props(value.annotations || [], annotations);
       return (0, _extends3.default)({}, value, {
         display: !R.has(parent + '.' + value.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(valAnnotations),
-        name: getLocalisedProp('names', value)
+        name: (0, _dotstatsuiteSdmxjs.getRefinedName)(value)
       });
     }, values);
   };
@@ -71,7 +64,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     return R.pipe(R.addIndex(R.map)(function (value, __index) {
       var valueAnnotations = R.pipe(R.propOr([], 'annotations'), R.flip(R.props)(annotations))(value);
       var isHidden = R.has(parent + '.' + value.id, hiddenIds) || (0, _sdmxData.getIsHidden)(valueAnnotations);
-      var name = getLocalisedProp('names')(value);
+      var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(value);
       var __indexPosition = NaN;
       var start = null;
       if (isTimeDimension) {
@@ -82,7 +75,7 @@ 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, {
@@ -106,7 +99,7 @@ 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) })
   });
 
   //----------------------------------------------------------------------------------------Attributes
@@ -120,7 +113,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     var obsAnnotations = R.props(observation.annotations || [], annotations);
     return (0, _extends3.default)({}, observation, {
       display: !R.has(observation.id, hiddenIds) && !(0, _sdmxData.getIsHidden)(obsAnnotations),
-      name: getLocalisedProp('names', observation),
+      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
       values: getValues(observation.values || [], observation.id),
       roles: !R.isNil(observation.role) ? R.head(observation.role) : null
     });
@@ -130,7 +123,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: getLocalisedProp('names', observation),
+      name: (0, _dotstatsuiteSdmxjs.getRefinedName)(observation),
       values: getValues(attr.values || [], attr.id)
     });
   }, R.propOr([], 'dataSet', attributes));
@@ -179,7 +172,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         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)
         }))(acc.observation),
@@ -195,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/getMSDInformations.js

@@ -27,12 +27,13 @@ var getMSDInformations = exports.getMSDInformations = function getMSDInformation
   var parseAttributes = function parseAttributes(parent) {
     return R.reduce(function (acc, attribute) {
       var id = attribute.id;
+      var hierarchicalId = parent === '#ROOT' ? id : parent + '.' + id;
       var format = R.path(['localRepresentation', 'textFormat', 'textType'], attribute);
       if (R.has('metadataAttributes', attribute)) {
-        var collection = parseAttributes(attribute.id)(attribute.metadataAttributes);
-        return (0, _extends4.default)({}, acc, collection, (0, _defineProperty3.default)({}, id, { format: format, parent: parent }));
+        var collection = parseAttributes(hierarchicalId)(attribute.metadataAttributes);
+        return (0, _extends4.default)({}, acc, collection, (0, _defineProperty3.default)({}, hierarchicalId, { format: format, parent: parent, id: id }));
       }
-      return R.assoc(id, { format: format, parent: parent }, acc);
+      return R.assoc(hierarchicalId, { format: format, parent: parent, id: id }, acc);
     }, {});
   };
 

package/lib/rules2/src/parseMetadataSeries.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseMetadataSeries = undefined;
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
@@ -13,15 +17,18 @@ 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) {
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 } } };
@@ -59,22 +66,52 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
         return R.propOr('', '__index', originalVal);
       }), R.join(':'))(serieKey);
 
-      var attributes = R.addIndex(R.reduce)(function (acc, valueIndex, attrIndex) {
-        if (R.isNil(valueIndex)) {
+      var attributes = R.pipe(R.addIndex(R.reduce)(function (acc, valueIndex, attrIndex) {
+        var attribute = R.nth(attrIndex, metadataAttributes);
+        if (R.isNil(valueIndex) && !attribute.isPresentational) {
           return acc;
         }
-        var attribute = R.nth(attrIndex, metadataAttributes);
-        var label = dimensionValueDisplay(options.locale, options.display)(attribute);
+        var attrOptions = R.pathOr({}, ['attributes', attribute.id], options);
+        var id = attrOptions.id;
+        var label = dimensionValueDisplay(options.display)((0, _extends3.default)({}, attribute, { id: id }));
 
-        var value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+        var _value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+        var value = R.is(Object, _value) ? R.prop(options.locale, _value) : _value;
 
-        return R.append({
+        return R.append((0, _extends3.default)({}, R.isNil(value) ? {} : { value: value }, {
           id: attribute.id,
           label: label,
-          value: R.is(Object, value) ? R.prop(options.locale, value) : value,
-          handlerProps: R.pathOr({}, ['attributes', attribute.id], options)
-        }, acc);
-      }, [], metaIndexes);
+          handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', attribute.id], options))
+        }), acc);
+      }, []), function (attributes) {
+        // missing parents in metadata response 
+        var groupedAttrs = R.groupBy(R.pathOr('#ROOT', ['handlerProps', 'parent']), attributes);
+        var indexedAttrs = R.indexBy(R.prop('id'), attributes);
+
+        return R.reduce(function (acc, id) {
+          if (R.has(id, indexedAttrs) || id === '#ROOT') {
+            return acc;
+          }
+          return R.append({
+            id: id,
+            label: dimensionValueDisplay(options.display)({ id: id }),
+            handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', id], options))
+          }, acc);
+        }, attributes, R.keys(groupedAttrs));
+      }, function (attributes) {
+        var groupedAttrs = R.groupBy(R.pathOr('#ROOT', ['handlerProps', 'parent']), attributes);
+        var makeTree = R.map(function (attr) {
+          if (R.has(attr.id, groupedAttrs)) {
+            var children = makeTree(R.prop(attr.id, groupedAttrs));
+            return R.assoc('children', children, attr);
+          }
+          return attr;
+        });
+
+        return makeTree(R.propOr([], '#ROOT', groupedAttrs));
+      }, R.reject(function (attr) {
+        return R.isNil(attr.value) && R.isEmpty(attr.children || []);
+      }))(metaIndexes);
 
       return R.assoc(evolvedKey, attributes, acc);
     }, {}, R.keys(series));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "13.2.0",
+  "version": "13.4.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -37,7 +37,7 @@
   "peerDependencies": {
     "@material-ui/core": "^4.x",
     "@sis-cc/dotstatsuite-visions": "^7.x",
-    "@sis-cc/dotstatsuite-sdmxjs": "^5.x",
+    "@sis-cc/dotstatsuite-sdmxjs": "^6.x",
     "react": "16.x"
   }
 }

package/src/rules/src/constants.js

@@ -59,3 +59,6 @@ export const V8_SDMX_JSON = "application/vnd.sdmx.data+json;version=1.0.0-wd";
 export const OBS_TYPE_NUMBER = 'OBS_TYPE_NUMBER';
 export const OBS_TYPE_NUMERICAL_STRING = 'OBS_TYPE_NUMERICAL_STRING';
 export const OBS_TYPE_STRING = 'OBS_TYPE_STRING';
+export const REPORTING_YEAR_START_DAY = 'REPORTING_YEAR_START_DAY';
+export const REPYEARSTART = 'REPYEARSTART';
+

package/src/rules/src/factories/choro-series.js

@@ -1,4 +1,4 @@
-import { find, findIndex, get, groupBy, has, head, isUndefined, map, reduce, split, transform } from 'lodash';
+import { get, has, head, isUndefined, map, split, transform } from 'lodash';
 import { getRefAreaDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import { categoryDisplay, dimensionValueDisplay } from '../dimension-utils';
 

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

@@ -1,47 +1,8 @@
-import {
-  concat, filter, findIndex, get, has, head, isEmpty, isNil, map, reduce, size, sortBy, split, keys, includes
-} from 'lodash';
-import { FREQ_A, FREQ_Q, FREQ_M } from '../constants';
+import { findIndex, get, has, head, isEmpty, isNil, map, reduce, sortBy, split } from 'lodash';
 import { getTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import { categoryDisplay, dimensionValueDisplayAt } from '../dimension-utils';
 import { getFormatedObservation } from '../observation-formater';
 
-const getLineCategory = (
-  oDimensionValuesIndexes, dimensions, timePeriodDimensionIndex, dimensionsWithValuesIndexedById
-) => (
-  reduce(
-    oDimensionValuesIndexes,
-    (memo, dimensionValueIndex, dimensionIndex) => {
-      const dimension = get(dimensions, `[${dimensionIndex}]`, {});
-      if ((dimensionIndex !== timePeriodDimensionIndex) && (has(dimensionsWithValuesIndexedById, dimension.id))) {
-        return concat(
-          memo, get(dimensions, `[${dimensionIndex}].values[${dimensionValueIndex}].name`, '')
-        );
-      }
-      return memo;
-    },
-    []
-  ).join(' - ')
-);
-
-const getLineCategoryId = (
-  oDimensionValuesIndexes, dimensions, timePeriodDimensionIndex, dimensionsWithValuesIndexedById
-) => (
-  reduce(
-    oDimensionValuesIndexes,
-    (memo, dimensionValueIndex, dimensionIndex) => {
-      const dimension = get(dimensions, `[${dimensionIndex}]`, {});
-      if ((dimensionIndex !== timePeriodDimensionIndex) && (has(dimensionsWithValuesIndexedById, dimension.id))) {
-        return concat(
-          memo, get(dimensions, `[${dimensionIndex}].values[${dimensionValueIndex}].id`, '')
-        );
-      }
-      return memo;
-    },
-    []
-  ).join(' - ')
-);
-
 const getDimensionValues = (splitObservationKey, dimensions, dimensionsWithValuesIndexedById, rejectedId, display) => (
   reduce(
     splitObservationKey,

package/src/rules/src/preparators/getReportingYearStart.js

@@ -1,4 +1,5 @@
 import * as R from 'ramda';
+import { REPORTING_YEAR_START_DAY, REPYEARSTART } from '../constants';
 
 export const getReportingYearStart = (sdmxJson) => {
   const attributes = R.pipe(
@@ -6,7 +7,9 @@ export const getReportingYearStart = (sdmxJson) => {
     ({ dataSet=[], observation=[], series=[] }) => [...dataSet, ...observation, ...series]
   )(sdmxJson);
 
-  const reportYearStartAttr = R.find(R.propEq('id', 'REPORTING_YEAR_START_DAY'), attributes) || {};
+  const reportYearStartAttr = R.find(({ id }) => {
+    return id === REPORTING_YEAR_START_DAY || id === REPYEARSTART;
+  }, attributes) || {};
   const reportYearStart = R.pathOr('--01-01', ['values', 0, 'name'], reportYearStartAttr);
   const [month, day] = R.match(/[\d]{2}/g, reportYearStart);
   return ({ month, day });

package/src/rules/src/properties/scatter.js

@@ -3,7 +3,6 @@ import { isRefAreaDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import { SCATTER } from '../constants';
 import {
   artefactToOption,
-  chartDimensionOptions,
   getDimensionsWithValues,
   getPropertyDimension,
   toState,

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

@@ -1,4 +1,5 @@
 import * as R from 'ramda';
+import { REPORTING_YEAR_START_DAY, REPYEARSTART } from '../../constants';
 
 const registerAttrId = (path, id) => R.over(
   R.lensPath(R.prepend('attributesIdsIndexedByTargets', path)),
@@ -85,6 +86,7 @@ export const parseAttributes = ({ attributes, parsedDimensionsIds, customAttribu
     if (R.isEmpty(values) || !R.propOr(true, 'display', attribute) || R.includes(attribute.id, R.propOr([], 'units', customAttributes))) {
       return acc;
     }
+    if (R.includes(attribute.id, [REPORTING_YEAR_START_DAY, REPYEARSTART])) return acc;
 
     const registers = getAttributeRegisters(
       R.pipe(

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

@@ -1,18 +1,15 @@
 import * as R from 'ramda';
 import dateFns from 'date-fns';
-import { getCodeOrder, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
-  getRelationnalAnnotations, setAnnotationsLayout, getIsHidden, hiddenFormat } from './sdmx-data';
+  getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
 import { getReportedTimePeriodLabel } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
 export const dataTransformer = (dataNew, options = {}) => {
-  const getLanguage = R.pipe(R.pathOr('', ['meta', 'contentLanguages']), R.head());
-  const locale = getLanguage(dataNew);
+  const { locale } = options;
   const reportYearStart = getReportingYearStart(dataNew);
-  const getProp = (prop, locale) => R.pathOr(null,[prop, locale]);
-  const getLocalisedProp = R.curry((prop, collection) => getProp(prop, locale)(collection));
 
   //---------------------------------------------------------------------------------------Annotations
   const getStructure = R.pathOr({},['data', 'structure']);
@@ -32,7 +29,7 @@ export const dataTransformer = (dataNew, options = {}) => {
     return ({
       ...value,
       display: !R.has(`${parent}.${value.id}`, hiddenIds) && !getIsHidden(valAnnotations),
-      name: getLocalisedProp('names', value)
+      name: getRefinedName(value)
     });
   }, values);
 
@@ -44,7 +41,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         R.flip(R.props)(annotations)
       )(value);
       const isHidden = R.has(`${parent}.${value.id}`, hiddenIds) || getIsHidden(valueAnnotations);
-      const name = getLocalisedProp('names')(value);
+      const name = getRefinedName(value);
       let __indexPosition = NaN;
       let start = null;
       if (isTimeDimension) {
@@ -55,7 +52,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         __indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
-        __indexPosition = getCodeOrder(locale)({ annotations: valueAnnotations });
+        __indexPosition = getCodeOrder({ annotations: valueAnnotations });
       }
       const timeFormat = R.prop('timeFormat', options);
       return ({
@@ -90,7 +87,7 @@ export const dataTransformer = (dataNew, options = {}) => {
 
   const resHeader = {
     ...meta,
-    sender: {...sender, name: getLocalisedProp('names', sender)},
+    sender: {...sender, name: getRefinedName(sender)},
   };
 
 //----------------------------------------------------------------------------------------Attributes
@@ -105,7 +102,7 @@ export const dataTransformer = (dataNew, options = {}) => {
     return ({
       ...observation,
       display: !R.has(observation.id, hiddenIds) && !getIsHidden(obsAnnotations),
-      name: getLocalisedProp('names', observation),
+      name: getRefinedName(observation),
       values: getValues(observation.values || [], observation.id),
       roles: !R.isNil(observation.role) ? R.head(observation.role) : null,
     });
@@ -117,7 +114,7 @@ export const dataTransformer = (dataNew, options = {}) => {
       return ({
         ...attr,
         display: !R.has(attr.id, hiddenIds) && !getIsHidden(attrAnnotations),
-        name: getLocalisedProp('names', observation),
+        name: getRefinedName(observation),
         values: getValues(attr.values || [], attr.id)
       });
     },
@@ -173,7 +170,7 @@ export const dataTransformer = (dataNew, options = {}) => {
         ...observation,
         display: !isHidden,
         __index: obsIndex,
-        name: getLocalisedProp('names', observation),
+        name: getRefinedName(observation),
         values: sortedValues,
         role: R.isNil(observation.roles) ? null : R.head(observation.roles),
       })(acc.observation),
@@ -185,7 +182,7 @@ export const dataTransformer = (dataNew, options = {}) => {
   const { dimensionsLayout, observation } = getObservations(locale)(dimObservations);
   const resStructure = {
     ...structure,
-    name: getLocalisedProp('names', structure),
+    name: getRefinedName({ ...structure, id: options.dataflowId }),
     annotations,
     attributes: resAttributes,
     dimensions: { observation },

package/src/rules2/src/getMSDInformations.js

@@ -6,12 +6,13 @@ export const getMSDInformations = (msdJson) => {
   const parseAttributes = (parent) => R.reduce(
     (acc, attribute) => {
       const id = attribute.id;
+      const hierarchicalId = parent === '#ROOT' ? id : `${parent}.${id}`;
       const format = R.path(['localRepresentation', 'textFormat', 'textType'], attribute);
       if (R.has('metadataAttributes', attribute)) {
-        const collection = parseAttributes(attribute.id)(attribute.metadataAttributes);
-        return ({ ...acc, ...collection, [id]: { format, parent } });
+        const collection = parseAttributes(hierarchicalId)(attribute.metadataAttributes);
+        return ({ ...acc, ...collection, [hierarchicalId]: { format, parent, id } });
       }
-      return R.assoc(id, { format, parent }, acc);
+      return R.assoc(hierarchicalId, { format, parent, id }, acc);
     },
     {}
   )

package/src/rules2/src/parseMetadataSeries.js

@@ -1,14 +1,15 @@
 import * as R from 'ramda';
-import { getLocalisedName } from '@sis-cc/dotstatsuite-sdmxjs';
+import { getRefinedName } from '@sis-cc/dotstatsuite-sdmxjs';
 
-const dimensionValueDisplay = (locale, display) => data => {
+const dimensionValueDisplay = (display) => data => {
   if (display === 'code') {
     return R.prop('id', data);
   }
+  const name = getRefinedName(data);
   if (display ===  'both') {
-    return `${R.prop('id', data)}: ${getLocalisedName(locale)(data)}`;
+    return `${R.prop('id', data)}: ${name}`;
   }
-  return getLocalisedName(locale)(data);
+  return name;
 };
 // options = { locale, display, dimensions = [], attributes = { [id]: { format, parent } } };
 export const parseMetadataSeries = (metadataJson, options) => {
@@ -48,28 +49,64 @@ export const parseMetadataSeries = (metadataJson, options) => {
           return R.propOr('', '__index', originalVal);
         }),
         R.join(':')
-      )(serieKey)
+      )(serieKey);
 
-      const attributes = R.addIndex(R.reduce)(
-        (acc, valueIndex, attrIndex) => {
-          if (R.isNil(valueIndex)) {
-            return acc;
-          }
-          const attribute = R.nth(attrIndex, metadataAttributes);
-          const label = dimensionValueDisplay(options.locale, options.display)(attribute);
+      const attributes = R.pipe(
+        R.addIndex(R.reduce)(
+          (acc, valueIndex, attrIndex) => {
+            const attribute = R.nth(attrIndex, metadataAttributes);
+            if (R.isNil(valueIndex) && !(attribute.isPresentational)) {
+              return acc;
+            }
+            const attrOptions = R.pathOr({}, ['attributes', attribute.id], options);
+            const id = attrOptions.id;
+            const label = dimensionValueDisplay(options.display)({ ...attribute, id });
+
+            const _value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+            const value = R.is(Object, _value) ? R.prop(options.locale, _value) : _value;
 
-          const value = R.prop('value', R.nth(valueIndex, attribute.values || []));
+            return R.append({
+              ...(R.isNil(value) ? {} : { value }),
+              id: attribute.id,
+              label,
+              handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', attribute.id], options))
+            }, acc);
+          },
+          [],
+        ),
+        attributes => { // missing parents in metadata response 
+          const groupedAttrs = R.groupBy(R.pathOr('#ROOT', ['handlerProps', 'parent']), attributes);
+          const indexedAttrs = R.indexBy(R.prop('id'), attributes);
+
+          return R.reduce(
+            (acc, id) => {
+              if (R.has(id, indexedAttrs) || id === '#ROOT') {
+                return acc;
+              }
+              return R.append({
+                id,
+                label: dimensionValueDisplay(options.display)({ id }),
+                handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', id], options))
+              }, acc);
+            },
+            attributes,
+            R.keys(groupedAttrs)
+          );
+        },
+        attributes => {
+          const groupedAttrs = R.groupBy(R.pathOr('#ROOT', ['handlerProps', 'parent']), attributes);
+          const makeTree = R.map(attr => {
+            if (R.has(attr.id, groupedAttrs)) {
+              const children = makeTree(R.prop(attr.id, groupedAttrs));
+              return R.assoc('children', children, attr);
+            }
+            return attr;
+          });
 
-          return R.append({
-            id: attribute.id,
-            label,
-            value: R.is(Object, value) ? R.prop(options.locale, value) : value,
-            handlerProps: R.pathOr({}, ['attributes', attribute.id], options)
-          }, acc);
+          return makeTree(R.propOr([], '#ROOT', groupedAttrs));
         },
-        [],
-        metaIndexes
-      );
+        R.reject(attr => R.isNil(attr.value) && R.isEmpty(attr.children || []))
+      )(metaIndexes);
 
       return R.assoc(evolvedKey, attributes, acc);
     },

package/test/getMSDInformations.test.js

@@ -6,27 +6,27 @@ describe('getMSDInformations tests', () => {
   it('complete test', () => {
     const expected = {
       attributes: {
-        STRING_TYPE: { format: 'String', parent: '#ROOT' },
-        STRING_MULTILANG_TYPE: { format: 'String', parent: '#ROOT' },
-        ALPHANUMERIC_TYPE: { format: 'AlphaNumeric', parent: '#ROOT' },
-        ALPHANUMERIC_MULTILANG_TYPE: { format: 'AlphaNumeric', parent: '#ROOT' },
-        BOOLEAN_TYPE: { format: 'Boolean', parent: '#ROOT' },
-        XHTML_TYPE: { format: 'XHTML', parent: '#ROOT' },
-        XHTML_MULTILANG_TYPE: { format: 'XHTML', parent: '#ROOT' },
-        INTEGER_TYPE: { format: 'Integer', parent: '#ROOT' },
-        INTEGER_MULTILANG_TYPE: { format: 'Integer', parent: '#ROOT' },
-        DECIMAL_TYPE: { format: 'Decimal', parent: '#ROOT' },
-        DECIMAL_MULTILANG_TYPE: { format: 'Decimal', parent: '#ROOT' },
-        DATETIME_TYPE: { format: 'DateTime', parent: '#ROOT' },
-        TIME_TYPE: { format: 'Time', parent: '#ROOT' },
-        GREGORIANDAY_TYPE: { format: 'GregorianDay', parent: '#ROOT' },
-        GREGORIAN_YEAR_TYPE: { format: 'GregorianYear', parent: '#ROOT' },
-        GREGORIAN_YEARMONTH_TYPE: { format: 'GregorianYearMonth', parent: '#ROOT' },
-        CONTACT: { format: 'String', parent: '#ROOT' },
-        CONTACT_NAME: { format: 'String', parent: 'CONTACT' },
-        CONTACT_EMAIL: { format: 'String', parent: 'CONTACT' },
-        CONTACT_PHONE: { format: 'Numeric', parent: 'CONTACT' },
-        CONTACT_ORGANISATION: { format: 'String', parent: 'CONTACT' }
+        STRING_TYPE: { format: 'String', parent: '#ROOT', id: 'STRING_TYPE' },
+        STRING_MULTILANG_TYPE: { format: 'String', parent: '#ROOT', id: 'STRING_MULTILANG_TYPE' },
+        ALPHANUMERIC_TYPE: { format: 'AlphaNumeric', parent: '#ROOT', id: 'ALPHANUMERIC_TYPE' },
+        ALPHANUMERIC_MULTILANG_TYPE: { format: 'AlphaNumeric', parent: '#ROOT', id: 'ALPHANUMERIC_MULTILANG_TYPE' },
+        BOOLEAN_TYPE: { format: 'Boolean', parent: '#ROOT', id: 'BOOLEAN_TYPE' },
+        XHTML_TYPE: { format: 'XHTML', parent: '#ROOT', id: 'XHTML_TYPE' },
+        XHTML_MULTILANG_TYPE: { format: 'XHTML', parent: '#ROOT', id: 'XHTML_MULTILANG_TYPE' },
+        INTEGER_TYPE: { format: 'Integer', parent: '#ROOT', id: 'INTEGER_TYPE' },
+        INTEGER_MULTILANG_TYPE: { format: 'Integer', parent: '#ROOT', id: 'INTEGER_MULTILANG_TYPE' },
+        DECIMAL_TYPE: { format: 'Decimal', parent: '#ROOT', id: 'DECIMAL_TYPE' },
+        DECIMAL_MULTILANG_TYPE: { format: 'Decimal', parent: '#ROOT', id: 'DECIMAL_MULTILANG_TYPE' },
+        DATETIME_TYPE: { format: 'DateTime', parent: '#ROOT', id: 'DATETIME_TYPE' },
+        TIME_TYPE: { format: 'Time', parent: '#ROOT', id: 'TIME_TYPE' },
+        GREGORIANDAY_TYPE: { format: 'GregorianDay', parent: '#ROOT', id: 'GREGORIANDAY_TYPE' },
+        GREGORIAN_YEAR_TYPE: { format: 'GregorianYear', parent: '#ROOT', id: 'GREGORIAN_YEAR_TYPE' },
+        GREGORIAN_YEARMONTH_TYPE: { format: 'GregorianYearMonth', parent: '#ROOT', id: 'GREGORIAN_YEARMONTH_TYPE' },
+        CONTACT: { format: 'String', parent: '#ROOT', id: 'CONTACT' },
+        'CONTACT.CONTACT_NAME': { format: 'String', parent: 'CONTACT', id: 'CONTACT_NAME' },
+        'CONTACT.CONTACT_EMAIL': { format: 'String', parent: 'CONTACT', id: 'CONTACT_EMAIL' },
+        'CONTACT.CONTACT_PHONE': { format: 'Numeric', parent: 'CONTACT', id: 'CONTACT_PHONE' },
+        'CONTACT.CONTACT_ORGANISATION': { format: 'String', parent: 'CONTACT', id: 'CONTACT_ORGANISATION' }
       }
     };
 

package/test/getReportingYearStart.test.js

@@ -0,0 +1,43 @@
+import { expect } from 'chai';
+import { getReportingYearStart } from '../src/rules/src/preparators/getReportingYearStart';
+
+describe('getReportingYearStart tests', () => {
+  it('no data', () => {
+    expect(getReportingYearStart()).to.deep.equal({ month: '01', day: '01' });
+  });
+  it('REPORTING_YEAR_START_DAY', () => {
+    const dataReportingYearStartDay = {
+      data: {
+        structure: {
+          attributes: {
+            observation: [
+              {
+                "id": "REPORTING_YEAR_START_DAY",
+                "values": [{"name": "--07-01", "names": { "en": "--07-01" }}]
+              }
+            ]
+          }
+        }
+      }
+    };
+    
+    expect(getReportingYearStart(dataReportingYearStartDay)).to.deep.equal({ month: '07', day: '01' });
+  });
+  it('REPYEARSTART', () => {
+    const dataReportingYearStart = {
+      data: {
+        structure: {
+          attributes: {
+            observation: [
+              {
+                "id": "REPYEARSTART",
+                "values": [{"name": "--08-09", "names": { "en": "--08-09" }}]
+              }
+            ]
+          }
+        }
+      }
+    };
+    expect(getReportingYearStart(dataReportingYearStart)).to.deep.equal({ month: '08', day: '09' });
+  });
+});

package/test/metadata-parsing-perf.test.js

@@ -41,7 +41,29 @@ describe('metadata parsing performance tests', () => {
         id: 'TIME_PERIOD',
       }
     ]
-    expect(parseMetadataSeries(metadataMock, { locale: 'en', display: 'both', dimensions })).to.deep.equal({
+    const attributes = {
+      METADATA_ATTR_0: { id: 'METADATA_ATTR_0' },
+      METADATA_ATTR_1: { id: 'METADATA_ATTR_1' },
+      METADATA_ATTR_2: { id: 'METADATA_ATTR_2' },
+      METADATA_ATTR_3: { id: 'METADATA_ATTR_3' },
+      METADATA_ATTR_4: { id: 'METADATA_ATTR_4' },
+      METADATA_ATTR_5: { id: 'METADATA_ATTR_5' },
+      METADATA_ATTR_6: { id: 'METADATA_ATTR_6' },
+      METADATA_ATTR_7: { id: 'METADATA_ATTR_7' },
+      METADATA_ATTR_8: { id: 'METADATA_ATTR_8' },
+      METADATA_ATTR_9: { id: 'METADATA_ATTR_9' },
+      METADATA_ATTR_10: { id: 'METADATA_ATTR_10' },
+      METADATA_ATTR_11: { id: 'METADATA_ATTR_11' },
+      METADATA_ATTR_12: { id: 'METADATA_ATTR_12' },
+      METADATA_ATTR_13: { id: 'METADATA_ATTR_13' },
+      METADATA_ATTR_14: { id: 'METADATA_ATTR_14' },
+      METADATA_ATTR_15: { id: 'METADATA_ATTR_15' },
+      METADATA_ATTR_16: { id: 'METADATA_ATTR_16' },
+      METADATA_ATTR_17: { id: 'METADATA_ATTR_17' },
+      METADATA_ATTR_18: { id: 'METADATA_ATTR_18' },
+      METADATA_ATTR_19: { id: 'METADATA_ATTR_19' }
+    }
+    expect(parseMetadataSeries(metadataMock, { locale: 'en', display: 'both', dimensions, attributes })).to.deep.equal({
       ":::": [
         { id: 'METADATA_ATTR_0', label: 'METADATA_ATTR_0: Metadata Attribute 0', value: 'v0', handlerProps: {} },
         { id: 'METADATA_ATTR_1', label: 'METADATA_ATTR_1: Metadata Attribute 1', value: 'v0', handlerProps: {} },

package/test/mocks/large_metadata_series.json

@@ -157,7 +157,7 @@
                 "dimensionGroup": [
                     {
                         "id": "METADATA_ATTR_0",
-                        "names": {"en": "Metadata Attribute 0"},
+                        "name": "Metadata Attribute 0",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -183,7 +183,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_1",
-                        "names": {"en": "Metadata Attribute 1"},
+                        "name": "Metadata Attribute 1",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -209,7 +209,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_2",
-                        "names": {"en": "Metadata Attribute 2"},
+                        "name": "Metadata Attribute 2",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -235,7 +235,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_3",
-                        "names": {"en": "Metadata Attribute 3"},
+                        "name": "Metadata Attribute 3",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -261,7 +261,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_4",
-                        "names": {"en": "Metadata Attribute 4"},
+                        "name": "Metadata Attribute 4",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -287,7 +287,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_5",
-                        "names": {"en": "Metadata Attribute 5"},
+                        "name": "Metadata Attribute 5",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -313,7 +313,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_6",
-                        "names": {"en": "Metadata Attribute 6"},
+                        "name": "Metadata Attribute 6",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -339,7 +339,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_7",
-                        "names": {"en": "Metadata Attribute 7"},
+                        "name": "Metadata Attribute 7",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -365,7 +365,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_8",
-                        "names": {"en": "Metadata Attribute 8"},
+                        "name": "Metadata Attribute 8",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -391,7 +391,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_9",
-                        "names": {"en": "Metadata Attribute 9"},
+                        "name": "Metadata Attribute 9",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -417,7 +417,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_10",
-                        "names": {"en": "Metadata Attribute 10"},
+                        "name": "Metadata Attribute 10",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -443,7 +443,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_11",
-                        "names": {"en": "Metadata Attribute 11"},
+                        "name": "Metadata Attribute 11",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -469,7 +469,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_12",
-                        "names": {"en": "Metadata Attribute 12"},
+                        "name": "Metadata Attribute 12",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -495,7 +495,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_13",
-                        "names": {"en": "Metadata Attribute 13"},
+                        "name": "Metadata Attribute 13",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -521,7 +521,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_14",
-                        "names": {"en": "Metadata Attribute 14"},
+                        "name": "Metadata Attribute 14",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -547,7 +547,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_15",
-                        "names": {"en": "Metadata Attribute 15"},
+                        "name": "Metadata Attribute 15",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -573,7 +573,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_16",
-                        "names": {"en": "Metadata Attribute 16"},
+                        "name": "Metadata Attribute 16",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -599,7 +599,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_17",
-                        "names": {"en": "Metadata Attribute 17"},
+                        "name": "Metadata Attribute 17",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -625,7 +625,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_18",
-                        "names": {"en": "Metadata Attribute 18"},
+                        "name": "Metadata Attribute 18",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },
@@ -651,7 +651,7 @@
                     },
                     {
                         "id": "METADATA_ATTR_19",
-                        "names": {"en": "Metadata Attribute 19"},
+                        "name": "Metadata Attribute 19",
                         "values": [
                             { "value": "v0" },
                             { "value": "v1" },

package/test/parseAttributes.test.js

@@ -25,6 +25,8 @@ const attributes = [
   { id: 'a20', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a20v1' }] }, // units attribute
   { id: 'a21', relationship: { dataflow: {} }, values: [{ id: 'a21v0' }] }, // alternative dataflow relationship
   { id: 'a22', relationship: { observation: {} }, values: [{ id: 'a22v0' }] }, // alternative observation relationship
+  { id: 'REPORTING_YEAR_START_DAY', relationship: { observation: {} }, values: [{ id: 'a22v0' }]},
+  { id: 'REPYEARSTART', relationship: { observation: {} }, values: [{ id: 'a22v0' }]},
 ];
 
 const customAttributes = {

package/test/parseMetadataSeries.test.js

@@ -14,11 +14,18 @@ const dimensions = [
     id: "MEASURE", values: [{ id: "V", __index: 0 }]
   },
   {
-      id: "TIME_PERIOD"
+    id: "TIME_PERIOD"
   }
 ];
 
-const attributes = { DIRECT_SOURCE: { prop: 'test' }, RANDOM: { prop: 'invalid' } }
+const attributes = { 
+  DIRECT_SOURCE: { id: 'DIRECT_SOURCE', prop: 'test', parent: '#ROOT' },
+  KEY_STATISTICAL_CONCEPT: { id: 'KEY_STATISTICAL_CONCEPT', parent: '#ROOT' },
+  UNIT_OF_MEASURE_USED: { id: 'UNIT_OF_MEASURE_USED', parent: '#ROOT' },
+  POWER_CODE: { id: 'POWER_CODE', parent: '#ROOT' },
+  POREFERENCE_PERIODWER_CODE: { id: 'POREFERENCE_PERIODWER_CODE', parent: '#ROOT' },
+  RANDOM: { prop: 'invalid' }
+}
 
 describe('parseMetadataSeries test', () => {
   it('complete case', () => {
@@ -28,13 +35,13 @@ describe('parseMetadataSeries test', () => {
           id: 'DIRECT_SOURCE',
           label: 'DIRECT_SOURCE: Direct source',
           value: "Reply to the National Accounts Questionnaire from the Australian Bureau of Statistics, Canberra. The official estimates are published in 'Australian system of national accounts', ABS, catalogue 5204.0.",
-          handlerProps: { prop: 'test' }
+          handlerProps: { prop: 'test', parent: '#ROOT' }
         },
         {
           id: 'KEY_STATISTICAL_CONCEPT',
           label: 'KEY_STATISTICAL_CONCEPT: Key statistical concept',
           value: "As from December 2009, national accounts estimates are compiled according to the 2008 SNA ('System of National Accounts 2008', Commission of the European Communities-Eurostat, International Monetary Fund, Organisation for Economic Co-operation and Development, United Nations and World Bank, 2009).<br><br>Detailed information about the implementation of the 2008 SNA in Australian national accounts could be found in ABS website: <br><br><a href=\"http://www.abs.gov.au/ausstats/abs@.nsf/mf/5310.0.55.002\">ABS website</a><br><br>All the data refer to fiscal years beginning on the 1st July of the year indicated.<br><br>The financial intermediation services indirectly measured (FISIM) are allocated to industries and institutional sectors. <br><br>Original chain constant price estimates for main aggregates are referenced to fiscal year 2019-2020.",
-          handlerProps: {}
+          handlerProps: { parent: '#ROOT' }
         }
       ],
       '0::0:': [
@@ -42,19 +49,78 @@ describe('parseMetadataSeries test', () => {
           id: 'UNIT_OF_MEASURE_USED',
           label: 'UNIT_OF_MEASURE_USED: Unit of measure used',
           value: 'Australian Dollar',
-          handlerProps: {}
+          handlerProps: {  parent: '#ROOT' }
         },
         {
           id: 'POWER_CODE',
           label: 'POWER_CODE: Power code',
           value: 6,
-          handlerProps: {}
+          handlerProps: { parent: '#ROOT' }
         },
         {
           id: 'POREFERENCE_PERIODWER_CODE',
           label: 'POREFERENCE_PERIODWER_CODE: Reference period',
           value: '2019',
-          handlerProps: {}
+          handlerProps: { parent: '#ROOT' }
+        }
+      ]
+    });
+  });
+  it('hierarchy test', () => {
+    const attributes = {
+      ROOT1: { id: 'ROOT1', parent: '#ROOT' },
+      ROOT2: { id: 'ROOT2', parent: '#ROOT' },
+      PARENT1: { id: 'PARENT1', parent: '#ROOT' },
+      'PARENT1.CHILD1': { id: 'CHILD1', parent: 'PARENT1' },
+      'PARENT1.CHILD2': { id: 'CHILD2', parent: 'PARENT1' },
+      PARENT2: { id: 'PARENT1', parent: '#ROOT' },
+      'PARENT2.CHILD3': { id: 'CHILD3', parent: 'PARENT2' },
+      'PARENT2.CHILD4': { id: 'CHILD4', parent: 'PARENT2' },
+    };
+    const metadata = {
+      data: {
+        dataSets: [{
+          dimensionGroupAttributes: {
+            '::': [0, 0, null, 0, 0, 0, 0]
+          }
+        }],
+        structures: [{
+          attributes: {
+            dimensionGroup: [
+              { id: 'ROOT1', name: 'Root 1', values: [{ value: 'v' }] },
+              { id: 'ROOT2', name: 'Root 2', values: [{ value: 'v' }] },
+              { id: 'PARENT1', name: 'Parent 1', isPresentational: true, values: [] },
+              { id: 'PARENT1.CHILD1', name: 'Child 1',  values: [{ value: 'v' }] },
+              { id: 'PARENT1.CHILD2', name: 'Child 2',  values: [{ value: 'v' }] },
+              { id: 'PARENT2.CHILD3', name: 'Child 3',  values: [{ value: 'v' }] },
+              { id: 'PARENT2.CHILD4', name: 'Child 4',  values: [{ value: 'v' }] },
+            ]
+          }
+        }]
+      }
+    };
+
+    expect(parseMetadataSeries(metadata, { display: 'name', locale: 'en', dimensions: [], attributes })).to.deep.equal({
+      '::': [
+        { id: 'ROOT1', label: 'Root 1', value: 'v', handlerProps: { parent: '#ROOT' } },
+        { id: 'ROOT2', label: 'Root 2', value: 'v', handlerProps: { parent: '#ROOT' } },
+        {
+          id: 'PARENT1',
+          label: 'Parent 1',
+          handlerProps: { parent: '#ROOT' },
+          children: [
+            { id: 'PARENT1.CHILD1', label: 'Child 1', value: 'v', handlerProps: { parent: 'PARENT1' } },
+            { id: 'PARENT1.CHILD2', label: 'Child 2', value: 'v', handlerProps: { parent: 'PARENT1' } },
+          ]
+        },
+        {
+          id: 'PARENT2',
+          label: '[PARENT2]',
+          handlerProps: { parent: '#ROOT' },
+          children: [
+            { id: 'PARENT2.CHILD3', label: 'Child 3', value: 'v', handlerProps: { parent: 'PARENT2' } },
+            { id: 'PARENT2.CHILD4', label: 'Child 4', value: 'v', handlerProps: { parent: 'PARENT2' } },
+          ]
         }
       ]
     });

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

@@ -1,55 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getDimensions = exports.isDisplayedFromOwnAnnotations = undefined;
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _ramda = require('ramda');
-
-var R = _interopRequireWildcard(_ramda);
-
-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; } }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var isDisplayedFromOwnAnnotations = exports.isDisplayedFromOwnAnnotations = function isDisplayedFromOwnAnnotations(artefact) {
-  var artefactAnnotations = R.propOr([], 'annotations', artefact);
-  return R.pipe(R.propOr([], 'annotations'), R.find(R.propEq('type', 'NOT_DISPLAYED')), R.isNil)(artefact);
-};
-
-// sdmxJson
-
-var getDimensions = exports.getDimensions = function getDimensions(sdmxJson) {
-  var annotations = R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson);
-  var locale = R.path([], ['meta', 'contentLanguage'], sdmxJson);
-
-  var enhanceValues = R.addIndex(R.map)(function (val, __index) {
-    var annotationsIndexes = R.propOr([], 'annotations', val);
-    var valueAnnotations = R.props(annotationsIndexes, annotations);
-
-    return (0, _extends3.default)({}, value, {
-      __index: __index,
-      annotations: valueAnnotations,
-      name: R.pathOr('[' + val.id + ']', ['names', locale], val)
-    });
-  });
-
-  return R.pipe(R.pathOr([], ['data', 'structure', 'dimensions']), R.addIndex(R.map)(function (dimension, __index) {
-    var annotationsIndexes = R.propOr([], 'annotations', dimension);
-    var dimensionAnnotations = R.props(annotationsIndexes, annotations);
-
-    return (0, _extends3.default)({}, dimension, {
-      __index: __index,
-      name: R.pathOr('[' + val.id + ']', ['names', locale], val),
-      annotations: dimensionAnnotations,
-      values: enhanceValues(R.propOr([], 'values', dimension))
-    });
-  }))(sdmxJson);
-};

package/src/rules/src/preparators/getDimensions.js

@@ -1,49 +0,0 @@
-import * as R from 'ramda';
-import {
-  getCodeOrder,
-  isTimePeriodDimension
-} from '@sis-cc/dotstatsuite-sdmxjs';
-
-export const isDisplayedFromOwnAnnotations = artefact => {
-  const artefactAnnotations = R.propOr([], 'annotations', artefact);
-  return R.pipe(
-    R.propOr([], 'annotations'),
-    R.find(R.propEq('type', 'NOT_DISPLAYED')),
-    R.isNil
-  )(artefact);
-};
-
-// sdmxJson
-
-export const getDimensions = sdmxJson => {
-  const annotations = R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson);
-  const locale = R.path([], ['meta', 'contentLanguage'], sdmxJson);
-
-  const enhanceValues = R.addIndex(R.map)((val, __index) => {
-    const annotationsIndexes = R.propOr([], 'annotations', val);
-    const valueAnnotations = R.props(annotationsIndexes, annotations);
-
-    return ({
-      ...value,
-      __index,
-      annotations: valueAnnotations,
-      name: R.pathOr(`[${val.id}]`, ['names', locale], val),
-    });
-  });
-
-  return R.pipe(
-    R.pathOr([], ['data', 'structure', 'dimensions']),
-    R.addIndex(R.map)((dimension, __index) => {
-      const annotationsIndexes = R.propOr([], 'annotations', dimension);
-      const dimensionAnnotations = R.props(annotationsIndexes, annotations);
-
-      return ({
-        ...dimension,
-        __index,
-        name: R.pathOr(`[${val.id}]`, ['names', locale], val),
-        annotations: dimensionAnnotations,
-        values: enhanceValues(R.propOr([], 'values', dimension))
-      });
-    })
-  )(sdmxJson);
-};