@sis-cc/dotstatsuite-components 13.0.0 → 13.0.3

package/lib/rules/src/preparators/enhanceObservations.js

@@ -123,8 +123,6 @@ var enhanceObservations = exports.enhanceObservations = function enhanceObservat
   }, attributes);
   var _obsAttributes = R.pipe(R.indexBy(R.prop('id')), R.props(options.attributesIds || []))(_attributes);
 
-  var seriesDimensions = R.filter(R.pipe(R.propOr([], 'values'), R.length, R.lt(1)), dimensions);
-
   return R.mapObjIndexed(function (observation) {
     var attrValuesIndexes = observation.attrValuesIndexes,
         dimValuesIndexes = observation.dimValuesIndexes;
@@ -148,7 +146,7 @@ var enhanceObservations = exports.enhanceObservations = function enhanceObservat
       attributes: obsAttributes,
       formattedValue: (0, _formatValue.formatValue)(observation, formatAttributesIndexes, attributes),
       orderedDimIndexes: getOrderedDimensionsIndexes(dimensions, dimValuesIndexes),
-      units: getObservationUnits(observation, seriesDimensions, _attributes, options),
+      units: getObservationUnits(observation, dimensions, _attributes, options),
       indexedDimValIds: indexedDimValIds
     });
   }, observations);

package/lib/rules/src/table/preparators/parseAttributes.js

@@ -32,7 +32,7 @@ var getAttributeRegisters = function getAttributeRegisters(attribute, parsedDime
   if (R.propEq('id', customAttributes.decimals, attribute)) {
     return [registerAttrId(['decimals'], attribute.id), registerAttr(attribute)];
   }
-  if (R.hasPath(['relationship', 'none'], attribute)) {
+  if (R.hasPath(['relationship', 'none'], attribute) || R.hasPath(['relationship', 'dataflow'], attribute)) {
     return [registerAttrId(['dataflow'], attribute.id), registerAttr(attribute)];
   }
   if (R.pathEq(['relationship', 'primaryMeasure'], 'OBS_VALUE', attribute) || R.hasPath(['relationship', 'observation'], attribute)) {

package/lib/rules/src/table/preparators/prepareData.js

@@ -116,7 +116,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
     var attributes = _ref.attributes,
         dimensions = _ref.dimensions;
     return R.merge(attributes.series || {}, dimensions.series || {});
-  }, R.values, R.pluck('id'))(unitsArtefacts);
+  }, R.keys)(unitsArtefacts);
   var options = {
     attachmentSeriesIndexes: attachmentSeriesIndexes,
     customAttributes: customAttributes,
@@ -156,7 +156,9 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
     return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.notes || []);
   }))(headerAttributesIds);
 
-  var dataflowAdvancedAttributes = (0, _getAdvancedAttributes.getDataflowAdvancedAttributes)(headerAttributes, oneValueDimensions, headerAdvancedAttrIds, R.length(dimensions));
+  var dataflowAdvancedAttributes = (0, _getAdvancedAttributes.getDataflowAdvancedAttributes)(headerAttributes,
+  //oneValueDimensions,
+  R.pick(R.keys(parsedDimensionsIds.oneValue), dimensionsIndexedByIds), headerAdvancedAttrIds, R.length(dimensions));
 
   var observationsAdvancedAttributesIds = R.filter(function (id) {
     return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.notes || []);

package/lib/rules/src/v8-transformer.js

@@ -113,8 +113,15 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
     });
   }, attrObservations);
 
+  var datasetAttributes = R.map(function (attr) {
+    return (0, _extends3.default)({}, attr, {
+      name: getLocalisedProp('names', observation),
+      values: getValues(attr.values || [])
+    });
+  }, R.propOr([], 'dataSet', attributes));
+
   var resAttributes = (0, _extends3.default)({}, attributes, {
-    observation: resAttrObservations
+    observation: R.concat(resAttrObservations, datasetAttributes)
   });
 
   //----------------------------------------------------------------------------------------Dimensions

package/lib/rules2/src/getAdvancedAttributes.js

@@ -51,7 +51,7 @@ var getDataflowAdvancedAttributes = exports.getDataflowAdvancedAttributes = func
         var vId = R.path(['values', 0, 'id'], dim);
         coordinates = (0, _extends4.default)({}, coordinates, (0, _defineProperty3.default)({}, dId, vId));
         key = R.set(R.lensIndex(dIndex), 0)(key);
-      }, attrDimensions);
+      }, R.reject(R.isNil, attrDimensions));
     }
 
     key = R.join(':', key);

package/package.json

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

package/src/rules/src/preparators/enhanceObservations.js

@@ -121,8 +121,6 @@ export const enhanceObservations = (dimensions = [], observations = {}, attribut
     R.props(options.attributesIds || [])
   )(_attributes);
 
-  const seriesDimensions = R.filter(R.pipe(R.propOr([], 'values'), R.length, R.lt(1)), dimensions);
-
   return R.mapObjIndexed(
     (observation) => {
       const { attrValuesIndexes, dimValuesIndexes } = observation;
@@ -154,7 +152,7 @@ export const enhanceObservations = (dimensions = [], observations = {}, attribut
         attributes: obsAttributes,
         formattedValue: formatValue(observation, formatAttributesIndexes, attributes),
         orderedDimIndexes: getOrderedDimensionsIndexes(dimensions, dimValuesIndexes),
-        units: getObservationUnits(observation, seriesDimensions, _attributes, options),
+        units: getObservationUnits(observation, dimensions, _attributes, options),
         indexedDimValIds,
       });
     },

package/src/rules/src/table/preparators/parseAttributes.js

