@sis-cc/dotstatsuite-components 16.3.0 → 16.4.0

package/lib/rules2/src/enhanceObservations.js

@@ -39,7 +39,14 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
     if (R.isNil(attribute) || !R.prop('series', attribute)) {
       return acc;
     }
-    var value = R.nth(valueIndex, attribute.values || []);
+    var _value = R.nth(valueIndex, attribute.values || []);
+    var value = R.isNil(_value) ? _value : R.over(R.lensProp('display'), function () {
+      var display = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      return display && !R.includes(_value.id, _constants.REJECTED_VALUE_IDS);
+    })(_value);
+    if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) && !R.prop('combined', attribute)) {
+      value = null;
+    }
     var relationship = R.propOr([], 'relationship', attribute);
     var coordinates = {};
     var serieKey = R.pipe(function (dims) {
@@ -51,7 +58,7 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
       return dim.id + '=' + valueId;
     }), R.ifElse(R.isEmpty, R.always(null), R.join(':')))(indexedDimensions);
 
-    return R.assoc(attribute.id, (0, _extends3.default)({}, R.pick(['id', 'name', 'relationship'], attribute), { value: value, serieKey: serieKey, coordinates: coordinates, isObs: R.isEmpty(relationship) }), acc);
+    return R.assoc(attribute.id, (0, _extends3.default)({}, R.pick(['id', 'name', 'relationship', 'display'], attribute), { value: value, serieKey: serieKey, coordinates: coordinates, isObs: R.isEmpty(relationship) }), acc);
   }, {}, attrValuesIndexes);
 };
 

package/lib/rules2/src/refineAttributes.js

@@ -25,7 +25,7 @@ var refineAttributes = exports.refineAttributes = function refineAttributes(pars
   }, {}, seriesCombinations);
   return R.map(function (attr) {
     if (R.has(attr.id, indexedRelationships)) {
-      return (0, _extends3.default)({}, attr, { series: true, relationship: R.prop(attr.id, indexedRelationships) });
+      return (0, _extends3.default)({}, attr, { series: true, relationship: R.prop(attr.id, indexedRelationships), combined: true });
     }
     return attr;
   }, parsedAttributes);

package/package.json

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

package/src/rules2/src/enhanceObservations.js

@@ -19,7 +19,13 @@ const parseAttributesValues = (obs, attributes, indexedDimensions) => {
       if (R.isNil(attribute) || !R.prop('series', attribute)) {
         return acc;
       }
-      let value = R.nth(valueIndex, attribute.values || []);
+      const _value = R.nth(valueIndex, attribute.values || []);
+      let value = R.isNil(_value)
+        ? _value
+        : R.over(R.lensProp('display'), (display=true) => display && !R.includes(_value.id, REJECTED_VALUE_IDS))(_value);
+      if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) && !R.prop('combined', attribute)) {
+        value = null;
+      }
       const relationship = R.propOr([], 'relationship', attribute);
       let coordinates = {};
       const serieKey = R.pipe(
@@ -33,7 +39,7 @@ const parseAttributesValues = (obs, attributes, indexedDimensions) => {
         R.ifElse(R.isEmpty, R.always(null), R.join(':'))
       )(indexedDimensions);
 
-      return R.assoc(attribute.id, { ...R.pick(['id', 'name', 'relationship'], attribute), value, serieKey, coordinates, isObs: R.isEmpty(relationship) }, acc);
+      return R.assoc(attribute.id, { ...R.pick(['id', 'name', 'relationship', 'display'], attribute), value, serieKey, coordinates, isObs: R.isEmpty(relationship) }, acc);
     },
     {},
     attrValuesIndexes

package/src/rules2/src/refineAttributes.js

@@ -9,7 +9,7 @@ export const refineAttributes = (parsedAttributes, seriesCombinations) => {
   );
   return R.map(attr => {
     if (R.has(attr.id, indexedRelationships)) {
-      return { ...attr, series: true, relationship: R.prop(attr.id, indexedRelationships) };
+      return { ...attr, series: true, relationship: R.prop(attr.id, indexedRelationships), combined: true };
     }
     return attr;
   }, parsedAttributes);

package/test/enhanceObservations2.test.js

