@sis-cc/dotstatsuite-components 17.9.0 → 17.10.0

package/lib/rules2/src/table/getCombinationDimensionsData.js

@@ -29,7 +29,7 @@ var getCombinationDimensionsData = exports.getCombinationDimensionsData = functi
     coordinates = R.assoc(dimension.id, value.id, coordinates);
     ids = R.append(dimension.id + '=' + value.id, ids);
     var previousValue = R.propOr({}, dimension.id, previous);
-    if (value.id === R.prop('id', previousValue || {}) && _sameSerie) {
+    if ((0, _parseValueHierarchy.isSameValueAsPrevious)(value, previousValue) && _sameSerie) {
       return R.assoc(dimension.id, previousValue, acc);
     } else {
       var _parsedValue = (0, _parseValueHierarchy.parseValueHierarchy)(value, _sameSerie ? previousValue || {} : {}, dimension.indexedValues);

package/lib/rules2/src/table/getLayoutData.js

@@ -93,7 +93,7 @@ var getSubLayoutData = function getSubLayoutData(series, _definition, _ref) {
         var previousValue = R.nth(i, acc.previous) || {};
         coordinates = R.assoc(dimension.id, value.id, coordinates);
         ids = R.append(dimension.id + '=' + value.id, ids);
-        if (value.id === R.prop('id', previousValue || {}) && sameSerie) {
+        if ((0, _parseValueHierarchy.isSameValueAsPrevious)(value, previousValue) && sameSerie) {
           next = R.append(previousValue, next);
           data = R.append({
             dimension: R.pick(['id', 'name', '__index'], dimension),

package/lib/rules2/src/table/parseValueHierarchy.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseValueHierarchy = undefined;
+exports.parseValueHierarchy = exports.isSameValueAsPrevious = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -21,6 +21,13 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var isSameValueAsPrevious = exports.isSameValueAsPrevious = function isSameValueAsPrevious(value, previousValue) {
+  var valueHierarchicalPath = R.append(value.id, R.propOr([], 'parents', value));
+  var previousValueHierarchicalPath = R.append(previousValue.id, R.propOr([], 'parents', previousValue));
+
+  return R.equals(valueHierarchicalPath, previousValueHierarchicalPath);
+};
+
 var parseValueHierarchy = exports.parseValueHierarchy = function parseValueHierarchy(value, previousValue, indexedValues) {
   var parentsIds = R.propOr([], 'parents', value);
   if (R.isEmpty(parentsIds)) {

package/package.json

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

package/src/rules2/src/table/getCombinationDimensionsData.js

@@ -1,5 +1,5 @@
 import * as R from 'ramda';
-import { parseValueHierarchy } from './parseValueHierarchy';
+import { parseValueHierarchy, isSameValueAsPrevious } from './parseValueHierarchy';
 
 export const getCombinationDimensionsData = (indexes, combination, previous, sameSerie) => {
   let coordinates = {};
@@ -16,7 +16,7 @@ export const getCombinationDimensionsData = (indexes, combination, previous, sam
       coordinates = R.assoc(dimension.id, value.id, coordinates);
       ids = R.append(`${dimension.id}=${value.id}`, ids);
       const previousValue = R.propOr({}, dimension.id, previous);
-      if (value.id === R.prop('id', previousValue || {}) && _sameSerie) {
+      if (isSameValueAsPrevious(value, previousValue) && _sameSerie) {
         return R.assoc(dimension.id, previousValue, acc);
       }
       else {

package/src/rules2/src/table/getLayoutData.js

@@ -1,7 +1,7 @@
 import * as R from 'ramda';
 import { getFlagsAndNotes } from './getFlagsAndNotes';
 import { getCombinationDimensionsData } from './getCombinationDimensionsData';
-import { parseValueHierarchy } from './parseValueHierarchy';
+import { parseValueHierarchy, isSameValueAsPrevious } from './parseValueHierarchy';
 import { getLayoutCoordinatesValidator } from '../utils';
 
 const getSubLayoutData = (series, _definition, { metadataCoordinates, attributesSeries, customAttributes, topCoordinates={} }) => {
@@ -70,7 +70,7 @@ const getSubLayoutData = (series, _definition, { metadataCoordinates, attributes
           const previousValue = R.nth(i, acc.previous) || {};
           coordinates = R.assoc(dimension.id, value.id, coordinates);
           ids = R.append(`${dimension.id}=${value.id}`, ids);
-          if (value.id === R.prop('id', previousValue || {}) && sameSerie) {
+          if (isSameValueAsPrevious(value, previousValue) && sameSerie) {
             next = R.append(previousValue, next);
             data = R.append({
               dimension: R.pick(['id', 'name', '__index'], dimension),

package/src/rules2/src/table/parseValueHierarchy.js

@@ -1,5 +1,12 @@
 import * as R from 'ramda';
 
+export const isSameValueAsPrevious = (value, previousValue) => {
+  const valueHierarchicalPath = R.append(value.id, R.propOr([], 'parents', value));
+  const previousValueHierarchicalPath = R.append(previousValue.id, R.propOr([], 'parents', previousValue));
+
+  return R.equals(valueHierarchicalPath, previousValueHierarchicalPath);
+}
+
 export const parseValueHierarchy = (value, previousValue, indexedValues) => {
   const parentsIds = R.propOr([], 'parents', value);
   if (R.isEmpty(parentsIds)) {

package/test/getCombinationDimensionsData.test.js

@@ -50,4 +50,50 @@ describe('getCombinationDimensionsData', () => {
       hasAdvancedAttributes: true
     });
   });
+  it('same value but under different hierarchy', () => {
+    const combination = {
+      id: 'COMB',
+      dimensions: [
+        {
+          id: 'D0',
+          values: [
+            { id: 'v0' },
+            { id: 'v1' },
+            { id: 'v2' },
+          ]
+        },
+        {
+          id: 'D1',
+          values: [
+            { id: 'EU' },
+            { id: 'FRA', parents: ['EU'] },
+            { id: 'GER', parents: ['EU'] },
+            { id: 'OECD' },
+            { id: 'FRA', parents: ['OECD'] },
+            { id: 'GER', parents: ['OECD'] },
+          ],
+          indexedValues: {
+            EU: { id: 'EU' },
+            FRA: { id: 'FRA' },
+            GER: { id: 'GER' },
+            OECD: { id: 'OECD' },
+          }
+        },
+      ]
+    };
+
+    const indexes = [0, 4];
+
+    const previous = { D0: { id: 'v0', display: true }, D1: { id: 'FRA', display: true, parents: [{ id: 'EU' }], parentsIds: ['EU'], missingParents: [] } };
+    expect(getCombinationDimensionsData(indexes, combination, previous, true)).to.deep.equal({
+      dimValues: {
+        D0: { id: 'v0', display: true },
+        D1: { id: 'FRA', display: true, parents: [], missingParents: [{ id: 'OECD' }], parentsIds: ['OECD'] },
+      },
+      sameSerie: false,
+      coordinates: { D0: 'v0', D1: 'FRA' },
+      ids: ['D0=v0', 'D1=FRA'],
+      hasAdvancedAttributes: undefined
+    });
+  });
 });