@sis-cc/dotstatsuite-components 13.4.2 → 13.5.2

package/lib/rules/src/date.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTimePeriodLabel = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
+exports.getTimePeriodLabel = exports.getReportedTimePeriodNote = exports.getReportedTimePeriod = exports.getReportedTimePeriodLabel = exports.getLocale = undefined;
 
 var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
 
@@ -119,6 +119,59 @@ var getReportedTimePeriodLabel = exports.getReportedTimePeriodLabel = function g
   };
 };
 
+var getReportedTimePeriod = exports.getReportedTimePeriod = function getReportedTimePeriod(reportYearStart, value, freq) {
+  var start = new Date(R.prop('start', value));
+  var end = new Date(R.prop('end', value));
+  if (reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return { start: start, end: end };
+  }
+  start = _dateFns2.default.addMinutes(start, start.getTimezoneOffset());
+  start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
+  start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
+  if (freq === 'A') {
+    end = _dateFns2.default.addYears(start, 1);
+  }
+  if (freq === 'S') {
+    end = _dateFns2.default.addMonths(start, 6);
+  }
+  if (freq === 'Q') {
+    end = _dateFns2.default.addMonths(start, 3);
+  }
+  if (freq === 'M') {
+    end = _dateFns2.default.addMonths(start, 6);
+  }
+  if (freq === 'W' || freq === 'B') {
+    end = _dateFns2.default.addDays(start, 7);
+  }
+  if (freq === 'D') {
+    end = _dateFns2.default.addDays(start, 1);
+  }
+  if (freq === 'H') {
+    end = _dateFns2.default.addHours(start, 1);
+  }
+  if (freq === 'N') {
+    end = _dateFns2.default.addMinutes(start, 1);
+  }
+  end = _dateFns2.default.subSeconds(end, 1);
+  return { start: start, end: end };
+};
+
+var getReportedTimePeriodNote = exports.getReportedTimePeriodNote = function getReportedTimePeriodNote(reportYearStart, start, end, freq) {
+  if (reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return null;
+  }
+  if (R.includes(freq, ['D', 'H', 'N'])) {
+    return null;
+  }
+  var isFirstDayOfMonth = _dateFns2.default.isFirstDayOfMonth(start);
+  if (freq === 'M' && isFirstDayOfMonth) {
+    return null;
+  }
+  var formatedStart = _dateFns2.default.format(start, 'YYYY-MM-DD');
+  var formatedEnd = _dateFns2.default.format(end, 'YYYY-MM-DD');
+  return { label: formatedStart + ' - ' + formatedEnd };
+};
+
 var getTimePeriodLabel = exports.getTimePeriodLabel = function getTimePeriodLabel(locale) {
   var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'YYYY MMM';
   return R.pipe(R.when(R.isNil, R.always('')), R.when(isValidDate, formaterPeriod(locale, format)));

package/lib/rules/src/header/getDefaultSubtitle.js

@@ -39,7 +39,7 @@ var getDefaultSubtitle = exports.getDefaultSubtitle = function getDefaultSubtitl
       return acc;
     }
 
