@sis-cc/dotstatsuite-components 17.25.0 → 17.26.1

package/lib/rules/src/layout.js

@@ -16,13 +16,19 @@ var _src = require('../../rules2/src');
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 var isTableLayoutCompatible = function isTableLayoutCompatible(data, layout) {
-  var dataquery = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var combinationsDefinitions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var dataquery = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
 
   var multiValuesDimensions = R.pipe(R.pathOr([], ['structure', 'dimensions', 'observation']), function (dimensions) {
     return (0, _src.refineDimensions)(dimensions, dataquery);
   }, R.reject(function (d) {
     return R.prop('header', d) || !R.length(d.values || []);
-  }), R.pluck('id'))(data);
+  }), R.pluck('id'), R.map(function (d) {
+    var conceptId = R.find(function (comb) {
+      return R.includes(d, R.propOr([], 'concepts', comb));
+    })(combinationsDefinitions);
+    return conceptId ? conceptId.id : d;
+  }))(data);
   var dimensionsInLayout = R.pipe(R.values, R.unnest)(layout);
 
   var dimensionsLength = R.length(multiValuesDimensions);
@@ -72,7 +78,10 @@ var isSharedLayoutCompatible = exports.isSharedLayoutCompatible = function isSha
   if (type === 'table') {
     var layoutIds = R.pathOr({}, ['config', 'table', 'layoutIds'], sharedData);
     var dataquery = R.path(['config', 'sdmxSource', 'dataquery'], sharedData);
-    return isTableLayoutCompatible(sdmxData, layoutIds, dataquery);
+    var annotations = R.pathOr({}, ['structure', 'annotations'], sdmxData);
+    var locale = R.pathOr({}, ['config', 'table', 'locale'], sharedData);
+    var combinationsDefinitions = (0, _src.getCombinationDefinitions)(annotations, locale);
+    return isTableLayoutCompatible(sdmxData, layoutIds, combinationsDefinitions, dataquery);
   }
   var chartDimension = R.pathOr({}, ['config', 'chart', 'chartDimension'], sharedData);
   return isChartLayoutCompatible(sdmxData, type, chartDimension);

package/lib/rules2/src/parseAttributes.js

