@sis-cc/dotstatsuite-components 12.1.3 → 12.2.1

package/lib/rules2/src/getDataflowTooltipAttributesIds.js

@@ -0,0 +1,25 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDataflowTooltipAttributesIds = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+var getDataflowTooltipAttributesIds = exports.getDataflowTooltipAttributesIds = function getDataflowTooltipAttributesIds(sdmxJson, defaults) {
+  var dataflowAnnotationsIndexes = R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson);
+  var dataflowAnnotations = R.props(dataflowAnnotationsIndexes, R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson));
+
+  var flagsAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_FLAG'), dataflowAnnotations);
+  var footnotesAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_NOTE'), dataflowAnnotations);
+
+  return {
+    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : R.split(',', flagsAttrAnnotation.title),
+    footnotes: R.isNil(footnotesAttrAnnotation) ? defaults.footnotes : R.split(',', footnotesAttrAnnotation.title)
+  };
+};

package/lib/rules2/src/getMSDInformations.js

@@ -0,0 +1,40 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMSDInformations = undefined;
+
+var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
+var _extends3 = require('babel-runtime/helpers/extends');
+
+var _extends4 = _interopRequireDefault(_extends3);
+
+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 getMSDInformations = exports.getMSDInformations = function getMSDInformations(msdJson) {
+  var attributesDefinitions = R.pathOr([], ['data', 'metadataStructures', 0, 'metadataStructureComponents', 'reportStructures', 0, 'metadataAttributes'], msdJson);
+
+  var parseAttributes = function parseAttributes(parent) {
+    return R.reduce(function (acc, attribute) {
+      var id = attribute.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 }));
+      }
+      return R.assoc(id, { format: format, parent: parent }, acc);
+    }, {});
+  };
+
+  return { attributes: parseAttributes('#ROOT')(attributesDefinitions) };
+};

package/lib/rules2/src/getSidebarData.js

@@ -13,13 +13,14 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return 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) + ': ' + R.prop('name', data);
+      return R.prop('id', data) + ': ' + name;
     }
-    return R.prop('name', data);
+    return name;
   };
 };
 

package/lib/rules2/src/index.js

@@ -44,4 +44,22 @@ Object.defineProperty(exports, 'sdmx_3_0_DataFormatPatch', {
   get: function get() {
     return _sdmx.sdmx_3_0_DataFormatPatch;
   }
+});
+
+var _getDataflowTooltipAttributesIds = require('./getDataflowTooltipAttributesIds');
+
+Object.defineProperty(exports, 'getDataflowTooltipAttributesIds', {
+  enumerable: true,
+  get: function get() {
+    return _getDataflowTooltipAttributesIds.getDataflowTooltipAttributesIds;
+  }
+});
+
+var _getMSDInformations = require('./getMSDInformations');
+
+Object.defineProperty(exports, 'getMSDInformations', {
+  enumerable: true,
+  get: function get() {
+    return _getMSDInformations.getMSDInformations;
+  }
 });

package/lib/rules2/src/parseMetadataSeries.js

@@ -24,7 +24,7 @@ var dimensionValueDisplay = function dimensionValueDisplay(locale, display) {
     return (0, _dotstatsuiteSdmxjs.getLocalisedName)(locale)(data);
   };
 };
-// options = { locale, display, dimensions = [] };
+// options = { locale, display, dimensions = [], attributes = { [id]: { format, parent } } };
 var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSeries(metadataJson, options) {
   var metadataAttributes = R.pathOr([], ['data', 'structures', 0, 'attributes', 'dimensionGroup'], metadataJson);
   var metaAttrLength = R.length(metadataAttributes);
@@ -71,7 +71,8 @@ var parseMetadataSeries = exports.parseMetadataSeries = function parseMetadataSe
         return R.append({
           id: attribute.id,
           label: label,
-          value: R.is(Object, value) ? R.prop(options.locale, value) : value
+          value: R.is(Object, value) ? R.prop(options.locale, value) : value,
+          handlerProps: R.pathOr({}, ['attributes', attribute.id], options)
         }, acc);
       }, [], metaIndexes);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "12.1.3",
+  "version": "12.2.1",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@react-hook/size": "^2.1.1",
-    "@sis-cc/dotstatsuite-d3-charts": "^8.0.0",
+    "@sis-cc/dotstatsuite-d3-charts": "^8.0.1",
     "date-fns": "^1.30.1",
     "lodash": "^4.17.2",
     "lodash.compose": "^2.4.1",

package/src/rules2/src/getDataflowTooltipAttributesIds.js