-    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
 
     return R.append({
       header: formatter(dim) + ':',

package/lib/rules/src/header/getSubtitleFlags.js

@@ -39,7 +39,7 @@ var getSubtitleFlags = exports.getSubtitleFlags = function getSubtitleFlags(_ref
       return acc;
     }
 
-    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+    var flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
     if (R.isEmpty(flags)) {
       return acc;
     }

package/lib/rules/src/table/factories/getCells.js

@@ -32,7 +32,9 @@ var getFlags = exports.getFlags = function getFlags(customAttributesIds, display
     var _ref$attributes = _ref.attributes,
         attributes = _ref$attributes === undefined ? {} : _ref$attributes,
         _ref$units = _ref.units,
-        units = _ref$units === undefined ? {} : _ref$units;
+        units = _ref$units === undefined ? {} : _ref$units,
+        _ref$notes = _ref.notes,
+        notes = _ref$notes === undefined ? [] : _ref$notes;
 
     var refinedAttributes = R.omit(R.propOr([], 'rejected', customAttributesIds), attributes);
     var flags = R.pipe(R.pick(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
@@ -70,7 +72,9 @@ var getFlags = exports.getFlags = function getFlags(customAttributesIds, display
       return { code: code, label: label };
     }, [R.path(['value', 'id']), getAttrLabel(display)])), R.pipe(R.flip(R.concat)(separatedUnitsFootnotes), R.map(R.pipe(getAttrLabel(display), function (label) {
       return { label: label };
-    })), R.when(R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)), R.append(fullUnitsFootnote)))])(flags, footnotes);
+    })), R.when(R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)), R.append(fullUnitsFootnote)), function (res) {
+      return R.concat(res, notes);
+    })])(flags, footnotes);
   };
 };
 

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

@@ -24,7 +24,7 @@ var getManyValuesDimensions = exports.getManyValuesDimensions = function getMany
     var dimensionIndex = R.prop(dimension.id, dimensionsIds);
     var values = R.map(function (value) {
       var valueAttributes = (0, _refineObservationsAttributesValues.refineObservationsAttributesValues)(attributes)(R.propOr({}, dimensionIndex + ':' + value.__index, attributeValues));
-      return (0, _extends3.default)({}, R.pick(['id', 'name', '__indexPosition', 'parent', '__index'], value), {
+      return (0, _extends3.default)({}, R.pick(['id', 'name', '__indexPosition', 'parent', '__index', 'notes'], value), {
         attributes: valueAttributes
       });
     }, dimension.values);

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

@@ -66,12 +66,15 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
       var isHidden = R.has(parent + '.' + value.id, hiddenIds) || (0, _sdmxData.getIsHidden)(valueAnnotations);
       var name = (0, _dotstatsuiteSdmxjs.getRefinedName)(value);
       var __indexPosition = NaN;
+      var notes = [];
       var start = null;
+      var end = null;
       if (isTimeDimension) {
-        start = new Date(R.prop('start', value));
-        start = Date.UTC(_dateFns2.default.getYear(start), _dateFns2.default.getMonth(start), _dateFns2.default.getDate(start), _dateFns2.default.getHours(start), _dateFns2.default.getMinutes(start), _dateFns2.default.getSeconds(start));
-        start = _dateFns2.default.addMonths(start, reportYearStart.month - 1);
-        start = _dateFns2.default.addDays(start, reportYearStart.day - 1);
+        var reported = (0, _date.getReportedTimePeriod)(reportYearStart, value, options.frequency);
+        start = reported.start;
+        end = reported.end;
+        var reportTimeNote = (0, _date.getReportedTimePeriodNote)(reportYearStart, start, end, options.frequency, options.isRtl);
+        notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
         __indexPosition = _dateFns2.default.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -83,6 +86,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         display: !isHidden,
         name: R.when(R.always(isTimeDimension), R.always((0, _date.getReportedTimePeriodLabel)(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start: value.start })))(name),
         start: start ? start.toISOString() : null,
+        notes: notes,
         __indexPosition: __indexPosition,
         __index: __index
       });

package/lib/rules2/src/getMSDInformations.js

