@sis-cc/dotstatsuite-components 15.0.19 → 15.0.20

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

@@ -27,9 +27,10 @@ var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observatio
   R.map(function (obs) {
     series = R.over(R.lensProp(obs.units.serieKey), R.ifElse(R.isNil, R.always([obs.units]), R.append(obs.units)))(series);
   }, observations);
+  return R.reduce(function (_acc, key) {
+    var serie = series[key];
 
-  return R.map(function (serie) {
-    return R.reduce(function (acc, units) {
+    var _R$reduce = R.reduce(function (acc, units) {
       var unitsKeys = R.keys(units);
       if (R.isEmpty(acc.unitsKeys)) return { units: units, unitsKeys: unitsKeys };
       var communKeys = R.intersection(acc.unitsKeys, unitsKeys);
@@ -37,6 +38,12 @@ var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observatio
         units: getUnits(R.pick(communKeys, acc.units), R.pick(communKeys, units)),
         unitsKeys: communKeys
       };
-    }, { unitsKeys: [], units: {} }, serie).units;
-  })(series);
+    }, { unitsKeys: [], units: {} }, serie),
+        units = _R$reduce.units;
+
+    if (R.isEmpty(R.dissoc('serieKey', units))) {
+      return _acc;
+    }
+    return R.assoc(key, units, _acc);
+  }, {})(R.keys(series));
 };

package/package.json

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

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

@@ -15,17 +15,27 @@ export const getUnitsSeries = (observations) => {
       R.ifElse(R.isNil, R.always([obs.units]), R.append(obs.units))
     )(series);
   }, observations);
-
-  return R.map(
-    serie => R.reduce(
-      (acc, units) => {
-        const unitsKeys = R.keys(units);
-        if (R.isEmpty(acc.unitsKeys)) return { units, unitsKeys }
-        const communKeys = R.intersection(acc.unitsKeys, unitsKeys);
-        return {
-          units: getUnits(R.pick(communKeys, acc.units), R.pick(communKeys, units)),
-          unitsKeys: communKeys,
-        };
-      }, { unitsKeys: [], units: {} }, serie).units
-  )(series);
+  return R.reduce(
+    (_acc, key) => {
+      const serie = series[key];
+      const { units } = R.reduce(
+        (acc, units) => {
+          const unitsKeys = R.keys(units);
+          if (R.isEmpty(acc.unitsKeys)) return { units, unitsKeys }
+          const communKeys = R.intersection(acc.unitsKeys, unitsKeys);
+          return {
+            units: getUnits(R.pick(communKeys, acc.units), R.pick(communKeys, units)),
+            unitsKeys: communKeys,
+          };
+        },
+        { unitsKeys: [], units: {} },
+        serie
+      );
+      if (R.isEmpty(R.dissoc('serieKey', units))) {
+        return _acc;
+      }
+      return R.assoc(key, units, _acc);
+    },
+    {}  
+  )(R.keys(series));
 };

package/test/getUnitsSeries.test.js

@@ -61,6 +61,31 @@ describe('getUnitsSeries tests', () => {
         '2:0:x:x': { A: { value: { index: 2 } }, B: { value: { index: 0 } }, C: { value: { index: 0 } }, serieKey: '2:0:x:x' }
       });
   });
+  it('empty units test', () => {
+    const obs = {
+      0: {
+        key: '0:0:0:0',
+        units: { serieKey: '0:0:x:x' }
+      },
+      1: {
+        key: '0:0:1:0',
+        units: { serieKey: '0:0:x:x' }
+      },
+      2: {
+        key: '1:0:0:0',
+        units: { serieKey: '1:0:x:x' }
+      },
+      3: {
+        key: '1:0:1:0',
+        units: { serieKey: '1:0:x:x' }
+      },
+      4: {
+        key: '2:0:0:0',
+        units: { serieKey: '2:0:x:x' }
+      }
+    };
+    expect(getUnitsSeries(obs)).to.deep.equal({});
+  });
 });
 
 describe('getUnitsSeries tests keys difference', () => {