@@ -0,0 +1,15 @@
+import * as R from 'ramda';
+
+export const getDataflowTooltipAttributesIds = (sdmxJson, defaults) => {
+  const dataflowAnnotationsIndexes = R.pathOr([], ['data', 'dataSets', 0, 'annotations'], sdmxJson);
+  const dataflowAnnotations = R.props(dataflowAnnotationsIndexes, R.pathOr([], ['data', 'structure', 'annotations'], sdmxJson));
+
+  const flagsAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_FLAG'), dataflowAnnotations);
+  const footnotesAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_NOTE'), dataflowAnnotations);
+
+  return ({
+    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : R.split(',', flagsAttrAnnotation.title),
+    footnotes: R.isNil(footnotesAttrAnnotation) ? defaults.footnotes : R.split(',', footnotesAttrAnnotation.title),
+  });
+};
+

package/src/rules2/src/getMSDInformations.js

@@ -0,0 +1,20 @@
+import * as R from 'ramda';
+
+export const getMSDInformations = (msdJson) => {
+  const attributesDefinitions = R.pathOr([], ['data', 'metadataStructures', 0, 'metadataStructureComponents', 'reportStructures', 0, 'metadataAttributes'], msdJson);
+
+  const parseAttributes = (parent) => R.reduce(
+    (acc, attribute) => {
+      const id = attribute.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 } });
+      }
+      return R.assoc(id, { format, parent }, acc);
+    },
+    {}
+  )
+
+  return ({ attributes: parseAttributes('#ROOT')(attributesDefinitions) });
+};

package/src/rules2/src/getSidebarData.js

@@ -1,13 +1,14 @@
 import * as R from 'ramda';
 
 const dimensionValueDisplay = (display) => data => {
+  const 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)}: ${R.prop('name', data)}`;
+    return `${R.prop('id', data)}: ${name}`;
   }
-  return R.prop('name', data);
+  return name;
 };
 
 const sortByCoordinates = (a, b) => {

package/src/rules2/src/index.js

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

package/src/rules2/src/parseMetadataSeries.js

@@ -10,7 +10,7 @@ const dimensionValueDisplay = (locale, display) => data => {
   }
   return getLocalisedName(locale)(data);
 };
-// options = { locale, display, dimensions = [] };
+// options = { locale, display, dimensions = [], attributes = { [id]: { format, parent } } };
 export const parseMetadataSeries = (metadataJson, options) => {
   const metadataAttributes = R.pathOr([], ['data', 'structures', 0, 'attributes', 'dimensionGroup'], metadataJson);
   const metaAttrLength = R.length(metadataAttributes);
@@ -63,7 +63,8 @@ export const parseMetadataSeries = (metadataJson, options) => {
           return R.append({
             id: attribute.id,
             label,
-            value: R.is(Object, value) ? R.prop(options.locale, value) : value
+            value: R.is(Object, value) ? R.prop(options.locale, value) : value,
+            handlerProps: R.pathOr({}, ['attributes', attribute.id], options)
           }, acc);
         },
         [],

package/test/getDataflowTooltipAttributesIds.js

@@ -0,0 +1,74 @@
+import { expect } from 'chai';
+import { getDataflowTooltipAttributesIds } from '../src/rules2/src';
+
+const def = {
+  flags: ['f0', 'f1'],
+  footnotes: ['foot0', 'foot1']
+};
+
+describe('getDataflowTooltipAttributesIds tests', () => {
+  it('no override', () => {
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', title: 'test' },
+          { id: 'annot1', title: 'test' },
+          { id: 'annot2', title: 'test' },
+        ]
+      }
+    };
+
+    expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal(def);
+  });
+  it('flags override', () => {
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', title: 'test' },
+          { id: 'annot1', type: 'LAYOUT_FLAG', title: 'f2,f3' },
+          { id: 'annot2', title: 'test' },
+        ]
+      }
+    };
+
+    expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f2', 'f3'], footnotes: ['foot0', 'foot1'] });
+  });
+  it('footnotes override', () => {
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', title: 'test' },
+          { id: 'annot1', type: 'LAYOUT_NOTE', title: 'foot2,foot3' },
+          { id: 'annot2', title: 'test' },
+        ]
+      }
+    };
+
+    expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f0', 'f1'], footnotes: ['foot2', 'foot3'] });
+  });
+  it('flags and footnotes override', () => {
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', type: 'LAYOUT_FLAG', title: 'f2,f3' },
+          { id: 'annot1', type: 'LAYOUT_NOTE', title: 'foot2,foot3' },
+          { id: 'annot2', title: 'test' },
+        ]
+      }
+    };
+
+    expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f2', 'f3'], footnotes: ['foot2', 'foot3'] });
+  });
+});

package/test/getMSDInformations.test.js

@@ -0,0 +1,35 @@
+import { expect } from 'chai';
+import { getMSDInformations } from '../src/rules2/src/getMSDInformations';
+import msd from './mocks/MSD_TEST.json';
+
+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' }
+      }
+    };
+
+    expect(getMSDInformations(msd)).to.deep.equal(expected);
+  });
+});