@sis-cc/dotstatsuite-components 16.5.0 → 16.7.0

package/lib/rules2/src/enhanceObservations.js

@@ -44,7 +44,7 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
       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)) {
+    if (!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) {
       value = null;
     }
     var relationship = R.propOr([], 'relationship', attribute);

package/lib/rules2/src/getHeaderCombinations.js

@@ -21,7 +21,7 @@ var getHeaderCombinations = exports.getHeaderCombinations = function getHeaderCo
       return acc;
     }
 
-    var header = (0, _src.dimensionValueDisplay)(display)(comb);
+    var header = (0, _src.dimensionValueDisplay)(display)(comb) + ':';
 
     var combinedDisplay = function combinedDisplay(_display, values) {
       if (_display === 'label') {

package/lib/rules2/src/parseCombinations.js

@@ -45,20 +45,20 @@ var parseCombinations = exports.parseCombinations = function parseCombinations(c
         var values = R.path([concept, 'values'], indexedDimensions);
         relationship = R.length(values) > 1 ? R.append(concept, relationship) : relationship;
         ids = (0, _extends4.default)({}, ids, (0, _defineProperty3.default)({}, concept, concept));
-        var _displayableValues = getDisplayableValues(values);
-        displayable_values_count = R.pathOr(true, [concept, 'display'], indexedDimensions) ? displayable_values_count + R.length(_displayableValues) : displayable_values_count;
+        displayable_values_count += R.length(values);
         return R.length(values) > 1;
       } else if (!R.has(concept, indexedAttributes)) {
         return false;
       }
       var attribute = R.prop(concept, indexedAttributes);
-      relationship = attribute.series ? R.pipe(R.reject(function (id) {
+      var displayableValues = getDisplayableValues(attribute.values || []);
+      var isDisplayable = R.length(displayableValues) !== 0 && R.propOr(true, 'display', attribute);
+      relationship = attribute.series && isDisplayable ? R.pipe(R.reject(function (id) {
         return R.has(id, ids);
       }), R.concat(relationship))(attribute.relationship) : relationship;
       ids = attribute.series ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
-      var displayableValues = getDisplayableValues(attribute.values || []);
-      displayable_values_count = R.propOr(true, 'display', attribute) ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
-      return attribute.series;
+      displayable_values_count = isDisplayable ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
+      return attribute.series && isDisplayable;
     }, comb.concepts);
     if (R.isEmpty(seriesConcepts)) {
       return R.append((0, _extends4.default)({}, comb, { header: true, display: displayable_values_count > 0 }), acc);

package/package.json

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

package/src/rules2/src/enhanceObservations.js

@@ -23,7 +23,7 @@ const parseAttributesValues = (obs, attributes, indexedDimensions) => {
       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)) {
+      if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value))) {
         value = null;
       }
       const relationship = R.propOr([], 'relationship', attribute);

package/src/rules2/src/getHeaderCombinations.js

@@ -10,7 +10,7 @@ export const getHeaderCombinations = (combinations, dimensions, attributes, disp
         return acc;
       }
 
-      const header = dimensionValueDisplay(display)(comb);
+      const header = `${dimensionValueDisplay(display)(comb)}:`;
 
       const combinedDisplay = (_display, values) => {
         if (_display === 'label') {

package/src/rules2/src/parseCombinations.js

@@ -24,28 +24,26 @@ export const parseCombinations = (combinations, parsedAttributes, dimensions) =>
             const values = R.path([concept, 'values'], indexedDimensions);
             relationship = R.length(values) > 1 ? R.append(concept, relationship) : relationship;
             ids = { ...ids, [concept]: concept };
-            const displayableValues = getDisplayableValues(values);
-            displayable_values_count = R.pathOr(true, [concept, 'display'], indexedDimensions)
-              ? displayable_values_count + R.length(displayableValues)
-              : displayable_values_count;
+            displayable_values_count += R.length(values);
             return R.length(values) > 1;
           }
           else if (!R.has(concept, indexedAttributes)) {
             return false;
           }
           const attribute = R.prop(concept, indexedAttributes);
-          relationship = attribute.series
-            ? R.pipe(
+          const displayableValues = getDisplayableValues(attribute.values || []);
+          const isDisplayable = R.length(displayableValues) !== 0 && R.propOr(true, 'display', attribute);
+          relationship = attribute.series && isDisplayable
+              ? R.pipe(
                 R.reject(id => R.has(id, ids)),
                 R.concat(relationship),
               )(attribute.relationship)
-            : relationship;
+              : relationship;
           ids = attribute.series ? { ...ids, ...R.indexBy(R.identity, attribute.relationship) } : ids;
-          const displayableValues = getDisplayableValues(attribute.values || []);
-          displayable_values_count = R.propOr(true, 'display', attribute)
+          displayable_values_count = isDisplayable
               ? displayable_values_count + R.length(displayableValues)
               : displayable_values_count;
-          return attribute.series;
+          return attribute.series && isDisplayable;
         },
         comb.concepts
       );

package/test/enhanceObservations2.test.js

@@ -245,9 +245,9 @@ describe('enhanceObservations tests', () => {
           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 },
+          A4: { id: 'A4', display: false, value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A5: { id: 'A5', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
+          A6: { id: 'A6', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
         },
         indexedDimValIds: {}
       }

package/test/getHeaderCombinations.test.js

@@ -20,7 +20,7 @@ describe('getHeaderCombinations tests', () => {
     ];
 
     expect(getHeaderCombinations(combinations, dimensions, attributes, 'label')).to.deep.equal([
-      { header: 'comb 1', label: 'dim 1 value' }
+      { header: 'comb 1:', label: 'dim 1 value' }
     ]);
   });
 });

