npm - @sis-cc/dotstatsuite-components - Versions diffs - 14.1.0 → 14.1.1 - Mend

@sis-cc/dotstatsuite-components 14.1.0 → 14.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/rules/src/table/units/getUnitsSeries.js +15 -4
package/package.json +1 -1
package/src/rules/src/table/units/getUnitsSeries.js +18 -6
package/test/getUnitsSeries.test.js +112 -47
package/test/invertTime.test.js +2 -0

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

@@ -15,6 +15,13 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
   observations = { [obsKey]: { units: { serieKey: '', [id]: { id, name, value } } } };
 */
+var getIndex = R.path(['value', 'index']);
+var getUnits = function getUnits(keys, acc, units) {
+  return R.pick(keys, R.mergeWith(function (a, b) {
+    return getIndex(a) === getIndex(b) ? a : null;
+  }, acc, units));
+};
 var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observations) {
   var series = {};
   R.map(function (obs) {
@@ -23,9 +30,13 @@ var getUnitsSeries = exports.getUnitsSeries = function getUnitsSeries(observatio
   return R.map(function (serie) {
     return R.reduce(function (acc, units) {
-      return R.mergeWith(function (a, b) {
-        return R.path(['value', 'index'], a) === R.path(['value', 'index'], b) ? a : null;
-      }, acc, units);
-    }, {}, serie);
+      var unitsKeys = R.keys(units);
+      if (R.isEmpty(acc.unitsKeys)) return { units: getUnits(unitsKeys, acc.units, units), unitsKeys: unitsKeys };
+      var communKeys = R.intersection(acc.unitsKeys, unitsKeys);
+      return {
+        units: getUnits(communKeys, acc.units, units),
+        unitsKeys: unitsKeys
+      };
+    }, { unitsKeys: [], units: {} }, serie).units;
   })(series);
 };

package/package.json CHANGED Viewed

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

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

@@ -4,17 +4,29 @@ import * as R from 'ramda';
   observations = { [obsKey]: { units: { serieKey: '', [id]: { id, name, value } } } };
 */
+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))
 export const getUnitsSeries = (observations) => {
   let series = {};
   R.map(obs => {
-    series = R.over(R.lensProp(obs.units.serieKey), R.ifElse(R.isNil, R.always([obs.units]), R.append(obs.units)))(series);
+    series = R.over(
+      R.lensProp(obs.units.serieKey),
+      R.ifElse(R.isNil, R.always([obs.units]), R.append(obs.units))
+    )(series);
   }, observations);
   return R.map(
     serie => R.reduce(
-      (acc, units) => R.mergeWith((a, b) => R.path(['value', 'index'], a) === R.path(['value', 'index'], b) ? a : null, acc, units),
-      {},
-      serie
-    )
+      (acc, units) => {
+        const unitsKeys = R.keys(units);
+        if (R.isEmpty(acc.unitsKeys)) return { units: getUnits(unitsKeys, acc.units, units), unitsKeys }
+        const communKeys = R.intersection(acc.unitsKeys, unitsKeys);
+        return {
+          units: getUnits(communKeys, acc.units, units),
+          unitsKeys
+        }
+       ;
+      }, { unitsKeys: [], units: {} }, serie).units
   )(series);
-};
+};

package/test/getUnitsSeries.test.js CHANGED Viewed

@@ -1,55 +1,55 @@
 import { expect } from 'chai';
 import { getUnitsSeries } from '../src/rules/src/table/units/getUnitsSeries';
