@sis-cc/dotstatsuite-components 15.0.16 → 15.0.18

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

@@ -18,20 +18,24 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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 isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN)));
+var parseValidNumber = R.pipe(function (v) {
+  return R.isNil(v) ? null : Number(v);
+}, function (v) {
+  return isNaN(v) ? null : v;
+});
 
 var getFormatAttributesValues = function getFormatAttributesValues(observation, formatAttributesIndexes, attributes) {
   return R.mapObjIndexed(function (attributeIndex) {
-    var valueIndex = R.pipe(R.propOr([], 'attrValuesIndexes'), R.nth(attributeIndex), function (v) {
-      return R.isNil(v) ? null : Number(v);
-    }, function (v) {
-      return isNaN(v) ? null : v;
-    })(observation);
+    var valueIndex = void 0;
+    var relationship = R.pipe(R.nth(attributeIndex), R.propOr({}, 'relationship'))(attributes);
+    //if (!R.isNil(attributeIndex) && attributeIndex >= R.length(R.propOr([], 'attrValuesIndexes', observation))) {
+    if (R.has('none', relationship) || R.has('dataflow', relationship)) {
+      valueIndex = 0;
+    } else {
+      valueIndex = R.pipe(R.propOr([], 'attrValuesIndexes'), R.nth(attributeIndex), parseValidNumber)(observation);
+    }
 
-    return R.pipe(R.path([attributeIndex, 'values', valueIndex, 'id']), function (v) {
-      return R.isNil(v) ? null : Number(v);
-    }, function (v) {
-      return isNaN(v) ? null : v;
-    })(attributes);
+    return R.pipe(R.path([attributeIndex, 'values', valueIndex, 'id']), parseValidNumber)(attributes);
   }, formatAttributesIndexes);
 };
 

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

@@ -53,9 +53,7 @@ var getTableProps = exports.getTableProps = function getTableProps(_ref) {
 
   var confirmedSeriesAttributesIds = (0, _getConfirmedSeriesAttributesIds.getConfirmedSeriesAttributesIds)(seriesAttributes, layoutIds);
 
-  var headerDimensionsIds = R.pluck('id', R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data))));
-
-  var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds, headerDimensionsIds);
+  var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds);
 
   var _R$propOr = R.propOr({}, 'units', data),
       rejectedValueIds = _R$propOr.rejectedValueIds,

package/lib/rules2/src/refineMetadataCoordinates.js

