@sis-cc/dotstatsuite-components 17.29.0 → 17.30.1

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

@@ -39,7 +39,7 @@ var getReportingYearStart = exports.getReportingYearStart = function getReportin
 
     return id === _constants.REPORTING_YEAR_START_DAY || id === _constants.REPYEARSTART;
   }, attributes) || {};
-  var reportYearStart = R.pathOr('--01-01', ['values', 0, 'name'], reportYearStartAttr);
+  var reportYearStart = R.pathOr('--01-01', ['values', 0, 'value'], reportYearStartAttr);
 
   var _R$match = R.match(/[\d]{2}/g, reportYearStart),
       _R$match2 = (0, _slicedToArray3.default)(_R$match, 2),

package/lib/rules2/src/hasCellMetadata.js

@@ -12,6 +12,9 @@ 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 hasCellMetadata = exports.hasCellMetadata = function hasCellMetadata(metadataCoordinates, cellCoordinates) {
+  if (R.propOr('OBS_VALUE', 'OBS_ATTRIBUTES', cellCoordinates) !== 'OBS_VALUE') {
+    return false;
+  }
   return R.pipe(R.find(function (coordinates) {
     var mergedCoord = R.mergeLeft(coordinates, cellCoordinates);
     return !R.isEmpty(coordinates) && R.equals(mergedCoord, cellCoordinates);

package/lib/rules2/src/table/getTableLayoutIds.js

@@ -229,7 +229,6 @@ var injectRemainingDimensionsInLayout = exports.injectRemainingDimensionsInLayou
     return !R.isNil(dimId);
   }, _layout.rows);
 
-  console.log({ dimInRows: dimInRows, layoutIds: layoutIds, indexedCombinations: indexedCombinations, layoutDimsIds: layoutDimsIds });
   if (R.isNil(dimInRows)) {
     if (R.isEmpty(_remaining)) {
       var toTakeIn = R.isEmpty(_layout.sections) ? 'header' : 'sections';

package/package.json

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

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

@@ -10,7 +10,7 @@ export const getReportingYearStart = (sdmxJson) => {
   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 reportYearStart = R.pathOr('--01-01', ['values', 0, 'value'], reportYearStartAttr);
   const [month = '01', day = '01'] = R.match(/[\d]{2}/g, reportYearStart);
   return ({ month, day });
 };

package/src/rules2/src/hasCellMetadata.js

@@ -1,6 +1,9 @@
 import * as R from 'ramda';
 
 export const hasCellMetadata = (metadataCoordinates, cellCoordinates) => {
+  if (R.propOr('OBS_VALUE', 'OBS_ATTRIBUTES', cellCoordinates) !== 'OBS_VALUE') {
+    return false;
+  }
   return R.pipe(
     R.find(coordinates => {
       const mergedCoord = R.mergeLeft(coordinates, cellCoordinates);

package/src/rules2/src/table/getTableLayoutIds.js

@@ -166,7 +166,6 @@ export const injectRemainingDimensionsInLayout = (layoutIds, remainingDims, inde
     return !R.isNil(dimId);
   }, _layout.rows);
 
-  console.log({ dimInRows, layoutIds, indexedCombinations, layoutDimsIds });
   if (R.isNil(dimInRows)) {
     if (R.isEmpty(_remaining)) {
       const toTakeIn = R.isEmpty(_layout.sections) ? 'header' : 'sections';

package/test/getCells.test.js

@@ -115,4 +115,47 @@ describe('getCells tests', () => {
       }
     });
   });
+  it('metadata and OBS_ATTRIBUTES', () => {
+    const _customAttributes = {
+      flags: [],
+      notes: []
+    };
+
+    const combinations = {
+      cells: [],
+      layout: []
+    };
+
+    const observations = {
+      'a': {
+        value: 'val',
+        formattedValue: 'val',
+        attributes: {},
+        indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' }
+      },
+      'b': {
+        value: 'attr val',
+        formattedValue: 'attr val',
+        attributes: {},
+        indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'A' }
+      }
+    };
+    const metadataCoordinates = [{ d0: 'v0', d1: 'v0' }];
+    expect(getCells(_customAttributes, {}, combinations, {}, metadataCoordinates)(observations)).to.deep.equal({
+      'a': {
+        value: 'val',
+        intValue: null,
+        indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' },
+        sideProps: { hasAdvancedAttributes: false, hasMetadata: true, coordinates: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' } },
+        flags: []
+      },
+      'b': {
+        value: 'attr val',
+        intValue: null,
+        indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'A' },
+        sideProps: null,
+        flags: []
+      }
+    });
+  });
 });

package/test/getReportingYearStart.test.js

@@ -12,7 +12,7 @@ describe('getReportingYearStart tests', () => {
           attributes: {
             observation: [
               { "id": "REPYEARSTART",
-                "values": [{ "name": "0", "names": { "en": "0" } }]
+                "values": [{ "value": "0" }]
               }
             ]
           }
@@ -29,7 +29,7 @@ describe('getReportingYearStart tests', () => {
             observation: [
               {
                 "id": "REPORTING_YEAR_START_DAY",
-                "values": [{"name": "--07-01", "names": { "en": "--07-01" }}]
+                "values": [{ "value": "--07-01" }]
               }
             ]
           }
@@ -47,7 +47,7 @@ describe('getReportingYearStart tests', () => {
             observation: [
               {
                 "id": "REPYEARSTART",
-                "values": [{"name": "--08-09", "names": { "en": "--08-09" }}]
+                "values": [{ "value": "--08-09" }]
               }
             ]
           }