@sis-cc/dotstatsuite-components 13.3.0 → 13.3.1

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/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/package.json

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

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/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/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/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/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 = {