@sis-cc/dotstatsuite-components 17.0.0 → 17.1.0

package/lib/rules2/src/getCombinationDefinitions.js

@@ -20,22 +20,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var parseCombinationDefinition = exports.parseCombinationDefinition = function parseCombinationDefinition(locale) {
   return function (title, texts) {
     return R.useWith(function (titles, texts) {
-      return R.addIndex(R.map)(function (title, index) {
+      return R.addIndex(R.reduce)(function (acc, title, index) {
         var split = R.split(':', title);
-        if (R.length(split !== 2)) {
-          return null;
+        if (R.length(split) !== 2) {
+          return acc;
         }
 
         var _split = (0, _slicedToArray3.default)(split, 2),
             id = _split[0],
             codes = _split[1];
 
-        return {
+        if (R.isEmpty(codes)) {
+          return acc;
+        }
+        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 + ']'
-        };
-      }, titles);
+        }, acc);
+      }, [], titles);
     }, [R.split(';'), R.map(R.split(';'))])(title, texts);
   };
 };

package/package.json

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

package/src/rules2/src/getCombinationDefinitions.js

@@ -2,20 +2,23 @@ import * as R from 'ramda';
 
 export const parseCombinationDefinition = (locale) => (title, texts) => R.useWith(
   (titles, texts) =>
-    R.addIndex(R.map)((title, index) => {
+    R.addIndex(R.reduce)((acc, title, index) => {
       const split = R.split(':', title);
-      if (R.length(split !== 2)) {
-        return null;
+      if (R.length(split) !== 2) {
+        return acc;
       }
       const [id, codes] = split;
-      return {
+      if (R.isEmpty(codes)) {
+        return acc;
+      }
+      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)
           : `[${id}]`,
-      };
-    }, titles),
+      }, acc);
+    }, [], titles),
   [R.split(';'), R.map(R.split(';'))],
 )(title, texts);
 

package/test/getCombinationDefinitions.test.js

@@ -0,0 +1,88 @@
+import { expect } from 'chai';
+import { getCombinationDefinitions } from '../src/rules2/src';
+
+describe('getCombinationDefinitions tests', () => {
+  it('no annotations', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([]);
+  });
+  it('basic case', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second 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'] },
+    ]);
+  });
+  it('bad formatted test 1', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+    ]);
+  });
+  it('bad formatted test 2', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+    ]);
+  });
+  it('bad formatted test 3', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'First Combination;Second Combination' },
+        title: 'D1,D2,A1;D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([]);
+  });
+  it('missing localised text', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'fr')).to.deep.equal([
+      { id: 'COMB_1', name: '[COMB_1]', concepts: ['D1', 'D2', 'A1'] },
+      { id: 'COMB_2', name: '[COMB_2]', concepts: ['D3', 'D4', 'A2', 'A3'] },
+    ]);
+  });
+});