@sis-cc/dotstatsuite-components 14.2.2 → 14.2.3

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.3",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

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