@sis-cc/dotstatsuite-components 14.2.2 → 14.2.5

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

@@ -53,7 +53,7 @@ var getUnitsArtefacts = exports.getUnitsArtefacts = function getUnitsArtefacts(_
     if (length === 0) {
       return acc;
     }
-    if (R.path(['relationship', 'primaryMeasure'], attr) === 'OBS_VALUE') {
+    if (R.path(['relationship', 'primaryMeasure'], attr) === 'OBS_VALUE' || R.hasPath(['relationship', 'observation'], attr)) {
       return R.assocPath(['series', attr.id], (0, _extends3.default)({}, attr, { index: index, observations: true }), acc);
     }
     var attachedDimensions = R.path(['relationship', 'dimensions'], attr);

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/lib/rules2/src/hierarchiseDimensionWithNativeHierarchy.js

@@ -13,12 +13,15 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 var hierarchiseDimensionWithNativeHierarchy = exports.hierarchiseDimensionWithNativeHierarchy = function hierarchiseDimensionWithNativeHierarchy(dimension) {
   var values = R.sortBy(R.prop('__indexPosition'), dimension.values || []);
-  var grouped = R.groupBy(R.propOr('#ROOT', 'parent'), values);
+  var indexed = R.indexBy(R.prop('id'), values);
+  var grouped = R.groupBy(function (val) {
+    return val.parent && R.has(val.parent, indexed) ? val.parent : '#ROOT';
+  }, values);
 
   var getChildren = function getChildren(parents) {
     var childs = R.propOr([], R.last(parents) || '#ROOT', grouped);
     return R.reduce(function (acc, child) {
-      var refined = R.assoc('parents', parents, child);
+      var refined = R.pipe(R.assoc('parents', parents), R.assoc('parent', R.last(parents)))(child);
       var children = getChildren(R.append(child.id, parents));
       return R.concat(acc, R.prepend(refined, children));
     }, [], childs);

package/package.json

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

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

@@ -54,7 +54,8 @@ export const getUnitsArtefacts = ({ unitsDefinitionCodes=[], data }) => {
             if (length === 0) {
               return acc;
             }
-            if (R.path(['relationship', 'primaryMeasure'], attr) === 'OBS_VALUE') {
+            if ((R.path(['relationship', 'primaryMeasure'], attr) === 'OBS_VALUE')
+              || (R.hasPath(['relationship', 'observation'], attr))) {
               return R.assocPath(['series', attr.id], { ...attr, index, observations: true }, acc);
             }
             const attachedDimensions = R.path(['relationship', 'dimensions'], attr);

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

package/src/rules2/src/hierarchiseDimensionWithNativeHierarchy.js

@@ -2,13 +2,17 @@ import * as R from 'ramda';
 
 export const hierarchiseDimensionWithNativeHierarchy = (dimension) => {
   const values = R.sortBy(R.prop('__indexPosition'), dimension.values || []);
-  const grouped = R.groupBy(R.propOr('#ROOT', 'parent'), values);
+  const indexed = R.indexBy(R.prop('id'), values);
+  const grouped = R.groupBy(val => val.parent && R.has(val.parent, indexed) ? val.parent : '#ROOT', values);
 
   const getChildren = (parents) => {
     const childs = R.propOr([], R.last(parents) || '#ROOT', grouped);
     return R.reduce(
       (acc, child) => {
-        const refined = R.assoc('parents', parents, child);
+        const refined = R.pipe(
+          R.assoc('parents', parents),
+          R.assoc('parent', R.last(parents)),
+        )(child);
         const children = getChildren(R.append(child.id, parents));
         return R.concat(acc, R.prepend(refined, children));
       },

package/test/getUnitsArtefacts.test.js

@@ -17,6 +17,7 @@ const data = {
         { id: 'A7', relationship: { dimensions: ['D1', 'D2'] }, values: [{ id: 'V1' }] },
         { id: 'A8', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }] },
         { id: 'A9', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'V1' }, { id: 'V2' }], display: false },
+        { id: 'A10', relationship: { observation: {} }, values: [{ id: 'V1' }, { id: 'V2' }] },
       ]
     },
     dimensions: {
@@ -109,4 +110,10 @@ describe('getUnitsArtefacts tests', () => {
       dimensions: { header: {}, series: {} },
     });
   });
+  it('observation relationship', () => {
+    expect(getUnitsArtefacts({ data: { data }, unitsDefinitionCodes: ['A9', 'A10'] })).to.deep.equal({
+      attributes: { header: {}, series: { A10: { id: 'A10', observations: true, index: 7, relationship: { observation: {} }, values: [{ id: 'V1' }, { id: 'V2' }] } } },
+      dimensions: { header: {}, series: {} },
+    });
+  });
 });

package/test/hierarchiseDimensionWithNativeHierarchy.test.js

@@ -27,6 +27,31 @@ describe('hierarchiseDimensionWithNativeHierarchy tests', () => {
       ]
     };
 
+    expect(hierarchiseDimensionWithNativeHierarchy(dimension)).to.deep.equal(expected);
+  });
+  it ('missing parent test', () => {
+    const dimension = {
+      id: 'test',
+      values: [
+        { id: 'FRA', parent: 'EA', __indexPosition: 101 },
+        { id: 'GER', parent: 'EA', __indexPosition: 100 },
+        { id: 'EA', parent: 'W', __indexPosition: 30 },
+        { id: 'A', parent: 'W', __indexPosition: 20 },
+        { id: 'CHI', parent: undefined, __indexPosition: 0 }
+      ]
+    };
+    
+    const expected = {
+      id: 'test',
+      values: [
+        { id: 'CHI', parent: undefined, parents: [], __indexPosition: 0 },
+        { id: 'A', parent: undefined, parents: [], __indexPosition: 20 },
+        { id: 'EA', parent: undefined, parents: [], __indexPosition: 30 },
+        { id: 'GER', parent: 'EA', parents: ['EA'], __indexPosition: 100 },
+        { id: 'FRA', parent: 'EA', parents: ['EA'], __indexPosition: 101 }
+      ]
+    };
+
     expect(hierarchiseDimensionWithNativeHierarchy(dimension)).to.deep.equal(expected);
   });
 });