@@ -74,7 +74,7 @@ describe('enhanceObservations tests', () => {
       },
       {
         id: 'a4',
-        values: [{ id: 'v0' }, { id: 'v1', display: false }],
+        values: [{ id: 'v0' }, { id: 'v1' }],
         relationship: ['d4'],
         series: true
       },
@@ -159,9 +159,9 @@ describe('enhanceObservations tests', () => {
         value: 22,
         formattedValue: '22',
         attributes: {
-          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v0' }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
-          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v0' }, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
-          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v0', display: true }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v0', display: true }, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0', display: true }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
         },
         indexedDimValIds: { d0: 'v0', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
       },
@@ -171,9 +171,9 @@ describe('enhanceObservations tests', () => {
         value: 17,
         formattedValue: '17',
         attributes: {
-          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v1' }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
-          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v1' }, serieKey: 'd2=v0:d3=v1', coordinates: { d2: 'v0', d3: 'v1' }, isObs: false },
-          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v1', display: true }, serieKey: 'd0=v0:d1=v0', coordinates: { d0: 'v0', d1: 'v0' }, isObs: false },
+          a3: { id: 'a3', relationship: ['d2', 'd3'], value: { id: 'v1', display: true }, serieKey: 'd2=v0:d3=v1', coordinates: { d2: 'v0', d3: 'v1' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0', display: true }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
         },
         indexedDimValIds: { d0: 'v0', d1: 'v0', d2: 'v0', d3: 'v1', d4: 'v0' }
       },
@@ -183,9 +183,9 @@ describe('enhanceObservations tests', () => {
         value: 55,
         formattedValue: '55',
         attributes: {
-          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v1:d1=v0', coordinates: { d0: 'v1', d1: 'v0' }, isObs: false },
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2', display: true }, serieKey: 'd0=v1:d1=v0', coordinates: { d0: 'v1', d1: 'v0' }, isObs: false },
           a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
-          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0' }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
+          a4: { id: 'a4', relationship: ['d4'], value: { id: 'v0', display: true }, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
         },
         indexedDimValIds: { d0: 'v1', d1: 'v0', d2: 'v0', d3: 'v0', d4: 'v0' }
       },
@@ -195,7 +195,7 @@ describe('enhanceObservations tests', () => {
         value: 35,
         formattedValue: '35',
         attributes: {
-          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v2:d1=v0', coordinates: { d0: 'v2', d1: 'v0' }, isObs: false },
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2', display: true }, serieKey: 'd0=v2:d1=v0', coordinates: { d0: 'v2', d1: 'v0' }, isObs: false },
           a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
           a4: { id: 'a4', relationship: ['d4'], value: undefined, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
         },
@@ -207,7 +207,7 @@ describe('enhanceObservations tests', () => {
         value: 35,
         formattedValue: '35',
         attributes: {
-          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2' }, serieKey: 'd0=v3:d1=v0', coordinates: { d0: 'v3', d1: 'v0' }, isObs: false },
+          a0: { id: 'a0', relationship: ['d0', 'd1'], value: { id: 'v2', display: true }, serieKey: 'd0=v3:d1=v0', coordinates: { d0: 'v3', d1: 'v0' }, isObs: false },
           a3: { id: 'a3', relationship: ['d2', 'd3'], value: undefined, serieKey: 'd2=v0:d3=v0', coordinates: { d2: 'v0', d3: 'v0' }, isObs: false },
           a4: { id: 'a4', relationship: ['d4'], value: undefined, serieKey: 'd4=v0', coordinates: { d4: 'v0' }, isObs: false },
         },
@@ -215,5 +215,43 @@ describe('enhanceObservations tests', () => {
       }
     });
   });
+  it('not displayed attributes and combinations', () => {
+    const attributes = [
+      { id: 'A1', display: false, series: true, values: [{ id: 'A1v' }], relationship: [] },
+      { id: 'A2', series: true, values: [{ id: 'A2v', display: false }], relationship: [] },
+      { id: 'A3', series: true, values: [{ id: '_T', display: true }], relationship: [] },
+      { id: 'A4', display: false, series: true, values: [{ id: 'A4v' }], relationship: [], combined: true },
+      { id: 'A5', series: true, values: [{ id: 'A5v', display: false }], relationship: [], combined: true },
+      { id: 'A6', series: true, values: [{ id: '_T', display: true }], relationship: [], combined: true },
+    ];
+
+    const dimensions = [];
+
+    const observations = {
+      obs: {
+        attrValuesIndexes: [0, 0, 0, 0, 0, 0],
+        dimValuesIndexes: [],
+        value: 22,
+      }
+    };
+
+    expect(enhanceObservations(dimensions, observations, attributes, {})).to.deep.equal({
+      obs: {
+        attrValuesIndexes: [0, 0, 0, 0, 0, 0],
+        dimValuesIndexes: [],
+        value: 22,
+        formattedValue: '22',
+        attributes: {
+          A1: { id: 'A1', display: false, value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A2: { id: 'A2', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A3: { id: 'A3', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A4: { id: 'A4', display: false, value: { id: 'A4v', display: true }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A5: { id: 'A5', value: { id: 'A5v', display: false }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A6: { id: 'A6', value: { id: '_T', display: false }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+        },
+        indexedDimValIds: {}
+      }
+    })
+  });
 });
 

package/test/refineAttributes.test.js

@@ -0,0 +1,29 @@
+import { expect } from 'chai';
+import { refineAttributes } from '../src/rules2/src';
+
+describe('refineAttributes tests', () => {
+  it('basic test', () => {
+    const attributes = [
+      { id: 'A1', relationship: [] },
+      { id: 'A2', relationship: ['D1', 'D2'] },
+      { id: 'A3', series: true, relationship: [] },
+      { id: 'A4', series: true, relationship: ['D3', 'D4'] },
+      { id: 'A5', header: true, relationship: [] },
+      { id: 'A6', series: true, relationship: ['D3', 'D4'] },
+    ];
+
+    const combinations = [
+      { id: 'COMB1', concepts: ['A1', 'A3', 'A4'], relationship: ['D5', 'D6'] },
+      { id: 'COMB2', concepts: ['A2'], relationship: [] },
+    ];
+
+    expect(refineAttributes(attributes, combinations)).to.deep.equal([
+      { id: 'A1', series: true, relationship: ['D5', 'D6'], combined: true },
+      { id: 'A2', series: true, relationship: [], combined: true },
+      { id: 'A3', series: true, relationship: ['D5', 'D6'], combined: true },
+      { id: 'A4', series: true, relationship: ['D5', 'D6'], combined: true },
+      { id: 'A5', header: true, relationship: [] },
+      { id: 'A6', series: true, relationship: ['D3', 'D4'] },
+    ]);
+  });
+});