@sis-cc/dotstatsuite-components 9.2.1 → 9.2.2

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

@@ -31,6 +31,24 @@ var indexesToLayoutData = function indexesToLayoutData(dimensions, indexes) {
   }, indexes);
 };
 
+var parseParents = function parseParents(value, previous) {
+  var previousParents = R.pathOr([], ['value', 'parents'], previous);
+  var indexedParents = R.indexBy(R.identity, value.parents);
+
+  var refinedParents = R.reduce(function (acc, id) {
+    if (R.has(id, indexedParents)) {
+      return R.append(id, acc);
+    }
+    return acc;
+  }, [], R.append(R.path(['value', 'id'], previous), previousParents));
+  var lastParent = R.last(refinedParents);
+  var missingParents = R.takeLastWhile(function (id) {
+    return id !== lastParent;
+  }, value.parents);
+
+  return { parents: refinedParents, missingIds: missingParents };
+};
+
 var getRowData = function getRowData(indexes, dimension) {
   return R.pipe(R.propOr([], 'values'), R.props(indexes), R.reduce(function (_ref, _value) {
     var data = _ref.data,
@@ -44,7 +62,6 @@ var getRowData = function getRowData(indexes, dimension) {
       return { data: R.append([raw], data), missingParents: {} };
     }
     var previous = R.head(R.last(data) || []);
-
     if (R.last(_value.parents) === R.path(['value', 'id'], previous)) {
       //previous is parent
       var _value2 = R.set(R.lensPath(['value', 'parents']), R.append(R.path(['value', 'id'], previous), R.pathOr([], ['value', 'parents'], previous)))(raw);
@@ -61,9 +78,10 @@ var getRowData = function getRowData(indexes, dimension) {
       return { data: R.append([_value3], data), missingParents: missingParents };
     }
 
-    var missingIds = R.takeLastWhile(function (id) {
-      return id !== R.path(['value', 'id'], previous);
-    }, _value.parents);
+    var _parseParents = parseParents(_value, previous),
+        parents = _parseParents.parents,
+        missingIds = _parseParents.missingIds;
+
     var _missingParents = R.reduce(function (acc, value) {
       if (value.id !== R.head(acc.missingIds)) {
         return acc;
@@ -79,11 +97,11 @@ var getRowData = function getRowData(indexes, dimension) {
     }, { name: '', missingIds: missingIds }, dimension.values);
 
     var value = R.set(R.lensProp('value'), (0, _extends3.default)({}, _value, {
-      name: _missingParents.name + ' > ' + _value.name,
-      parents: R.length(missingIds) === R.length(_value.parents) ? [] : R.append(R.path(['value', 'id'], previous), R.pathOr([], ['value', 'parents'], previous))
+      parents: parents,
+      name: R.isEmpty(missingIds) ? _value.name : _missingParents.name + ' > ' + _value.name
     }))(raw);
 
-    return { data: R.append([value], data), missingParents: _missingParents };
+    return { data: R.append([value], data), missingParents: R.isEmpty(missingIds) ? {} : _missingParents };
   }, { data: [], missingParents: {} }), R.prop('data'))(dimension);
 };
 

package/package.json

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

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

@@ -11,6 +11,26 @@ const indexesToLayoutData = (dimensions, indexes) => R.addIndex(R.map)(
   indexes
 );
 
+const parseParents = (value, previous) => {
+  const previousParents = R.pathOr([], ['value', 'parents'], previous);
+  const indexedParents = R.indexBy(R.identity, value.parents);
+
+  const refinedParents = R.reduce(
+    (acc, id) => {
+      if (R.has(id, indexedParents)) {
+        return R.append(id, acc);
+      }
+      return acc;
+    },
+    [],
+    R.append(R.path(['value', 'id'], previous), previousParents)
+  );
+  const lastParent = R.last(refinedParents);
+  const missingParents = R.takeLastWhile(id => id !== lastParent, value.parents);
+
+  return ({ parents: refinedParents, missingIds: missingParents });
+};
+
 const getRowData = (indexes, dimension) => {
   return R.pipe(
     R.propOr([], 'values'),
@@ -25,7 +45,6 @@ const getRowData = (indexes, dimension) => {
           return ({ data: R.append([raw], data), missingParents: {} });
         }
         const previous = R.head(R.last(data) || []);
-
         if (R.last(_value.parents) === R.path(['value', 'id'], previous)) { //previous is parent
           const value = R.set(
             R.lensPath(['value', 'parents']),
@@ -49,8 +68,7 @@ const getRowData = (indexes, dimension) => {
           )(raw);
           return ({ data: R.append([value], data), missingParents });
         }
-
-        const missingIds = R.takeLastWhile(id => id !== R.path(['value', 'id'], previous), _value.parents);
+        const { parents, missingIds } = parseParents(_value, previous);
         const _missingParents = R.reduce(
           (acc, value) => {
             if (value.id !== R.head(acc.missingIds)) {
@@ -73,14 +91,12 @@ const getRowData = (indexes, dimension) => {
           R.lensProp('value'),
           {
             ..._value,
-            name: `${_missingParents.name} > ${_value.name}`,
-            parents: R.length(missingIds) === R.length(_value.parents)
-              ? []
-              : R.append(R.path(['value', 'id'], previous), R.pathOr([], ['value', 'parents'], previous))
+            parents,
+            name: R.isEmpty(missingIds) ? _value.name : `${_missingParents.name} > ${_value.name}`,
           }
         )(raw);
 
-        return ({ data: R.append([value], data), missingParents: _missingParents });
+        return ({ data: R.append([value], data), missingParents: R.isEmpty(missingIds) ? {} : _missingParents });
       },
       { data: [], missingParents: {} }
     ),
@@ -151,4 +167,3 @@ export const getLayoutData = (layoutIndexes, layout) => {
 
   return ({ headerData, sectionsData, truncated });
 };
-

package/test/{getLayoutData2.test.js → getLayoutData.test.js}

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { getLayoutData } from '../src/rules/src/table/factories/getLayoutData';
 
-describe('getLayoutData2 tests', () => {
+describe('getLayoutData tests', () => {
   it ('simple single row diension case', () => {
     const layout = {
       header: [],
@@ -46,7 +46,9 @@ describe('getLayoutData2 tests', () => {
             { id: '3v0', name: '3V0' },
             { id: '3v0.0', name: '3V0.0', parents: ['3v0'] },
             { id: '3v0.0.0', name: '3V0.0.0', parents: ['3v0', '3v0.0'] },
-            { id: '3v0.0.1', name: '3V0.0.1', parents: ['3v0', '3v0.0'] }
+            { id: '3v0.0.1', name: '3V0.0.1', parents: ['3v0', '3v0.0'] },
+            { id: '3v0.1', name: '3V0.1', parents: ['3v0'] },
+            { id: '3v0.1.0', name: '3V0.1.0', parents: ['3v0', '3v0.1'] }
           ]
         },
       ]
@@ -74,7 +76,9 @@ describe('getLayoutData2 tests', () => {
             [3, 0],
             [3, 1],
             [3, 2],
-            [3, 3]
+            [3, 3],
+            [3, 4],
+            [3, 5]
           ]
         ],
         [
@@ -162,6 +166,14 @@ describe('getLayoutData2 tests', () => {
             [
               { dimension: { id: 'd2' }, value: { id: '2v0.0.1', name: '2V0.0.1', parents: ['2v0', '2v0.0'] } },
               { dimension: { id: 'd3' }, value: { id: '3v0.0.1', name: '3V0.0.1', parents: ['3v0', '3v0.0'] } }
+            ],
+            [
+              { dimension: { id: 'd2' }, value: { id: '2v0.0.1', name: '2V0.0.1', parents: ['2v0', '2v0.0'] } },
+              { dimension: { id: 'd3' }, value: { id: '3v0.1', name: '3V0.1', parents: ['3v0'] } }
+            ],
+            [
+              { dimension: { id: 'd2' }, value: { id: '2v0.0.1', name: '2V0.0.1', parents: ['2v0', '2v0.0'] } },
+              { dimension: { id: 'd3' }, value: { id: '3v0.1.0', name: '3V0.1.0', parents: ['3v0', '3v0.1'] } }
             ]
           ]
         ],