@@ -40,7 +40,7 @@ var parseAttributes = exports.parseAttributes = function parseAttributes(attribu
     }
     var seriesDimensions = R.pipe(R.pathOr([], ['relationship', 'dimensions']), R.filter(function (id) {
       var dimension = R.prop(id, indexedDimensions);
-      return !dimension.header;
+      return !dimension.header && R.length(dimension.values || []) > 1;
     }))(attr);
     if (R.length(seriesDimensions) > 0) {
       return (0, _extends3.default)({}, res, { series: true, relationship: seriesDimensions });

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

@@ -61,7 +61,7 @@ var getCells = exports.getCells = function getCells(customAttributes, cellsAttri
     var attributesInCellsCombination = R.pipe(R.propOr([], 'cells'), R.pluck('concepts'), R.unnest)(combinations);
 
     var _customAttributes = R.over(R.lensProp('notes'), function (notes) {
-      return R.concat(notes || [], attributesInLayoutCombination);
+      return R.pipe(R.concat, R.uniq)(notes || [], attributesInLayoutCombination);
     })(customAttributes);
 
     return R.mapObjIndexed(function (obs) {

package/package.json

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

package/src/rules/src/layout.js

@@ -6,14 +6,18 @@ import {
   STACKED_ROW,
   V_SYMBOL
 } from './constants';
-import { refineDimensions } from '../../rules2/src';
+import { getCombinationDefinitions, refineDimensions } from '../../rules2/src';
 
-const isTableLayoutCompatible = (data, layout, dataquery='') => {
+const isTableLayoutCompatible = (data, layout, combinationsDefinitions = [], dataquery = '') => {
   const multiValuesDimensions = R.pipe(
     R.pathOr([], ['structure', 'dimensions', 'observation']),
     dimensions => refineDimensions(dimensions, dataquery),
     R.reject(d => R.prop('header', d) || !R.length(d.values || [])),
-    R.pluck('id')
+    R.pluck('id'),
+    R.map(d => {
+      const conceptId = R.find(comb => R.includes(d, R.propOr([], 'concepts', comb)))(combinationsDefinitions)
+      return conceptId ? conceptId.id : d
+    }),
   )(data);
   const dimensionsInLayout = R.pipe(R.values, R.unnest)(layout);
 
@@ -85,7 +89,10 @@ export const isSharedLayoutCompatible = (sdmxData, sharedData) => {
   if (type === 'table') {
     const layoutIds = R.pathOr({}, ['config', 'table', 'layoutIds'], sharedData);
     const dataquery = R.path(['config', 'sdmxSource', 'dataquery'], sharedData);
-    return isTableLayoutCompatible(sdmxData, layoutIds, dataquery);
+    const annotations = R.pathOr({}, ['structure', 'annotations'], sdmxData)
+    const locale = R.pathOr({}, ['config', 'table', 'locale'], sharedData)
+    const combinationsDefinitions = getCombinationDefinitions(annotations, locale)
+    return isTableLayoutCompatible(sdmxData, layoutIds, combinationsDefinitions, dataquery);
   }
   const chartDimension = R.pathOr({}, ['config', 'chart', 'chartDimension'], sharedData);
   return isChartLayoutCompatible(sdmxData, type, chartDimension);

package/src/rules2/src/parseAttributes.js

@@ -25,7 +25,7 @@ export const parseAttributes = (attributes, dimensions, customAttributes) => {
       R.pathOr([], ['relationship', 'dimensions']),
       R.filter(id => {
         const dimension = R.prop(id, indexedDimensions);
-        return !dimension.header;
+        return !dimension.header && R.length(dimension.values || []) > 1;
       }),
     )(attr);
     if (R.length(seriesDimensions) > 0) {

package/src/rules2/src/table/getCells.js

@@ -57,7 +57,7 @@ export const getCells = (customAttributes, cellsAttributesId, combinations, attr
 
   const _customAttributes = R.over(
     R.lensProp('notes'),
-    notes => R.concat(notes || [], attributesInLayoutCombination)
+    notes => R.pipe(R.concat, R.uniq)(notes || [], attributesInLayoutCombination)
   )(customAttributes);
 
   return R.mapObjIndexed(

package/test/getCells.test.js

@@ -78,4 +78,41 @@ describe('getCells tests', () => {
       }
     });
   });
+  it('duplication between notes and combinations definitions', () => {
+    const _customAttributes = {
+      flags: [],
+      notes: ['A1', 'A2']
+    };
+
+    const combinations = {
+      cells: [],
+      layout: [{ id: 'LAYOUT_COMB', concepts: ['D1', 'A1'] }]
+    };
+
+    const attributesSeries = { 'D1=V0': {} };
+
+    const cellsAttributesIds = ['A2'];
+
+    const observations = {
+      'obs': {
+        value: 'val',
+        formattedValue: 'val',
+        attributes: {
+          A1: { id: 'A1', value: { id: 'A1V' }, serieKey: 'D1=V0' },
+          A2: { id: 'A2', value: { id: 'A2V' } },
+        }
+      }
+    };
+    expect(getCells(_customAttributes, cellsAttributesIds, combinations, attributesSeries, [])(observations)).to.deep.equal({
+      'obs': {
+        value: 'val',
+        intValue: null,
+        sideProps: null,
+        flags: [
+          { id: 'A1', value: { id: 'A1V' } },
+          { id: 'A2', value: { id: 'A2V' } }
+        ]
+      }
+    });
+  });
 });

package/test/isTableLayoutCompatible.test.js

@@ -11,7 +11,30 @@ const sdmxData = {
         { id: 'd3', values: [{ id: 'v1' }] },
         { id: 'd4', values: [] },
       ]
-    }
+    },
+  }
+}
+const sdmxData2 = {
+  structure: {
+    dimensions: {
+      observation: [
+        { id: 'd0', values: [{ id: 'v1' }, { id: 'v2' }] },
+        { id: 'd1', values: [{ id: 'v1' }, { id: 'v2' }, { id: 'v3' }] },
+        { id: 'd2', values: [{ id: 'v1' }, { id: 'v2' }] },
+        { id: 'd3', values: [{ id: 'v1' }] },
+        { id: 'd4', values: [] },
+      ]
+    },
+    annotations: [
+      {
+        title: "d6:d1,d3,d4",
+        type: "COMBINED_CONCEPTS",
+        text: "d6:Combined unit of measure",
+        texts: {
+          en: "d6:Combined unit of measure"
+        }
+      }
+    ]
   }
 }
 
@@ -20,6 +43,10 @@ describe('isSharedLayoutCompatible', () => {
     const layoutIds = { rows: ['d0'], sections: ['d1'], header: ['d2'] };
     expect(isSharedLayoutCompatible(sdmxData, { type: 'table', config: { table: { layoutIds } } })).to.equal(true);
   });
+  it('table compatible test combined', () => {
+    const layoutIds = { rows: ['d0'], sections: ['d6'], header: ['d2'] };
+    expect(isSharedLayoutCompatible(sdmxData2, { type: 'table', config: { table: { layoutIds, locale: 'en' } } })).to.equal(true);
+  });
   it('table incompatible absent dimension in multi dims test', () => {
     const layoutIds = { rows: ['d0', 'd3'], sections: ['d1'], header: ['d2'] };
     expect(isSharedLayoutCompatible(sdmxData, { type: 'table', config: { table: { layoutIds } } })).to.equal(false);

package/test/parseAttributes.test.js

@@ -7,6 +7,7 @@ const attributes = [
   { id: 'a9', relationship: { dimensions: ['d4'] }, values: [{ id: 'a9v1' }] }, // single 'many values' dimension relationship
   { id: 'a10', relationship: { dimensions: ['d1', 'd2'] }, values: [{ id: 'a10v1' }] }, // many 'single value' dimensions realtionship
   { id: 'a11', relationship: { dimensions: ['d1', 'd2', 'd4'] }, values: [{ id: 'a11v1' }] }, // one 'many values' and many 'single value' dimensions relationship
+  { id: 'a12', relationship: { dimensions: ['d4', 'd5', 'd7'] }, values: [{ id: 'a11v1' }] }, // exclude empty dimension from relationship
 ];
 
 const customAttributes = {};
@@ -18,6 +19,7 @@ const dimensions = [
   { id: 'd4', header: false, values: [{ id: 'v0' }, { id: 'v1' }] },
   { id: 'd5', header: false, values: [{ id: 'v0' }, { id: 'v1' }] },
   { id: 'd6', header: false, values: [{ id: 'v0' }, { id: 'v1' }] },
+  { id: 'd7', header: false, values: [] }
 ];
 
 describe('parseAttributes test', () => {
@@ -28,6 +30,7 @@ describe('parseAttributes test', () => {
       { id: 'a9', index: 2, relationship: ['d4'], series: true, values: [{ id: 'a9v1' }] },
       { id: 'a10', index: 3, relationship: ['d1', 'd2'], header: true, values: [{ id: 'a10v1' }] },
       { id: 'a11', index: 4, relationship: ['d4'], series: true, values: [{ id: 'a11v1' }] },
+      { id: 'a12', index: 5, relationship: ['d4', 'd5'], series: true, values: [{ id: 'a11v1' }] },
     ]);
   });
 });