package/test/parseCombinations.test.js

@@ -9,7 +9,11 @@ describe('parseCombinations tests', () => {
       { id: 'COMB3', concepts: ['ATTR1', 'ATTR2'] },
       { id: 'COMB4', concepts: ['ATTR3', 'ATTR4'] },
       { id: 'COMB5', concepts: ['DIM1', 'ATTR4'] },
-      { id: 'COMB6', concepts: ['DIM5', 'ATTR5'] }
+      { id: 'COMB6', concepts: ['DIM5', 'ATTR5'] },
+      { id: 'COMB7', concepts: ['ATTR5', 'ATTR6'] },
+      { id: 'COMB8', concepts: ['DIM5', 'DIM6'] },
+      { id: 'COMB9', concepts: ['DIM1', 'ATTR5'] },
+      { id: 'COMB10', concepts: ['DIM4', 'ATTR5'] }
     ];
 
     const dimensions = [
@@ -18,6 +22,7 @@ describe('parseCombinations tests', () => {
       { id: 'DIM3', values: [{ id: 'v1' }, { id: 'v2' }] },
       { id: 'DIM4', values: [{ id: 'v1' }, { id: 'v2' }] },
       { id: 'DIM5', values: [{ id: '_Z' }, { id: 'v2', display: false }] },
+      { id: 'DIM6', values: [{ id: 'v1', display: false }, { id: 'v2', display: false }] }
     ];
 
     const attributes = [
@@ -26,6 +31,7 @@ describe('parseCombinations tests', () => {
       { id: 'ATTR3', header: true, relationship: [], values: [{ id: 'v' }] },
       { id: 'ATTR4', series: true, relationship: ['DIM3', 'DIM4'], values: [{ id: 'v' }] },
       { id: 'ATTR5', series: true, display: false, relationship: ['DIM5'], values: [{ id: 'v' }] },
+      { id: 'ATTR6', series: true, relationship: [], values: [{ id: '0', display: false }, { id: '_Z' }] }
     ];
 
     expect(parseCombinations(combinations, attributes, dimensions)).to.deep.equal([
@@ -34,7 +40,11 @@ describe('parseCombinations tests', () => {
       { id: 'COMB3', concepts: ['ATTR1', 'ATTR2'], header: true, display: true },
       { id: 'COMB4', concepts: ['ATTR3', 'ATTR4'], series: true, relationship: ['DIM3', 'DIM4'], display: true },
       { id: 'COMB5', concepts: ['DIM1', 'ATTR4'], series: true, relationship: ['DIM3', 'DIM4'], display: true },
-      { id: 'COMB6', concepts: ['DIM5', 'ATTR5'], series: true, relationship: ['DIM5'], display: false }
+      { id: 'COMB6', concepts: ['DIM5', 'ATTR5'], series: true, relationship: ['DIM5'], display: true },
+      { id: 'COMB7', concepts: ['ATTR5', 'ATTR6'], header: true, display: false },
+      { id: 'COMB8', concepts: ['DIM5', 'DIM6'], series: true, relationship: ['DIM5', 'DIM6'], display: true },
+      { id: 'COMB9', concepts: ['DIM1', 'ATTR5'], header: true, display: true },
+      { id: 'COMB10', concepts: ['DIM4', 'ATTR5'], series: true, relationship: ['DIM4'], display: true }
     ]);
   });
 });