@sis-cc/dotstatsuite-components 17.3.0 → 17.4.0

package/lib/rules2/src/getCombinationDefinitions.js

@@ -17,10 +17,25 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var parseTexts = function parseTexts(texts) {
+  return R.reduce(function (acc, text) {
+    var splitted = R.split(':', text);
+    if (R.length(splitted) !== 2) {
+      return acc;
+    }
+
+    var _splitted = (0, _slicedToArray3.default)(splitted, 2),
+        id = _splitted[0],
+        name = _splitted[1];
+
+    return R.assoc(id, name, acc);
+  }, {}, texts);
+};
+
 var parseCombinationDefinition = exports.parseCombinationDefinition = function parseCombinationDefinition(locale) {
   return function (title, texts) {
     return R.useWith(function (titles, texts) {
-      return R.addIndex(R.reduce)(function (acc, title, index) {
+      return R.reduce(function (acc, title) {
         var split = R.split(':', title);
         if (R.length(split) !== 2) {
           return acc;
@@ -36,10 +51,10 @@ var parseCombinationDefinition = exports.parseCombinationDefinition = function p
         return R.append({
           id: id,
           concepts: R.split(',', codes),
-          name: R.has(locale, texts) ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts) : '[' + id + ']'
+          name: R.hasPath([locale, id], texts) ? R.path([locale, id], texts) : '[' + id + ']'
         }, acc);
       }, [], titles);
-    }, [R.split(';'), R.map(R.split(';'))])(title, texts);
+    }, [R.split(';'), R.map(R.pipe(R.split(';'), parseTexts))])(title, texts);
   };
 };
 

package/lib/rules2/src/getHeaderCombinations.js

@@ -11,6 +11,8 @@ var R = _interopRequireWildcard(_ramda);
 
 var _src = require('../../rules/src');
 
+var _constants = require('./constants');
+
 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 getHeaderCombinations = exports.getHeaderCombinations = function getHeaderCombinations(combinations, dimensions, attributes, display) {
@@ -25,7 +27,9 @@ var getHeaderCombinations = exports.getHeaderCombinations = function getHeaderCo
 
     var combinedDisplay = function combinedDisplay(_display, values) {
       if (_display === 'label') {
-        return R.pipe(R.filter(R.propOr(true, 'display')), R.map((0, _src.dimensionValueDisplay)(_display)), R.join(', '))(values);
+        return R.pipe(R.filter(function (val) {
+          return R.propOr(true, 'display', val) && !R.includes(val.id, _constants.REJECTED_VALUE_IDS);
+        }), R.map((0, _src.dimensionValueDisplay)(_display)), R.join(', '))(values);
       }
       return R.pipe(R.map((0, _src.dimensionValueDisplay)(_display)), R.join(', '))(values);
     };

package/package.json

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

package/src/rules2/src/getCombinationDefinitions.js

@@ -1,8 +1,21 @@
 import * as R from 'ramda';
 
+const parseTexts = texts => R.reduce(
+  (acc, text) => {
+    const splitted = R.split(':', text);
+    if (R.length(splitted) !== 2) {
+      return acc;
+    }
+    const [id, name] = splitted;
+    return R.assoc(id, name, acc);
+  },
+  {},
+  texts
+);
+
 export const parseCombinationDefinition = (locale) => (title, texts) => R.useWith(
   (titles, texts) =>
-    R.addIndex(R.reduce)((acc, title, index) => {
+    R.reduce((acc, title) => {
       const split = R.split(':', title);
       if (R.length(split) !== 2) {
         return acc;
@@ -14,12 +27,12 @@ export const parseCombinationDefinition = (locale) => (title, texts) => R.useWit
       return R.append({
         id,
         concepts: R.split(',', codes),
-        name: R.has(locale, texts)
-          ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts)
+        name: R.hasPath([locale, id], texts)
+          ? R.path([locale, id], texts)
           : `[${id}]`,
       }, acc);
     }, [], titles),
-  [R.split(';'), R.map(R.split(';'))],
+  [R.split(';'), R.map(R.pipe(R.split(';'), parseTexts))],
 )(title, texts);
 
 export const getCombinationDefinitions = (annotations, locale) => {

package/src/rules2/src/getHeaderCombinations.js

@@ -1,5 +1,6 @@
 import * as R from 'ramda';
 import { dimensionValueDisplay } from '../../rules/src';
+import { REJECTED_VALUE_IDS } from './constants';
 
 export const getHeaderCombinations = (combinations, dimensions, attributes, display) => {
   const indexedDimensions = R.indexBy(R.prop('id'), dimensions);
@@ -14,7 +15,11 @@ export const getHeaderCombinations = (combinations, dimensions, attributes, disp
 
       const combinedDisplay = (_display, values) => {
         if (_display === 'label') {
-          return R.pipe(R.filter(R.propOr(true, 'display')), R.map(dimensionValueDisplay(_display)), R.join(', '))(values);
+          return R.pipe(
+            R.filter(val => R.propOr(true, 'display', val) && !R.includes(val.id, REJECTED_VALUE_IDS)),
+            R.map(dimensionValueDisplay(_display)),
+            R.join(', ')
+          )(values);
         }
         return R.pipe(R.map(dimensionValueDisplay(_display)), R.join(', '))(values);
       };

package/test/getCombinationDefinitions.test.js

@@ -85,4 +85,20 @@ describe('getCombinationDefinitions tests', () => {
       { id: 'COMB_2', name: '[COMB_2]', concepts: ['D3', 'D4', 'A2', 'A3'] },
     ]);
   });
+  it('mixed order texts', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_2:Second Combination;COMB_1:First Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+      { id: 'COMB_2', name: 'Second Combination', concepts: ['D3', 'D4', 'A2', 'A3'] },
+    ]);
+  });
 });

package/test/getHeaderCombinations.test.js

@@ -4,7 +4,7 @@ import { getHeaderCombinations } from '../src/rules2/src/';
 describe('getHeaderCombinations tests', () => {
   it('complete test', () => {
     const combinations = [
-      { id: 'COMB1', name: 'comb 1', header: true, concepts: ['DIM1', 'DIM2', 'ATTR1'] },
+      { id: 'COMB1', name: 'comb 1', header: true, concepts: ['DIM1', 'DIM2', 'DIM4', 'ATTR1'] },
       { id: 'COMB2', name: 'comb 2', series: true, concepts: ['DIM3', 'ATTR2'] },
       { id: 'COMB3', name: 'comb 3', header: true, display: false, concepts: ['DIM3', 'ATTR2'] }
     ];
@@ -12,6 +12,7 @@ describe('getHeaderCombinations tests', () => {
     const dimensions = [
       { id: 'DIM1', name: 'dim 1', values: [{ id: 'v', name: 'dim 1 value' }] },
       { id: 'DIM3', name: 'dim 3', values: [{ id: 'v', name: 'dim 3 value' }] },
+      { id: 'DIM4', name: 'dim 4', values: [{ id: '_Z', name: 'Not applicable' }] },
     ];
 
     const attributes = [