@sis-cc/dotstatsuite-components 15.0.10 → 15.0.12

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/rules/src/table/units/getHeaderUnits.js

@@ -27,7 +27,7 @@ var getHeaderUnits = exports.getHeaderUnits = function getHeaderUnits(_ref) {
   var artefacts = R.converge(R.merge, [R.pathOr({}, ['dimensions', 'header']), R.pathOr({}, ['attributes', 'header'])])(unitsArtefacts);
 
   return R.pipe(R.props(unitsDefinitionCodes), R.reduce(function (acc, entry) {
-    if (R.isNil(entry) || R.includes(R.path(['values', 0, 'id'], entry), rejectedValueIds)) {
+    if (R.isNil(entry) || !R.propOr(true, 'display', entry) || !R.pathOr(true, ['values', 0, 'display'], entry) || R.includes(R.path(['values', 0, 'id'], entry), rejectedValueIds)) {
       return acc;
     }
     return R.append((0, _extends3.default)({}, R.pick(['id', 'name'], entry), { value: R.path(['values', 0], entry) }), acc);

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.12",
   "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/rules/src/table/units/getHeaderUnits.js

@@ -17,7 +17,8 @@ export const getHeaderUnits = ({
     R.props(unitsDefinitionCodes),
     R.reduce(
       (acc, entry) => {
-        if (R.isNil(entry) || R.includes(R.path(['values', 0, 'id'], entry), rejectedValueIds)) {
+        if (R.isNil(entry) || !(R.propOr(true, 'display', entry)) || !(R.pathOr(true, ['values', 0, 'display'], entry))
+          || R.includes(R.path(['values', 0, 'id'], entry), rejectedValueIds)) {
           return acc;
         }
         return R.append(

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);
   });
 });

package/test/getHeaderUnits.test.js

@@ -31,4 +31,21 @@ describe('getHeaderUnits tests', () => {
       { id: 'A2', value: { id: 'V1' } }
     ]);
   });
+  it('no display', () => {
+    expect(getHeaderUnits({
+      unitsArtefacts: {
+        attributes: { header: {
+          A1: { id: 'A1', values: [{ id: 'V1' }] },
+          A2: { id: 'A2', display: false, values: [{ id: 'V1' }] },
+          A3: { id: 'A3', values: [{ id: 'RA' }] },
+        } },
+        dimensions: { header: {
+          D1: { id: 'D1', values: [{ id: 'V1', display: false }] },
+          D2: { id: 'D2', values: [{ id: 'RD' }] }
+        } }
+      },
+      rejectedValues: ['RA', 'RD'],
+      unitsDefinitionCodes: ['D1', 'C8', 'A2']
+    })).to.deep.equal([]);
+  })
 });

package/test/hierarchiseDimensionWithNativeHierarchy.test.js

@@ -73,7 +73,7 @@ describe('hierarchiseDimensionWithNativeHierarchy tests', () => {
         { id: 'A', parent: undefined, parents: [], __indexPosition: 20 },
         { id: 'EA', parent: undefined, parents: [], __indexPosition: 30 },
         { id: 'GER', parent: 'EA', parents: ['EA'], __indexPosition: 100 },
-        { id: '', parent: '', parents: [''], __indexPosition: 101 }
+        { id: '', parent: undefined, parents: [], __indexPosition: 101 }
       ]
     };