@sis-cc/dotstatsuite-components 17.31.0 → 17.32.0

package/lib/rules2/src/parseCombinations.js

@@ -33,7 +33,7 @@ var getDisplayableValues = function getDisplayableValues(values) {
 // - empty/null/undefined/!array values (so far)
 var hasInvalidValues = R.pipe(R.prop('values'), R.anyPass([R.isNil, R.complement(R.is(Array)), R.isEmpty]));
 var isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
-var filterInvalidConcepts = R.filter(isConceptInvalid);
+var filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
 var conceptIdsLens = R.lensProp('concepts');
 var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
@@ -41,8 +41,14 @@ var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
   return function () {
     var combinations = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
-    var invalidConceptIds = R.pluck('id', filterInvalidConcepts(concepts));
-    return R.map(R.over(conceptIdsLens, R.without(invalidConceptIds)), combinations);
+    var validConceptIds = R.pluck('id', filterValidConcepts(concepts));
+    return R.reduce(function (acc, comb) {
+      var refinedConcepts = R.intersection(validConceptIds, comb.concepts);
+      if (R.length(refinedConcepts) < 2) {
+        return acc;
+      }
+      return R.append((0, _extends4.default)({}, comb, { concepts: refinedConcepts }), acc);
+    }, [], combinations);
   };
 };
 

package/package.json

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

package/src/rules2/src/parseCombinations.js

@@ -16,17 +16,20 @@ const hasInvalidValues = R.pipe(
   R.anyPass([R.isNil, R.complement(R.is(Array)), R.isEmpty]),
 );
 const isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
-const filterInvalidConcepts = R.filter(isConceptInvalid);
+const filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
 const conceptIdsLens = R.lensProp('concepts');
 const rejectInvalidConceptIds =
   (concepts = []) =>
   (combinations = []) => {
-    const invalidConceptIds = R.pluck('id', filterInvalidConcepts(concepts));
-    return R.map(
-      R.over(conceptIdsLens, R.without(invalidConceptIds)),
-      combinations,
-    );
+    const validConceptIds = R.pluck('id', filterValidConcepts(concepts));
+    return R.reduce((acc, comb) => {
+      const refinedConcepts = R.intersection(validConceptIds, comb.concepts);
+      if (R.length(refinedConcepts) < 2) {
+        return acc;
+      }
+      return R.append({ ...comb, concepts: refinedConcepts }, acc);
+    }, [], combinations);
   };
 
 export const parseCombinations = (

package/test/parseCombinations.test.js

@@ -17,7 +17,7 @@ describe('parseCombinations tests', () => {
       { id: 'COMB11', concepts: ['DIM4', 'DIM7'] },
       { id: 'COMB12', concepts: ['DIM4', 'ATTR7'] },
       { id: 'COMB13', concepts: ['DIM7', 'ATTR7'] },
-      { id: 'COMB14', concepts: ['DIM3', 'ATTR5', 'ATTR8'] }
+      { id: 'COMB14', concepts: ['DIM3', 'ATTR5', 'ATTR8'] },
     ];
 
     const dimensions = [
@@ -146,26 +146,6 @@ describe('parseCombinations tests', () => {
         relationship: ['DIM4'],
         display: true,
       },
-      {
-        id: 'COMB11',
-        concepts: ['DIM4'],
-        series: true,
-        relationship: ['DIM4'],
-        display: true,
-      },
-      {
-        id: 'COMB12',
-        concepts: ['DIM4'],
-        series: true,
-        relationship: ['DIM4'],
-        display: true,
-      },
-      {
-        id: 'COMB13',
-        concepts: [],
-        display: false,
-        header: true,
-      },
       {
         id: 'COMB14',
         concepts: ['DIM3', 'ATTR5', 'ATTR8'],