@@ -17,7 +17,7 @@ const getAttributeRegisters = (attribute, parsedDimensionsIds, customAttributes)
   if (R.propEq('id', customAttributes.decimals, attribute)) {
     return [registerAttrId(['decimals'], attribute.id), registerAttr(attribute)];
   }
-  if (R.hasPath(['relationship', 'none'], attribute)) {
+  if (R.hasPath(['relationship', 'none'], attribute) || R.hasPath(['relationship', 'dataflow'], attribute)) {
     return [registerAttrId(['dataflow'], attribute.id), registerAttr(attribute)];
   }
   if (R.pathEq(['relationship', 'primaryMeasure'], 'OBS_VALUE', attribute) || R.hasPath(['relationship', 'observation'], attribute)) {

package/src/rules/src/table/preparators/prepareData.js

@@ -81,8 +81,7 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
   const observationsAttributesIds = R.propOr([], 'observations', attributesIdsIndexedByTargets);
   const obsUnitsIds = R.pipe(
     ({ attributes, dimensions }) => R.merge(attributes.series || {}, dimensions.series || {}),
-    R.values,
-    R.pluck('id')
+    R.keys
   )(unitsArtefacts);
   const options = {
     attachmentSeriesIndexes,
@@ -156,7 +155,8 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
 
   const dataflowAdvancedAttributes = getDataflowAdvancedAttributes(
     headerAttributes,
-    oneValueDimensions,
+    //oneValueDimensions,
+    R.pick(R.keys(parsedDimensionsIds.oneValue), dimensionsIndexedByIds),
     headerAdvancedAttrIds,
     R.length(dimensions)
   );

package/src/rules/src/v8-transformer.js

@@ -102,9 +102,18 @@ export const dataTransformer = (dataNew, options = {}) => {
     roles: !R.isNil(observation.role) ? R.head(observation.role) : null,
   }), attrObservations);
 
+  const datasetAttributes = R.map(
+    (attr) => ({
+      ...attr,
+      name: getLocalisedProp('names', observation),
+      values: getValues(attr.values || [])
+    }),
+    R.propOr([], 'dataSet', attributes)
+  )
+
   const resAttributes = {
     ...attributes,
-    observation: resAttrObservations,
+    observation: R.concat(resAttrObservations, datasetAttributes)
   };
 
 //----------------------------------------------------------------------------------------Dimensions

package/src/rules2/src/getAdvancedAttributes.js

@@ -26,7 +26,7 @@ export const getDataflowAdvancedAttributes = (attributes, dimensions, advancedAt
             coordinates = { ...coordinates, [dId]: vId };
             key = R.set(R.lensIndex(dIndex), 0)(key);
           },
-          attrDimensions
+          R.reject(R.isNil, attrDimensions)
         );
       }
 

package/test/parseAttributes.test.js

@@ -27,7 +27,9 @@ const attributes = [
   { id: 'a17', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a17v1' }] }, // blacklisted
   { id: 'a18', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a18v1' }, { id: 'a18v2' }] }, // blacklisted value
   { id: 'a19', relationship: { none: {} }, values: [{ id: 'a19v1' }] }, // dataset relationship
-  { id: 'a20', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a20v1' }] } // units attribute
+  { id: 'a20', relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a20v1' }] }, // units attribute
+  { id: 'a21', relationship: { dataflow: {} }, values: [{ id: 'a21v0' }] }, // alternative dataflow relationship
+  { id: 'a22', relationship: { observation: {} }, values: [{ id: 'a22v0' }] }, // alternative observation relationship
 ];
 
 const customAttributes = {
@@ -58,13 +60,15 @@ describe('parseAttributes test', () => {
         a15: { id: 'a15', index: 15, relationship: { dimensions: ['d3'] }, values: [{ id: 'a15v1' }] },
         a16: { id: 'a16', index: 16, relationship: { dimensions: ['d6'] }, values: [{ id: 'a16v1' }] },
         a18: { id: 'a18', index: 18, relationship: { primaryMeasure: 'OBS_VALUE' }, values: [{ id: 'a18v1' }, null] },
-        a19: { id: 'a19', index: 19, relationship: { none: {} }, values: [{ id: 'a19v1' }] }
+        a19: { id: 'a19', index: 19, relationship: { none: {} }, values: [{ id: 'a19v1' }] },
+        a21: { id: 'a21', index: 21, relationship: { dataflow: {} }, values: [{ id: 'a21v0' }] },
+        a22: { id: 'a22', index: 22, relationship: { observation: {} }, values: [{ id: 'a22v0' }] }, 
       },
       attributesIdsIndexedByTargets: {
-        observations: ['a6', 'a18'],
+        observations: ['a6', 'a18', 'a22'],
         oneValueDimensions: { d1: ['a8', 'a14'] },
         manyValuesDimensions: ['a9', 'a11'],
-        dataflow: ['a10', 'a19'],
+        dataflow: ['a10', 'a19', 'a21'],
         series: ['a12', 'a13'],
         prefscale: ['a15'],
         decimals: ['a16'],

package/test/table-prep-perf.test.js

@@ -33,7 +33,7 @@ describe('table preparators performance tests', () => {
         OBS_STATUS: { id: 'OBS_STATUS', values: { A: 'A' } },
         UNIT_MULT: { id: 'UNIT_MULT', values: { '0': '0' } }
       },
-      unitsIds: ['UNIT_MEASURE', 'UNIT_MULT', 'BASE_PER']
+      unitsIds: ['UNIT_MULT', 'BASE_PER']
     };
     expect(
       enhanceObservations(multiHierRowsDim, multiHierRowsObs, multiHierRowsAttr, options)