@@ -23,17 +23,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var getMSDInformations = exports.getMSDInformations = function getMSDInformations(msdJson) {
   var attributesDefinitions = R.pathOr([], ['data', 'metadataStructures', 0, 'metadataStructureComponents', 'reportStructures', 0, 'metadataAttributes'], msdJson);
+  var indexedConcepts = R.pipe(R.pathOr([], ['data', 'conceptSchemes', 0, 'concepts']), R.indexBy(R.prop('id')))(msdJson);
 
   var parseAttributes = function parseAttributes(parent) {
     return R.reduce(function (acc, attribute) {
       var id = attribute.id;
+      var name = R.path([id, 'name'], indexedConcepts);
       var hierarchicalId = parent === '#ROOT' ? id : parent + '.' + id;
       var format = R.path(['localRepresentation', 'textFormat', 'textType'], attribute);
       if (R.has('metadataAttributes', attribute)) {
         var collection = parseAttributes(hierarchicalId)(attribute.metadataAttributes);
-        return (0, _extends4.default)({}, acc, collection, (0, _defineProperty3.default)({}, hierarchicalId, { format: format, parent: parent, id: id }));
+        return (0, _extends4.default)({}, acc, collection, (0, _defineProperty3.default)({}, hierarchicalId, { format: format, parent: parent, id: id, name: name }));
       }
-      return R.assoc(hierarchicalId, { format: format, parent: parent, id: id }, acc);
+      return R.assoc(hierarchicalId, { format: format, parent: parent, id: id, name: name }, acc);
     }, {});
   };
 

package/lib/rules2/src/parseMetadataSeries.js

@@ -94,7 +94,7 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
           }
           return R.append({
             id: id,
-            label: dimensionValueDisplay(options.display)({ id: id }),
+            label: dimensionValueDisplay(options.display)({ id: id, name: R.path(['attributes', id, 'name'], options) }),
             handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', id], options))
           }, acc);
         }, attributes, R.keys(groupedAttrs));

package/package.json

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

package/src/rules/src/date.js