@@ -11,9 +11,10 @@ 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 refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds, headerDimensionsIds) {
+var refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds) {
+  var relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
   return R.reduce(function (acc, coordinates) {
-    var refinedCoord = R.omit(headerDimensionsIds, coordinates);
+    var refinedCoord = R.pick(relevantIds, coordinates);
     if (R.isEmpty(refinedCoord)) {
       return acc;
     }

package/package.json

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

package/src/rules/src/preparators/formatValue.js

@@ -2,20 +2,30 @@ import * as R from 'ramda';
 import numeral from 'numeral';
 
 const isValidNumber = R.both(R.is(Number), R.complement(R.equals(NaN)));
+const parseValidNumber = R.pipe(
+  v => R.isNil(v) ? null : Number(v),
+  v => isNaN(v) ? null : v
+);
 
 const getFormatAttributesValues = (observation, formatAttributesIndexes, attributes) => R.mapObjIndexed(
   attributeIndex => {
-    const valueIndex = R.pipe(
-      R.propOr([], 'attrValuesIndexes'),
-      R.nth(attributeIndex),
-      v => R.isNil(v) ? null : Number(v),
-      v => isNaN(v) ? null : v
-    )(observation);
+    let valueIndex;
+    const relationship = R.pipe(R.nth(attributeIndex), R.propOr({}, 'relationship'))(attributes);
+    //if (!R.isNil(attributeIndex) && attributeIndex >= R.length(R.propOr([], 'attrValuesIndexes', observation))) {
+    if (R.has('none', relationship) || R.has('dataflow', relationship)) {
+      valueIndex = 0;
+    }
+    else {
+      valueIndex = R.pipe(
+        R.propOr([], 'attrValuesIndexes'),
+        R.nth(attributeIndex),
+        parseValidNumber
+      )(observation);
+    }
 
     return R.pipe(
       R.path([attributeIndex, 'values', valueIndex, 'id']),
-      v => R.isNil(v) ? null : Number(v),
-      v => isNaN(v) ? null : v
+      parseValidNumber
     )(attributes);
   },
   formatAttributesIndexes

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

@@ -23,11 +23,7 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
     layoutIds
   );
 
-  const headerDimensionsIds = R.pluck('id',
-      R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data)))
-  );
-
-  const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds, headerDimensionsIds);
+  const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds);
 
   const {
     rejectedValueIds,

package/src/rules2/src/refineMetadataCoordinates.js

@@ -1,9 +1,10 @@
 import * as R from 'ramda';
 
-export const refineMetadataCoordinates = (metadataCoordinates, layoutIds, headerDimensionsIds) => {
+export const refineMetadataCoordinates = (metadataCoordinates, layoutIds) => {
+  const relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
   return R.reduce(
     (acc, coordinates) => {
-      const refinedCoord = R.omit(headerDimensionsIds, coordinates);
+      const refinedCoord = R.pick(relevantIds, coordinates);
       if (R.isEmpty(refinedCoord)) {
         return acc;
       }

package/test/enhanceObservations.test.js

@@ -312,5 +312,29 @@ describe('enhanceObservations tests', () => {
       },
   })
 })
+  it('apply format attrs from dataflow level', () => {
+    const observations = {
+      a: { value: 2.358, attrValuesIndexes: [], dimValuesIndexes: [] },
+      b: { value: 10.578, attrValuesIndexes: [], dimValuesIndexes: [] },
+    };
+
+    const attributes = [
+      { id: 'PREF', relationship: { none: {} }, values: [{ id: '-1' }] },
+      { id: 'DEC', relationship: { dataflow: {} }, values: [{ id: '1' }] }
+    ];
+
+    const options = {
+      noDisplayIndexes: [],
+      notDisplayedCodes: {},
+      attributesIds: [],
+      unitsIds: [],
+      rejectedValueIds: [],
+      customAttributes: { prefscale: 'PREF', decimals: 'DEC' }
+    };
+    expect(enhanceObservations([], observations, attributes, options)).to.deep.equal({
+      a: { attributes: {}, units: { serieKey: '' }, value: 2.358, formattedValue: '23.6', attrValuesIndexes: [], dimValuesIndexes: [], indexedDimValIds: {} },
+      b: { attributes: {}, units: { serieKey: '' }, value: 10.578, formattedValue: '105.8', attrValuesIndexes: [], dimValuesIndexes: [], indexedDimValIds: {} },
+    });
+  });
 });
 

package/test/refineMetadataCoordinates.test.js

@@ -0,0 +1,86 @@
+import { expect } from 'chai';
+import { refineMetadataCoordinates } from "../src/rules2/src/refineMetadataCoordinates";
+
+describe('refineMetadataCoordinates', () => {
+  it('test', () => {
+    const coordinates = [
+      {},
+      {
+          "MEASURE": "EMP",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "POP",
+          "ACTIVITY": "_Z",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "SAL",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      },
+      {
+          "MEASURE": "SELF",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+      }
+    ];
+    const layoutIds = {
+      header: ['TIME_PERIOD'],
+      sections: ['ACTIVITY', 'ADJUSTMENT'],
+      rows: ['MEASURE', 'UNIT_MEASURE', 'PRICE_BASE', 'TRANSFORMATION']
+    };
+    expect(refineMetadataCoordinates(coordinates, layoutIds, [])).to.deep.equal({
+      cells: [],
+      header: [],
+      sections: [],
+      rows: [
+        {
+          "MEASURE": "EMP",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "POP",
+          "ACTIVITY": "_Z",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "SAL",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        },
+        {
+          "MEASURE": "SELF",
+          "ACTIVITY": "_T",
+          "UNIT_MEASURE": "PS",
+          "PRICE_BASE": "_Z",
+          "ADJUSTMENT": "Y",
+          "TRANSFORMATION": "N"
+        }
+      ]
+    });
+  });
+});