@sis-cc/dotstatsuite-components 15.0.1 → 15.0.4

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

@@ -92,6 +92,6 @@ var getSideProps = function getSideProps(_ref2, customAttributes, metadataCoordi
 
 var getCells = exports.getCells = function getCells(data, display, customAttributes, unitsProps, metadataCoordinates) {
   return R.mapObjIndexed(function (observation) {
-    return R.pipe(R.set(R.lensProp('flags'), getFlags(customAttributes, (0, _dimensionUtils.dimensionValueDisplay)(display), unitsProps)(observation)), R.set(R.lensProp('intValue'), R.prop('value', observation)), R.set(R.lensProp('value'), R.prop('formattedValue', observation)), R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)), R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)), R.set(R.lensProp('key'), R.prop('key', observation)))({});
+    return R.pipe(R.set(R.lensProp('flags'), getFlags(customAttributes, (0, _dimensionUtils.dimensionValueDisplay)(display), unitsProps)(observation)), R.set(R.lensProp('intValue'), R.is(Number, observation.value) ? observation.value : null), R.set(R.lensProp('value'), R.prop('formattedValue', observation)), R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)), R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)), R.set(R.lensProp('key'), R.prop('key', observation)))({});
   }, R.propOr({}, 'observations', data));
 };

package/lib/rules/src/table/preparators/prepareData.js

@@ -86,9 +86,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
   //------------------------------------------------------------------
   var unitsArtefacts = (0, _getUnitsArtefacts.getUnitsArtefacts)({ unitsDefinitionCodes: unitsDefinitionCodes, data: sdmxJson });
   var headerUnits = (0, _getHeaderUnits.getHeaderUnits)({ unitsArtefacts: unitsArtefacts, unitsDefinitionCodes: unitsDefinitionCodes, rejectedValueIds: rejectedValueIds });
-  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.addIndex(R.map)(function (dim, index) {
-    return R.assoc('index', index, dim);
-  }), R.indexBy(R.prop('id')))(sdmxJson);
+  var _dimensions = R.pipe(R.pathOr([], ['data', 'structure', 'dimensions', 'observation']), R.indexBy(R.prop('id')))(sdmxJson);
   var attachmentSeriesIndexes = (0, _getAttachmentSeriesIndexes.getAttachmentSeriesIndexes)({ dimensions: _dimensions, unitsArtefacts: unitsArtefacts });
   //------------------------------------------------------------------
 

package/lib/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -21,5 +21,5 @@ var getAttachmentSeriesIndexes = exports.getAttachmentSeriesIndexes = function g
 
   return R.pipe(R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)), R.filter(function (dim) {
     return !R.isNil(dim);
-  }), R.pluck('index'), R.uniq, R.sortBy(R.identity))(dimensions);
+  }), R.pluck('__index'), R.uniq, R.sortBy(R.identity))(dimensions);
 };

package/lib/rules2/src/duplicateObservations.js

@@ -12,6 +12,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 duplicateObs = exports.duplicateObs = function duplicateObs(dims, observations) {
+  var obsValues = R.values(observations);
+  if (R.length(obsValues) < 2 || R.length(dims) === 0) {
+    return observations;
+  }
   var duplicated = R.reduce(function (obs, dim) {
     var groupedObs = R.groupBy(function (o) {
       return R.prop(dim.id, o.indexedDimValIds);
@@ -29,7 +33,7 @@ var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observatio
       }, matchingObs);
     }, dim.values);
     return R.unnest(enhancedObs);
-  }, R.values(observations), dims);
+  }, obsValues, dims);
   var res = R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);
   return res;
 };

package/package.json

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

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

@@ -92,7 +92,7 @@ export const getCells = (data, display, customAttributes, unitsProps, metadataCo
         customAttributes, dimensionValueDisplay(display), unitsProps
       )(observation)
     ),
-    R.set(R.lensProp('intValue'), R.prop('value', observation)),
+    R.set(R.lensProp('intValue'), R.is(Number, observation.value) ? observation.value : null),
     R.set(R.lensProp('value'), R.prop('formattedValue', observation)),
     R.assoc('indexedDimValIds', R.prop('indexedDimValIds', observation)),
     R.assoc('sideProps', getSideProps(observation, customAttributes, metadataCoordinates)),

package/src/rules/src/table/preparators/prepareData.js

@@ -50,7 +50,6 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}, _options=
     const headerUnits = getHeaderUnits({ unitsArtefacts, unitsDefinitionCodes, rejectedValueIds });
     const _dimensions = R.pipe(
       R.pathOr([], ['data', 'structure', 'dimensions', 'observation']),
-      R.addIndex(R.map)((dim, index) => R.assoc('index', index, dim)),
       R.indexBy(R.prop('id'))
     )(sdmxJson);
     const attachmentSeriesIndexes = getAttachmentSeriesIndexes({ dimensions: _dimensions, unitsArtefacts });

package/src/rules/src/table/units/getAttachmentSeriesIndexes.js

@@ -2,7 +2,7 @@ import * as R from 'ramda';
 
 export const getAttachmentSeriesIndexes = ({
   unitsArtefacts,
-  dimensions // { id: { index, ...dim } }
+  dimensions // { id: { __index, ...dim } }
 }) => {
   const targettedDimensionsCodes = R.pipe(
     R.pathOr({}, ['attributes', 'series']),
@@ -20,7 +20,7 @@ export const getAttachmentSeriesIndexes = ({
   return R.pipe(
     R.props(R.concat(unitsDimensionsCodes, targettedDimensionsCodes)),
     R.filter(dim => !R.isNil(dim)),
-    R.pluck('index'),
+    R.pluck('__index'),
     R.uniq,
     R.sortBy(R.identity)
   )(dimensions);

package/src/rules2/src/duplicateObservations.js

@@ -1,6 +1,10 @@
 import * as R from 'ramda';
 
 export const duplicateObs = (dims, observations) => {
+  const obsValues = R.values(observations);
+  if ((R.length(obsValues) < 2) || R.length(dims) === 0) {
+    return observations;
+  }
   const duplicated = R.reduce(
     (obs, dim) => {
       const groupedObs = R.groupBy(o => R.prop(dim.id, o.indexedDimValIds), obs);
@@ -23,7 +27,7 @@ export const duplicateObs = (dims, observations) => {
       );
       return R.unnest(enhancedObs);
     },
-    R.values(observations),
+    obsValues,
     dims
   );
   const res =  R.indexBy(R.pipe(R.prop('orderedDimIndexes'), R.join(':')), duplicated);