@sis-cc/dotstatsuite-components 15.0.10 → 15.0.11

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

@@ -56,7 +56,7 @@ var comparator = function comparator(size) {
   };
 };
 
-// simple call to ramda uniq method is very slow regarding performance 
+// simple call to ramda uniq method is very slow regarding performance
 var uniqIndexes = function uniqIndexes(indexes) {
   return R.pipe(R.reduce(function (acc, i) {
     var key = R.join(':', i);
@@ -71,7 +71,7 @@ var uniqIndexes = function uniqIndexes(indexes) {
 };
 
 var getSortedLayoutIndexes = exports.getSortedLayoutIndexes = function getSortedLayoutIndexes(layout, observations) {
-  var dimIndexes = R.pipe(R.values, R.pluck('orderedDimIndexes'))(observations);
+  var dimIndexes = R.pipe(R.values, R.map(R.propOr([], 'orderedDimIndexes')))(observations);
 
   var headerLength = R.length(layout.header);
 

package/lib/rules2/src/duplicateObservations.js

@@ -13,7 +13,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 var duplicateObs = exports.duplicateObs = function duplicateObs(dims, observations) {
   var obsValues = R.values(observations);
-  if (R.length(obsValues) < 2 || R.length(dims) === 0) {
+  if (R.length(dims) === 0) {
     return observations;
   }
   var duplicated = R.reduce(function (obs, dim) {

package/package.json

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

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

@@ -33,7 +33,7 @@ const comparator = size => (a, b) => {
   return a[i] - b[i];
 };
 
-// simple call to ramda uniq method is very slow regarding performance 
+// simple call to ramda uniq method is very slow regarding performance
 const uniqIndexes = (indexes) => R.pipe(
   R.reduce(
     (acc, i) => {
@@ -52,7 +52,7 @@ const uniqIndexes = (indexes) => R.pipe(
 )(indexes);
 
 export const getSortedLayoutIndexes = (layout, observations) => {
-  const dimIndexes = R.pipe(R.values, R.pluck('orderedDimIndexes'))(observations);
+  const dimIndexes = R.pipe(R.values, R.map(R.propOr([], 'orderedDimIndexes')))(observations);
 
   const headerLength = R.length(layout.header);
 

package/src/rules2/src/duplicateObservations.js

@@ -2,7 +2,7 @@ import * as R from 'ramda';
 
 export const duplicateObs = (dims, observations) => {
   const obsValues = R.values(observations);
-  if ((R.length(obsValues) < 2) || R.length(dims) === 0) {
+  if (R.length(dims) === 0) {
     return observations;
   }
   const duplicated = R.reduce(

package/test/duplicateObs.test.js

@@ -78,6 +78,41 @@ describe('duplicate obs tests', () => {
       }
     };
 
+    expect(duplicateObs(dims, obs)).to.deep.equal(expected);
+  });
+  it('handle uniq observation case', () => {
+    const dims = [{
+      id: 'REF_AREA',
+      __index: 2,
+      values: [
+        { id: 'W' },
+        { id: 'OECD' },
+        { id: 'FRA' },
+        { id: 'GER' },
+        { id: 'EA' },
+        { id: 'GER' },
+        { id: 'FRA' },
+      ]
+    }];
+    const obs = {
+      '0:0:0': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        dimValuesIndexes: [0, 0, 0],
+      }
+    };
+    const expected = {
+      '0:0:2': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        orderedDimIndexes: [0, 0, 2],
+        dimValuesIndexes: [0, 0, 0],
+      },
+      '0:0:6': {
+        indexedDimValIds: { FREQ: 'A', VAR: '_T', REF_AREA: 'FRA' },
+        orderedDimIndexes: [0, 0, 6],
+        dimValuesIndexes: [0, 0, 0],
+      }
+    };
+
     expect(duplicateObs(dims, obs)).to.deep.equal(expected);
   });
 });