@sis-cc/dotstatsuite-components 19.1.0 → 19.3.0

package/lib/rules2/src/getAttributesSeries.js

@@ -18,7 +18,7 @@ var getAttributesSeries = exports.getAttributesSeries = function getAttributesSe
     var res = acc.res;
     var rejected = acc.rejected;
     R.forEachObjIndexed(function (attribute) {
-      if (!R.isNil(attribute.serieKey)) {
+      if (!R.isNil(attribute.serieKey) && !attribute.isObs) {
         if (R.isNil(attribute.value)) {
           res = R.dissocPath([attribute.serieKey, attribute.id], res);
           rejected = R.assocPath([attribute.serieKey, attribute.id], true, rejected);

package/lib/rules2/src/parseCombinations.js

@@ -35,7 +35,6 @@ var hasInvalidValues = R.pipe(R.prop('values'), R.anyPass([R.isNil, R.complement
 var isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
 var filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
-var conceptIdsLens = R.lensProp('concepts');
 var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
   var concepts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return function () {
@@ -44,7 +43,7 @@ var rejectInvalidConceptIds = function rejectInvalidConceptIds() {
     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) {
+      if (R.length(refinedConcepts) < 1) {
         return acc;
       }
       return R.append((0, _extends4.default)({}, comb, { concepts: refinedConcepts }), acc);

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

@@ -69,13 +69,19 @@ var getCells = exports.getCells = function getCells(customAttributes, cellsAttri
       var relevantAttributes = isAttrCell ? [] : getCellRelevantAttributes(obs.attributes, attributesSeries, cellsAttributesId);
       var flagsAndNotes = isAttrCell ? [] : (0, _getFlagsAndNotes.getFlagsAndNotes)(R.omit(attributesInCellsCombination, relevantAttributes), _customAttributes);
       var combinedSeries = isAttrCell ? [] : getCellCombinedSeries(relevantAttributes, combinations.cells || []);
-      var hasAdvancedAttributes = isAttrCell ? false : R.pipe(R.omit(R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination])), R.isEmpty, R.not)(relevantAttributes);
+      var hasAdvancedAttributes = isAttrCell ? false : R.pipe(R.omit(R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination])), function (res) {
+        return !R.isEmpty(res);
+      })(relevantAttributes);
+
+      var advancedAttributes = R.omit(R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination]), R.filter(function (attr) {
+        return !R.isNil(attr.value);
+      }, obs.attributes));
 
       var hasMetadata = isAttrCell ? false : (0, _hasCellMetadata.hasCellMetadata)(metadataCoordinates, obs.indexedDimValIds);
 
       return (0, _extends3.default)({}, R.pick(['indexedDimValIds', 'key'], obs), {
         flags: R.concat(flagsAndNotes, combinedSeries),
-        sideProps: hasAdvancedAttributes || hasMetadata ? { hasAdvancedAttributes: hasAdvancedAttributes, hasMetadata: hasMetadata, coordinates: obs.indexedDimValIds } : null,
+        sideProps: hasAdvancedAttributes || hasMetadata ? { hasMetadata: hasMetadata, coordinates: obs.indexedDimValIds, advancedAttributes: advancedAttributes } : null,
         intValue: R.is(Number, obs.value) ? obs.value : null,
         value: obs.formattedValue
       });

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": "19.1.0",
+  "version": "19.3.0",
   "main": "lib/index.js",
   "type": "module",
   "author": "OECD",

package/src/rules2/src/getAttributesSeries.js

@@ -8,7 +8,7 @@ export const getAttributesSeries = observations => R.pipe(
       let rejected = acc.rejected;
       R.forEachObjIndexed(
         (attribute) => {
-          if (!R.isNil(attribute.serieKey)) {
+          if (!R.isNil(attribute.serieKey) && !attribute.isObs) {
             if (R.isNil(attribute.value)) {
               res = R.dissocPath([attribute.serieKey, attribute.id], res);
               rejected = R.assocPath([attribute.serieKey, attribute.id], true, rejected);

package/src/rules2/src/parseCombinations.js

@@ -18,14 +18,13 @@ const hasInvalidValues = R.pipe(
 const isConceptInvalid = R.anyPass([hasInvalidValues /* add more... */]);
 const filterValidConcepts = R.reject(isConceptInvalid);
 // concepts is an array of ids... (misnamed!)
-const conceptIdsLens = R.lensProp('concepts');
 const rejectInvalidConceptIds =
   (concepts = []) =>
   (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) {
+      if (R.length(refinedConcepts) < 1) {
         return acc;
       }
       return R.append({ ...comb, concepts: refinedConcepts }, acc);

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

@@ -66,18 +66,24 @@ export const getCells = (customAttributes, cellsAttributesId, combinations, attr
       const relevantAttributes = isAttrCell ? [] : getCellRelevantAttributes(obs.attributes, attributesSeries, cellsAttributesId);
       const flagsAndNotes = isAttrCell ? [] : getFlagsAndNotes(R.omit(attributesInCellsCombination, relevantAttributes), _customAttributes);
       const combinedSeries = isAttrCell ? [] : getCellCombinedSeries(relevantAttributes, combinations.cells || []);
-      const hasAdvancedAttributes = isAttrCell ? false : R.pipe(
+      const hasAdvancedAttributes = isAttrCell
+        ? false : R.pipe(
         R.omit(R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination])),
-        R.isEmpty,
-        R.not
+        res => !R.isEmpty(res)
       )(relevantAttributes);
 
+      const advancedAttributes = R.omit(
+        R.unnest([_customAttributes.flags || [], _customAttributes.notes || [], attributesInCellsCombination]),
+        R.filter(attr => !R.isNil(attr.value), obs.attributes), 
+      );
+
       const hasMetadata = isAttrCell ? false : hasCellMetadata(metadataCoordinates, obs.indexedDimValIds);
 
       return ({
         ...R.pick(['indexedDimValIds', 'key'], obs),
         flags: R.concat(flagsAndNotes, combinedSeries),
-        sideProps: hasAdvancedAttributes || hasMetadata ? { hasAdvancedAttributes, hasMetadata, coordinates: obs.indexedDimValIds } : null,
+        sideProps: hasAdvancedAttributes || hasMetadata
+          ? { hasMetadata, coordinates: obs.indexedDimValIds, advancedAttributes } : null,
         intValue: R.is(Number, obs.value) ? obs.value : null,
         value: obs.formattedValue,
       });

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/getAttributesSeries.test.js

@@ -9,30 +9,35 @@ describe('getAttributesSeries tests', () => {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B0' }, serieKey: 'd1=v0' },
           C: { id: 'C', value: null, serieKey: 'd2=v0' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       },
       b: {
         attributes: {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v0' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       },
       c: {
         attributes: {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v1' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       },
       d: {
         attributes: {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B1' }, serieKey: 'd1=v1' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       },
       e: {
         attributes: {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B3' }, serieKey: 'd1=v2' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       },
       f: {
@@ -40,6 +45,7 @@ describe('getAttributesSeries tests', () => {
           A: { id: 'A', value: { id: 'A0' }, serieKey: 'd0=v0' },
           B: { id: 'B', value: { id: 'B3' }, serieKey: 'd1=v2' },
           C: { id: 'C', value: { id: 'C0' }, serieKey: 'd2=v0' },
+          D: { id: 'D', value: { id: 'D0' }, serieKey: 'd2=v0', isObs: true }
         }
       }
     };

package/test/getCells.test.js

@@ -138,7 +138,13 @@ describe('getCells tests', () => {
         formattedValue: 'attr val',
         attributes: {},
         indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'A' }
-      }
+      },
+      'c': {
+        value: 'val',
+        formattedValue: 'val',
+        attributes: { ADV_ATTR: { id: 'ADV_ATTR', value: { id: 'v' } } },
+        indexedDimValIds: { d0: 'v1', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' }
+      },
     };
     const metadataCoordinates = [{ d0: 'v0', d1: 'v0' }];
     expect(getCells(_customAttributes, {}, combinations, {}, metadataCoordinates)(observations)).to.deep.equal({
@@ -146,7 +152,7 @@ describe('getCells tests', () => {
         value: 'val',
         intValue: null,
         indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' },
-        sideProps: { hasAdvancedAttributes: false, hasMetadata: true, coordinates: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' } },
+        sideProps: { advancedAttributes: {}, hasMetadata: true, coordinates: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' } },
         flags: []
       },
       'b': {
@@ -155,7 +161,18 @@ describe('getCells tests', () => {
         indexedDimValIds: { d0: 'v0', d1: 'v0', OBS_ATTRIBUTES: 'A' },
         sideProps: null,
         flags: []
-      }
+      },
+      'c': {
+        value: 'val',
+        intValue: null,
+        indexedDimValIds: { d0: 'v1', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' },
+        flags: [],
+        sideProps: { 
+          advancedAttributes: { ADV_ATTR: { id: 'ADV_ATTR', value: { id: 'v' } } },
+          hasMetadata: false,
+          coordinates: { d0: 'v1', d1: 'v0', OBS_ATTRIBUTES: 'OBS_VALUE' }
+        },
+      },
     });
   });
 });

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

@@ -146,6 +146,20 @@ describe('parseCombinations tests', () => {
         relationship: ['DIM4'],
         display: true,
       },
+      {
+        id: 'COMB11',
+        concepts: ['DIM4'],
+        relationship: ['DIM4'],
+        series: true,
+        display: true
+      },
+      {
+        id: 'COMB12',
+        concepts: ['DIM4'],
+        relationship: ['DIM4'],
+        series: true,
+        display: true
+      },
       {
         id: 'COMB14',
         concepts: ['DIM3', 'ATTR5', 'ATTR8'],