@@ -55,7 +55,60 @@ export const getReportedTimePeriodLabel = (freq, _format, locale) => (reportYear
   // freq === 'W'
   const [week] = R.match(/W[\d]{2}/, id)
   return `${year}/${nextYear}-${week}`;
-}
+};
+
+export const getReportedTimePeriod = (reportYearStart, value, freq) => {
+  let start = new Date(R.prop('start', value));
+  let end = new Date(R.prop('end', value));
+  if(reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return ({ start, end });
+  }
+  start = dateFns.addMinutes(start, start.getTimezoneOffset());
+  start = dateFns.addMonths(start, reportYearStart.month - 1);
+  start = dateFns.addDays(start, reportYearStart.day - 1);
+  if (freq === 'A') {
+    end = dateFns.addYears(start, 1);
+  }
+  if (freq === 'S') {
+    end = dateFns.addMonths(start, 6);
+  }
+  if (freq === 'Q') {
+    end = dateFns.addMonths(start, 3);
+  }
+  if (freq === 'M') {
+    end = dateFns.addMonths(start, 6);
+  }
+  if (freq === 'W' || freq === 'B') {
+    end = dateFns.addDays(start, 7);
+  }
+  if (freq === 'D') {
+    end = dateFns.addDays(start, 1);
+  }
+  if (freq === 'H') {
+    end = dateFns.addHours(start, 1);
+  }
+  if (freq === 'N') {
+    end = dateFns.addMinutes(start, 1);
+  }
+  end = dateFns.subSeconds(end, 1);
+  return ({ start, end });
+};
+
+export const getReportedTimePeriodNote = (reportYearStart, start, end, freq) => {
+  if(reportYearStart.month === '01' && reportYearStart.day === '01') {
+    return null;
+  } 
+  if (R.includes(freq, ['D', 'H', 'N'])) {
+    return null;
+  }
+  const isFirstDayOfMonth = dateFns.isFirstDayOfMonth(start);
+  if (freq === 'M' && isFirstDayOfMonth) {
+    return null;
+  }
+  const formatedStart = dateFns.format(start, 'YYYY-MM-DD');
+  const formatedEnd = dateFns.format(end, 'YYYY-MM-DD');
+  return ({ label: `${formatedStart} - ${formatedEnd}` });
+};
 
 
 export const getTimePeriodLabel = (locale, format = 'YYYY MMM') => R.pipe(

package/src/rules/src/header/getDefaultSubtitle.js

@@ -26,7 +26,7 @@ export const getDefaultSubtitle = ({ customAttributes, dimensions, display, unit
           return acc;
         }
 
-        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
 
         return R.append({
           header: `${formatter(dim)}:`,

package/src/rules/src/header/getSubtitleFlags.js

@@ -26,7 +26,7 @@ export const getSubtitleFlags = ({ customAttributes, dimensions, display, units
           return acc;
         }
 
-        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value) });
+        const flags = _getFlags({ attributes: R.propOr({}, 'attributes', value), notes: R.propOr([], 'notes', value) });
         if (R.isEmpty(flags)) {
           return acc;
         }

package/src/rules/src/table/factories/getCells.js

@@ -4,7 +4,7 @@ import { hasCellMetadata } from '../../../../rules2/src/hasCellMetadata';
 
 const getAttrLabel = (display) => (attribute) => `${display(attribute)}: ${display(R.propOr({}, 'value', attribute))}`;
 
-export const getFlags = (customAttributesIds, display, unitsProps) => ({ attributes={}, units={} }) => {
+export const getFlags = (customAttributesIds, display, unitsProps) => ({ attributes={}, units={}, notes=[] }) => {
   const refinedAttributes = R.omit(R.propOr([], 'rejected', customAttributesIds), attributes);
   const flags = R.pipe(R.pick(R.propOr([], 'flags', customAttributesIds)), R.values)(refinedAttributes);
   const footnotes = R.pipe(R.pick(R.propOr([], 'notes', customAttributesIds)), R.values)(refinedAttributes);
@@ -68,7 +68,8 @@ export const getFlags = (customAttributesIds, display, unitsProps) => ({ attribu
         R.when(
           R.always(unitsDisplay === 'cells' && !R.isEmpty(fullUnitsFootnote)),
           R.append(fullUnitsFootnote)
-        )
+        ),
+        res => R.concat(res, notes)
       )
     ]
   )(flags, footnotes);

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

@@ -9,7 +9,7 @@ export const getManyValuesDimensions = (dimensionsByIds, dimensionsIds, attribut
         const valueAttributes = refineObservationsAttributesValues(attributes)
           (R.propOr({}, `${dimensionIndex}:${value.__index}`, attributeValues));
         return ({
-          ...R.pick(['id', 'name', '__indexPosition', 'parent', '__index'], value),
+          ...R.pick(['id', 'name', '__indexPosition', 'parent', '__index', 'notes'], value),
           attributes: valueAttributes,
         });
       }, dimension.values);

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

@@ -3,7 +3,7 @@ import dateFns from 'date-fns';
 import { getCodeOrder, getRefinedName, isTimePeriodDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import {
   getRelationnalAnnotations, setAnnotationsLayout, getIsHidden } from './sdmx-data';
-import { getReportedTimePeriodLabel } from './date';
+import { getReportedTimePeriodLabel, getReportedTimePeriodNote, getReportedTimePeriod } from './date';
 import { getReportingYearStart } from './preparators/getReportingYearStart';
 import { getNotDisplayedIds } from '../../rules2/src';
 
@@ -43,12 +43,15 @@ export const dataTransformer = (dataNew, options = {}) => {
       const isHidden = R.has(`${parent}.${value.id}`, hiddenIds) || getIsHidden(valueAnnotations);
       const name = getRefinedName(value);
       let __indexPosition = NaN;
+      let notes = [];
       let start = null;
+      let end = null;
       if (isTimeDimension) {
-        start = new Date(R.prop('start', value));
-        start = Date.UTC(dateFns.getYear(start), dateFns.getMonth(start), dateFns.getDate(start), dateFns.getHours(start), dateFns.getMinutes(start), dateFns.getSeconds(start));
-        start = dateFns.addMonths(start, reportYearStart.month - 1);
-        start = dateFns.addDays(start, reportYearStart.day - 1);
+        const reported = getReportedTimePeriod(reportYearStart, value, options.frequency);
+        start = reported.start;
+        end = reported.end;
+        const reportTimeNote = getReportedTimePeriodNote(reportYearStart, start, end, options.frequency, options.isRtl);
+        notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
         __indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
@@ -67,6 +70,7 @@ export const dataTransformer = (dataNew, options = {}) => {
           R.always(getReportedTimePeriodLabel(options.frequency, timeFormat, locale)(reportYearStart, { id: value.id, reportedStart: start, start:value.start }))
         )(name),
         start: start ? start.toISOString() : null,
+        notes,
         __indexPosition,
         __index,
       });

package/src/rules2/src/getMSDInformations.js

@@ -1,18 +1,20 @@
 import * as R from 'ramda';
 
-export const getMSDInformations = (msdJson) => {
+export const getMSDInformations = msdJson => {
   const attributesDefinitions = R.pathOr([], ['data', 'metadataStructures', 0, 'metadataStructureComponents', 'reportStructures', 0, 'metadataAttributes'], msdJson);
+  const indexedConcepts = R.pipe(R.pathOr([], ['data', 'conceptSchemes', 0, 'concepts']), R.indexBy(R.prop('id')))(msdJson);
 
   const parseAttributes = (parent) => R.reduce(
     (acc, attribute) => {
       const id = attribute.id;
+      const name = R.path([id, 'name'], indexedConcepts);
       const hierarchicalId = parent === '#ROOT' ? id : `${parent}.${id}`;
       const format = R.path(['localRepresentation', 'textFormat', 'textType'], attribute);
       if (R.has('metadataAttributes', attribute)) {
         const collection = parseAttributes(hierarchicalId)(attribute.metadataAttributes);
-        return ({ ...acc, ...collection, [hierarchicalId]: { format, parent, id } });
+        return ({ ...acc, ...collection, [hierarchicalId]: { format, parent, id, name } });
       }
-      return R.assoc(hierarchicalId, { format, parent, id }, acc);
+      return R.assoc(hierarchicalId, { format, parent, id, name }, acc);
     },
     {}
   )

package/src/rules2/src/parseMetadataSeries.js

@@ -85,7 +85,7 @@ export const parseMetadataSeries = (metadataJson, options) => {
               }
               return R.append({
                 id,
-                label: dimensionValueDisplay(options.display)({ id }),
+                label: dimensionValueDisplay(options.display)({ id, name: R.path(['attributes', id, 'name'], options) }),
                 handlerProps: R.omit(['id'], R.pathOr({}, ['attributes', id], options))
               }, 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', 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' }
+        STRING_TYPE: { format: 'String', parent: '#ROOT', id: 'STRING_TYPE', name: 'STRING_TYPE en' },
+        STRING_MULTILANG_TYPE: { format: 'String', parent: '#ROOT', id: 'STRING_MULTILANG_TYPE', name: [undefined] },
+        ALPHANUMERIC_TYPE: { format: 'AlphaNumeric', parent: '#ROOT', id: 'ALPHANUMERIC_TYPE', name: [undefined] },
+        ALPHANUMERIC_MULTILANG_TYPE: { format: 'AlphaNumeric', parent: '#ROOT', id: 'ALPHANUMERIC_MULTILANG_TYPE', name: [undefined] },
+        BOOLEAN_TYPE: { format: 'Boolean', parent: '#ROOT', id: 'BOOLEAN_TYPE', name: [undefined] },
+        XHTML_TYPE: { format: 'XHTML', parent: '#ROOT', id: 'XHTML_TYPE', name: [undefined] },
+        XHTML_MULTILANG_TYPE: { format: 'XHTML', parent: '#ROOT', id: 'XHTML_MULTILANG_TYPE', name: [undefined] },
+        INTEGER_TYPE: { format: 'Integer', parent: '#ROOT', id: 'INTEGER_TYPE', name: [undefined] },
+        INTEGER_MULTILANG_TYPE: { format: 'Integer', parent: '#ROOT', id: 'INTEGER_MULTILANG_TYPE', name: [undefined] },
+        DECIMAL_TYPE: { format: 'Decimal', parent: '#ROOT', id: 'DECIMAL_TYPE', name: [undefined] },
+        DECIMAL_MULTILANG_TYPE: { format: 'Decimal', parent: '#ROOT', id: 'DECIMAL_MULTILANG_TYPE', name: [undefined] },
+        DATETIME_TYPE: { format: 'DateTime', parent: '#ROOT', id: 'DATETIME_TYPE', name: [undefined] },
+        TIME_TYPE: { format: 'Time', parent: '#ROOT', id: 'TIME_TYPE', name: [undefined] },
+        GREGORIANDAY_TYPE: { format: 'GregorianDay', parent: '#ROOT', id: 'GREGORIANDAY_TYPE', name: [undefined] },
+        GREGORIAN_YEAR_TYPE: { format: 'GregorianYear', parent: '#ROOT', id: 'GREGORIAN_YEAR_TYPE', name: [undefined] },
+        GREGORIAN_YEARMONTH_TYPE: { format: 'GregorianYearMonth', parent: '#ROOT', id: 'GREGORIAN_YEARMONTH_TYPE', name: [undefined] },
+        CONTACT: { format: 'String', parent: '#ROOT', id: 'CONTACT', name: [undefined] },
+        'CONTACT.CONTACT_NAME': { format: 'String', parent: 'CONTACT', id: 'CONTACT_NAME', name: [undefined] },
+        'CONTACT.CONTACT_EMAIL': { format: 'String', parent: 'CONTACT', id: 'CONTACT_EMAIL', name: [undefined] },
+        'CONTACT.CONTACT_PHONE': { format: 'Numeric', parent: 'CONTACT', id: 'CONTACT_PHONE', name: [undefined] },
+        'CONTACT.CONTACT_ORGANISATION': { format: 'String', parent: 'CONTACT', id: 'CONTACT_ORGANISATION', name: [undefined] }
       }
     };
 

package/test/mocks/MSD_TEST.json

@@ -1,5 +1,11 @@
 {
   "data": {
+      "conceptSchemes": [{
+        "concepts": [{
+          "id": "STRING_TYPE",
+          "name": "STRING_TYPE en"
+        }]
+      }],
       "metadataStructures": [
           {
               "id": "MSD_TEST",

package/test/parseMetadataSeries.test.js

@@ -19,12 +19,12 @@ const dimensions = [
 ];
 
 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' }
+  DIRECT_SOURCE: { id: 'DIRECT_SOURCE', prop: 'test', parent: '#ROOT', name: 'DIRECT_SOURCE'  },
+  KEY_STATISTICAL_CONCEPT: { id: 'KEY_STATISTICAL_CONCEPT', parent: '#ROOT', name: 'KEY_STATISTICAL_CONCEPT'  },
+  UNIT_OF_MEASURE_USED: { id: 'UNIT_OF_MEASURE_USED', parent: '#ROOT', name: 'UNIT_OF_MEASURE_USED'  },
+  POWER_CODE: { id: 'POWER_CODE', parent: '#ROOT', name: 'POWER_CODE'  },
+  POREFERENCE_PERIODWER_CODE: { id: 'POREFERENCE_PERIODWER_CODE', parent: '#ROOT', name: 'POREFERENCE_PERIODWER_CODE'  },
+  RANDOM: { prop: 'invalid', name: 'RANDOM'  }
 }
 
 describe('parseMetadataSeries test', () => {
@@ -35,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', parent: '#ROOT' }
+          handlerProps: { prop: 'test', parent: '#ROOT', name: 'DIRECT_SOURCE' },
         },
         {
           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: { parent: '#ROOT' }
+          handlerProps: { parent: '#ROOT', name: 'KEY_STATISTICAL_CONCEPT' },
         }
       ],
       '0::0:': [
@@ -49,33 +49,33 @@ describe('parseMetadataSeries test', () => {
           id: 'UNIT_OF_MEASURE_USED',
           label: 'UNIT_OF_MEASURE_USED: Unit of measure used',
           value: 'Australian Dollar',
-          handlerProps: {  parent: '#ROOT' }
+          handlerProps: {  parent: '#ROOT', name: 'UNIT_OF_MEASURE_USED' },
         },
         {
           id: 'POWER_CODE',
           label: 'POWER_CODE: Power code',
           value: 6,
-          handlerProps: { parent: '#ROOT' }
+          handlerProps: { parent: '#ROOT', name: 'POWER_CODE' },
         },
         {
           id: 'POREFERENCE_PERIODWER_CODE',
           label: 'POREFERENCE_PERIODWER_CODE: Reference period',
           value: '2019',
-          handlerProps: { parent: '#ROOT' }
+          handlerProps: { parent: '#ROOT', name: 'POREFERENCE_PERIODWER_CODE' },
         }
       ]
     });
   });
   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' },
+      ROOT1: { id: 'ROOT1', parent: '#ROOT', name: 'ROOT1'  },
+      ROOT2: { id: 'ROOT2', parent: '#ROOT', name: 'ROOT2'  },
+      PARENT1: { id: 'PARENT1', parent: '#ROOT', name: 'PARENT1'  },
+      'PARENT1.CHILD1': { id: 'CHILD1', parent: 'PARENT1', name: 'CHILD1'  },
+      'PARENT1.CHILD2': { id: 'CHILD2', parent: 'PARENT1', name: 'CHILD2'  },
+      PARENT2: { id: 'PARENT1', parent: '#ROOT', name: 'PARENT2'  },
+      'PARENT2.CHILD3': { id: 'CHILD3', parent: 'PARENT2', name: 'CHILD3'  },
+      'PARENT2.CHILD4': { id: 'CHILD4', parent: 'PARENT2', name: 'CHILD4'  },
     };
     const metadata = {
       data: {
@@ -102,24 +102,24 @@ describe('parseMetadataSeries test', () => {
 
     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: 'ROOT1', label: 'Root 1', value: 'v', handlerProps: { parent: '#ROOT', name: 'ROOT1' } },
+        { id: 'ROOT2', label: 'Root 2', value: 'v', handlerProps: { parent: '#ROOT', name: 'ROOT2' } },
         {
           id: 'PARENT1',
           label: 'Parent 1',
-          handlerProps: { parent: '#ROOT' },
+          handlerProps: { parent: '#ROOT', name: 'PARENT1' },
           children: [
-            { id: 'PARENT1.CHILD1', label: 'Child 1', value: 'v', handlerProps: { parent: 'PARENT1' } },
-            { id: 'PARENT1.CHILD2', label: 'Child 2', value: 'v', handlerProps: { parent: 'PARENT1' } },
+            { id: 'PARENT1.CHILD1', label: 'Child 1', value: 'v', handlerProps: { parent: 'PARENT1', name: 'CHILD1' } },
+            { id: 'PARENT1.CHILD2', label: 'Child 2', value: 'v', handlerProps: { parent: 'PARENT1', name: 'CHILD2' } },
           ]
         },
         {
           id: 'PARENT2',
-          label: '[PARENT2]',
-          handlerProps: { parent: '#ROOT' },
+          label: 'PARENT2',
+          handlerProps: { parent: '#ROOT', name: 'PARENT2' },
           children: [
-            { id: 'PARENT2.CHILD3', label: 'Child 3', value: 'v', handlerProps: { parent: 'PARENT2' } },
-            { id: 'PARENT2.CHILD4', label: 'Child 4', value: 'v', handlerProps: { parent: 'PARENT2' } },
+            { id: 'PARENT2.CHILD3', label: 'Child 3', value: 'v', handlerProps: { parent: 'PARENT2', name: 'CHILD3' } },
+            { id: 'PARENT2.CHILD4', label: 'Child 4', value: 'v', handlerProps: { parent: 'PARENT2', name: 'CHILD4' } },
           ]
         }
       ]