@sis-cc/dotstatsuite-components 17.31.0 → 17.32.1

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/lib/rules2/src/table/getLayoutData2.js

@@ -90,7 +90,7 @@ var getCoordinates = function getCoordinates(indexes, topCoordinates, definition
 
 var getAttributesSeries = function getAttributesSeries(validator, attributesSeries) {
 	return R.reduce(function (acc, attrs) {
-		var attr = R.head(R.values(attrs));
+		var attr = R.head(R.values(attrs)) || {};
 		if (R.length(attr.relationship || []) === 1 && !attr.combined) {
 			return acc;
 		}
@@ -130,7 +130,7 @@ var getSerieFlagsAndSideProps = function getSerieFlagsAndSideProps(coordinates,
 	var flags = (0, _getFlagsAndNotes.getFlagsAndNotes)(layoutAttrValues, customAttributes);
 	var hasMetadata = !R.isNil(R.find(validator, metadataCoordinates));
 	var hasDataAdvancedAttributes = R.any(function (d) {
-		return R.has('value', d) ? d.hasAdvancedAttributes : R.any(R.prop('hasAdvancedAttributes'), d.values);
+		return R.has('value', d) ? R.prop('hasAdvancedAttributes', d.value) : R.any(R.prop('hasAdvancedAttributes'), d.values);
 	}, data);
 	var hasAdvancedAttributes = hasDataAdvancedAttributes || getHasAdvancedAttributes(layoutAttrValues, customAttributes);
 	var sideProps = hasMetadata || hasAdvancedAttributes ? { hasMetadata: hasMetadata, hasAdvancedAttributes: hasAdvancedAttributes, coordinates: coordinates } : null;

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.1",
   "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/src/rules2/src/table/getLayoutData2.js

@@ -51,7 +51,7 @@ const getCoordinates = (indexes, topCoordinates, definition) => R.addIndex(R.red
 }, topCoordinates, definition);
 
 const getAttributesSeries = (validator, attributesSeries) => R.reduce((acc, attrs) => {
-	const attr = R.head(R.values(attrs));
+	const attr = R.head(R.values(attrs)) || {};
 	if (R.length(attr.relationship || []) === 1 && !attr.combined) {
 		return acc;
 	}
@@ -87,7 +87,7 @@ const getSerieFlagsAndSideProps = (coordinates, validator, attributesValues, cus
   const flags = getFlagsAndNotes(layoutAttrValues, customAttributes);
   const hasMetadata = !R.isNil(R.find(validator, metadataCoordinates));
 	const hasDataAdvancedAttributes = R.any(
-		d => R.has('value', d) ? d.hasAdvancedAttributes : R.any(R.prop('hasAdvancedAttributes'), d.values)
+		d => R.has('value', d) ? R.prop('hasAdvancedAttributes', d.value) : R.any(R.prop('hasAdvancedAttributes'), d.values)
 	, data);
   const hasAdvancedAttributes = hasDataAdvancedAttributes || getHasAdvancedAttributes(layoutAttrValues, customAttributes);
   const sideProps = hasMetadata || hasAdvancedAttributes

package/test/getLayoutData2.test.js

@@ -439,4 +439,52 @@ describe('getLayoutData 2 tests', () => {
 			}
 		});
 	});
+	it('getSerieDataWithMissingLines, advanced attributes as dim level plus enpty series', () => {
+		const dimensions = [
+			{ 
+				id: 'D0',
+				values: [
+					{ id: 'D0V0', flags: [], hasAdvancedAttributes: true },
+					{ id: 'D0V1' }
+				]
+			}
+		];
+
+		const attributesSeries = {
+			'D1=D1V0': {},
+			'D0=D0V0:D1=D1V0': {},
+  	};
+
+		const topCoordinates = {};
+
+		const serie = {
+  		indexes: [0],
+  		parentsIndexes: [[]],
+  		missingIndexes: [[]],
+  	};
+
+		const customAttributes = {
+			flags: [],
+			notes: ['A0', 'A2']
+		}
+
+		expect(getSerieDataWithMissingLines(serie, dimensions, topCoordinates, attributesSeries, customAttributes, {})).to.deep.equal([{
+			data: [
+				{
+					dimension: { id: 'D0' },
+					value: { id: 'D0V0', missingParents: [], parents: [], flags: [], hasAdvancedAttributes: true }
+				},
+			],
+			coordinates: { D0: 'D0V0' },
+			key: 'D0=D0V0',
+			flags: [],
+			sideProps: {
+				coordinates: {
+					D0: 'D0V0',
+				},
+				hasAdvancedAttributes: true,
+				hasMetadata: false
+			}
+		}]);
+	});
 });

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'],