@sis-cc/dotstatsuite-components 14.2.3 → 14.2.4

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

@@ -16,10 +16,10 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 */
 
 var getIndex = R.path(['value', 'index']);
-var getUnits = function getUnits(keys, acc, units) {
-  return R.pick(keys, R.mergeWith(function (a, b) {
+var getUnits = function getUnits(acc, units) {
+  return R.mergeWith(function (a, b) {
     return getIndex(a) === getIndex(b) ? a : null;
-  }, acc, units));
+  }, acc, units);
 };
 
 var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observations) {
@@ -31,11 +31,11 @@ var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observatio
   return R.map(function (serie) {
     return R.reduce(function (acc, units) {
       var unitsKeys = R.keys(units);
-      if (R.isEmpty(acc.unitsKeys)) return { units: getUnits(unitsKeys, acc.units, units), unitsKeys: unitsKeys };
+      if (R.isEmpty(acc.unitsKeys)) return { units: units, unitsKeys: unitsKeys };
       var communKeys = R.intersection(acc.unitsKeys, unitsKeys);
       return {
-        units: getUnits(communKeys, acc.units, units),
-        unitsKeys: unitsKeys
+        units: getUnits(R.pick(communKeys, acc.units), R.pick(communKeys, units)),
+        unitsKeys: communKeys
       };
     }, { unitsKeys: [], units: {} }, serie).units;
   })(series);

package/package.json

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

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

@@ -5,7 +5,7 @@ import * as R from 'ramda';
 */
 
 const getIndex = R.path(['value', 'index']);
-const getUnits = (keys, acc, units) => R.pick(keys, R.mergeWith((a, b) => getIndex(a) === getIndex(b) ? a : null, acc, units))
+const getUnits = (acc, units) => R.mergeWith((a, b) => getIndex(a) === getIndex(b) ? a : null, acc, units)
 
 export const getUnitsSeries = (observations) => {
   let series = {};
@@ -20,13 +20,12 @@ export const getUnitsSeries = (observations) => {
     serie => R.reduce(
       (acc, units) => {
         const unitsKeys = R.keys(units);
-        if (R.isEmpty(acc.unitsKeys)) return { units: getUnits(unitsKeys, acc.units, units), unitsKeys }
+        if (R.isEmpty(acc.unitsKeys)) return { units, unitsKeys }
         const communKeys = R.intersection(acc.unitsKeys, unitsKeys);
-        return { 
-          units: getUnits(communKeys, acc.units, units),
-          unitsKeys
-        }
-       ;
+        return {
+          units: getUnits(R.pick(communKeys, acc.units), R.pick(communKeys, units)),
+          unitsKeys: communKeys,
+        };
       }, { unitsKeys: [], units: {} }, serie).units
   )(series);
 };