-const observations = {
-  0: {
-    key: '0:0:0:0',
-    units: {
-      serieKey: '0:0:x:x',
-      A: { value: { index: 0 } },
-      B: { value: { index: 0 } },
-      C: { value: { index: 0 } }
-    }
-  },
-  1: {
-    key: '0:0:1:0',
-    units: {
-      serieKey: '0:0:x:x',
-      A: { value: { index: 0 } },
-      B: { value: { index: 0 } },
-      C: { value: { index: 1 } }
-    }
-  },
-  2: {
-    key: '1:0:0:0',
-    units: {
-      serieKey: '1:0:x:x',
-      A: { value: { index: 1 } },
-      B: { value: { index: 1 } },
-      C: { value: { index: 0 } }
-    }
-  },
-  3: {
-    key: '1:0:1:0',
-    units: {
-      serieKey: '1:0:x:x',
-      A: { value: { index: 1 } },
-      B: { value: { index: 1 } },
-      C: { value: { index: 0 } }
-    }
-  },
-  4: {
-    key: '2:0:0:0',
-    units: {
-      serieKey: '2:0:x:x',
-      A: { value: { index: 2 } },
-      B: { value: { index: 0 } },
-      C: { value: { index: 0 } }
-    }
-  }
-};
 describe('getUnitsSeries tests', () => {
+  const observations = {
+    0: {
+      key: '0:0:0:0',
+      units: {
+        serieKey: '0:0:x:x',
+        A: { value: { index: 0 } },
+        B: { value: { index: 0 } },
+        C: { value: { index: 0 } }
+      }
+    },
+    1: {
+      key: '0:0:1:0',
+      units: {
+        serieKey: '0:0:x:x',
+        A: { value: { index: 0 } },
+        B: { value: { index: 0 } },
+        C: { value: { index: 1 } }
+      }
+    },
+    2: {
+      key: '1:0:0:0',
+      units: {
+        serieKey: '1:0:x:x',
+        A: { value: { index: 1 } },
+        B: { value: { index: 1 } },
+        C: { value: { index: 0 } }
+      }
+    },
+    3: {
+      key: '1:0:1:0',
+      units: {
+        serieKey: '1:0:x:x',
+        A: { value: { index: 1 } },
+        B: { value: { index: 1 } },
+        C: { value: { index: 0 } }
+      }
+    },
+    4: {
+      key: '2:0:0:0',
+      units: {
+        serieKey: '2:0:x:x',
+        A: { value: { index: 2 } },
+        B: { value: { index: 0 } },
+        C: { value: { index: 0 } }
+      }
+    }
+  };
   it('blank test', () => {
     expect(getUnitsSeries({})).to.deep.equal({});
   });
@@ -62,3 +62,68 @@ describe('getUnitsSeries tests', () => {
       });
   });
 });
+describe('getUnitsSeries tests keys difference', () => {
+  const observations = {
+    "0:0:0:0:0:0": {
+      "key": "0:0:0:0:0:0",
+      "units": {
+        "UNIT_MEASURE": { "value": { "index": 0 }},
+        "UNIT_MULT": { "value": { "index": 0 }},
+        "serieKey": "x:x:x:x:0:x"
+      },
+    },
+    "0:0:0:0:0:1": {
+      "key": "0:0:0:0:0:1",
+      "units": {
+        "UNIT_MEASURE": { "value": { "index": 0 }},
+        "UNIT_MULT": { "value": { "index": 0 }},
+        "serieKey": "x:x:x:x:0:x"
+      },
+    },
+    "0:0:0:1:0:0": {
+      "key": "0:0:0:1:0:0",
+      "units": {
+        "UNIT_MEASURE": { "value": { "index": 0 }},
+        "serieKey": "x:x:x:x:0:x"
+      },
+    },
+    "0:0:0:1:0:1": {
+      "key": "0:0:0:1:0:1",
+      "units": {
+        "UNIT_MEASURE": { "value": { "index": 0 }},
+        "serieKey": "x:x:x:x:0:x"
+      },
+    },
+    "0:0:0:2:1:0": {
+      "key": "0:0:0:2:1:0",
+      "units": {
+        "UNIT_MEASURE": { "value": { "index": 1 }},
+        "UNIT_MULT": { "value": { "index": 0 }},
+        "serieKey": "x:x:x:x:1:x"
+        },
+    },
+    "0:0:0:2:1:1": {
+      "key": "0:0:0:2:1:1",
+      "units": {
+      "UNIT_MEASURE": { "value": { "index": 1 }},
+      "UNIT_MULT": { "value": { "index": 0 }},
+      "serieKey": "x:x:x:x:1:x"
+    },
+    }
+  };
+  const expected = {
+    "x:x:x:x:0:x": {
+      "UNIT_MEASURE": { "value": { "index": 0 }},
+      "serieKey": "x:x:x:x:0:x"
+    },
+    "x:x:x:x:1:x": {
+      "UNIT_MEASURE": { "value": { "index": 1 }},
+      "UNIT_MULT": { "value": { "index": 0 }},
+      "serieKey": "x:x:x:x:1:x"
+    }
+  };
+  it('basic test', () => {
+    expect(getUnitsSeries(observations)).to.deep.equal(expected);
+  });
+});

package/test/invertTime.test.js CHANGED Viewed

@@ -8,6 +8,7 @@ describe('invertTime tests', () => {
         TIME_PERIOD: {
           id: 'TIME_PERIOD',
           __index: 1,
+          role: 'TIME_PERIOD',
           values: [
             { id: 2000 },
             { id: 2001 },
@@ -41,6 +42,7 @@ describe('invertTime tests', () => {
       dimensions: {
         TIME_PERIOD: {
           id: 'TIME_PERIOD',
+          role: 'TIME_PERIOD',
           __index: 1,
           values: [
             { id: 2009 },