@sis-cc/dotstatsuite-components 12.1.2 → 12.2.0

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,13 @@ Object.defineProperty(exports, 'sdmx_3_0_DataFormatPatch', {
   get: function get() {
     return _sdmx.sdmx_3_0_DataFormatPatch;
   }
+});
+
+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/lib/viewer/src/footer.js

@@ -35,12 +35,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var Footer = function Footer(_ref) {
   var type = _ref.type,
       chartData = _ref.chartData,
-      options = _ref.options,
       source = _ref.source,
       logo = _ref.logo,
       copyright = _ref.copyright,
       onSize = _ref.onSize,
-      chartOptions = _ref.chartOptions;
+      chartOptions = _ref.chartOptions,
+      isSticky = _ref.isSticky;
 
   var target = _react2.default.useRef(null);
 
@@ -63,7 +63,8 @@ var Footer = function Footer(_ref) {
       source: source,
       logo: logo,
       copyright: copyright,
-      legend: legend
+      legend: legend,
+      isSticky: isSticky
     })
   );
 };

package/lib/viewer/src/index.js

@@ -58,7 +58,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var useStyles = (0, _styles.makeStyles)(function (theme) {
+var useStyles = (0, _styles.makeStyles)(function () {
   return {
     container: {
       borderColor: '#007bc7',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "12.1.2",
+  "version": "12.2.0",
   "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/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,4 @@ export {
 export { getSidebarData } from './getSidebarData';
 export { parseMetadataSeries } from './parseMetadataSeries';
 export { sdmx_3_0_DataFormatPatch } from './sdmx3.0DataFormatPatch';
+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/src/viewer/src/footer.js

@@ -5,7 +5,7 @@ import { DataFooter } from '@sis-cc/dotstatsuite-visions';
 import ChartLegends from './legends/ChartLegends';
 import { isChartNoData } from './utils';
 
-const Footer = ({ type, chartData, options, source, logo, copyright, onSize, chartOptions }) => {
+const Footer = ({ type, chartData, source, logo, copyright, onSize, chartOptions, isSticky }) => {
   const target = React.useRef(null);
   const [width, height] = useSize(target);
 
@@ -23,6 +23,7 @@ const Footer = ({ type, chartData, options, source, logo, copyright, onSize, cha
         logo={logo}
         copyright={copyright}
         legend={legend}
+        isSticky={isSticky}
       />
     </div>
   );

package/src/viewer/src/index.js

@@ -10,7 +10,7 @@ import Header from './header';
 import Chart from './chart';
 import Footer from './footer';
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(() => ({
   container: {
     borderColor: '#007bc7',
     borderBottomWidth: 1,

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);
+  });
+});