@sis-cc/dotstatsuite-components 16.5.0 → 16.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/rules2/src/enhanceObservations.js +1 -1
  2. package/lib/rules2/src/parseCombinations.js +6 -6
  3. package/package.json +1 -1
  4. package/src/rules2/src/enhanceObservations.js +1 -1
  5. package/src/rules2/src/parseCombinations.js +8 -10
  6. package/test/enhanceObservations2.test.js +3 -3
  7. package/test/parseCombinations.test.js +12 -2
package/lib/rules2/src/enhanceObservations.js CHANGED
@@ -44,7 +44,7 @@ var parseAttributesValues = function parseAttributesValues(obs, attributes, inde
44
44
  var display = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
45
45
  return display && !R.includes(_value.id, _constants.REJECTED_VALUE_IDS);
46
46
  })(_value);
47
- if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) && !R.prop('combined', attribute)) {
47
+ if (!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) {
48
48
  value = null;
49
49
  }
50
50
  var relationship = R.propOr([], 'relationship', attribute);
package/lib/rules2/src/parseCombinations.js CHANGED
@@ -45,20 +45,20 @@ var parseCombinations = exports.parseCombinations = function parseCombinations(c
45
45
  var values = R.path([concept, 'values'], indexedDimensions);
46
46
  relationship = R.length(values) > 1 ? R.append(concept, relationship) : relationship;
47
47
  ids = (0, _extends4.default)({}, ids, (0, _defineProperty3.default)({}, concept, concept));
48
- var _displayableValues = getDisplayableValues(values);
49
- displayable_values_count = R.pathOr(true, [concept, 'display'], indexedDimensions) ? displayable_values_count + R.length(_displayableValues) : displayable_values_count;
48
+ displayable_values_count += R.length(values);
50
49
  return R.length(values) > 1;
51
50
  } else if (!R.has(concept, indexedAttributes)) {
52
51
  return false;
53
52
  }
54
53
  var attribute = R.prop(concept, indexedAttributes);
55
- relationship = attribute.series ? R.pipe(R.reject(function (id) {
54
+ var displayableValues = getDisplayableValues(attribute.values || []);
55
+ var isDisplayable = R.length(displayableValues) !== 0 && R.propOr(true, 'display', attribute);
56
+ relationship = attribute.series && isDisplayable ? R.pipe(R.reject(function (id) {
56
57
  return R.has(id, ids);
57
58
  }), R.concat(relationship))(attribute.relationship) : relationship;
58
59
  ids = attribute.series ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
59
- var displayableValues = getDisplayableValues(attribute.values || []);
60
- displayable_values_count = R.propOr(true, 'display', attribute) ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
61
- return attribute.series;
60
+ displayable_values_count = isDisplayable ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
61
+ return attribute.series && isDisplayable;
62
62
  }, comb.concepts);
63
63
  if (R.isEmpty(seriesConcepts)) {
64
64
  return R.append((0, _extends4.default)({}, comb, { header: true, display: displayable_values_count > 0 }), acc);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@sis-cc/dotstatsuite-components",
3
3
  "description": "Set components based on React.",
4
- "version": "16.5.0",
4
+ "version": "16.6.0",
5
5
  "main": "lib/index.js",
6
6
  "author": "OECD",
7
7
  "license": "MIT",
package/src/rules2/src/enhanceObservations.js CHANGED
@@ -23,7 +23,7 @@ const parseAttributesValues = (obs, attributes, indexedDimensions) => {
23
23
  let value = R.isNil(_value)
24
24
  ? _value
25
25
  : R.over(R.lensProp('display'), (display=true) => display && !R.includes(_value.id, REJECTED_VALUE_IDS))(_value);
26
- if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value)) && !R.prop('combined', attribute)) {
26
+ if ((!R.propOr(true, 'display', attribute) || !R.propOr(true, 'display', value))) {
27
27
  value = null;
28
28
  }
29
29
  const relationship = R.propOr([], 'relationship', attribute);
package/src/rules2/src/parseCombinations.js CHANGED
@@ -24,28 +24,26 @@ export const parseCombinations = (combinations, parsedAttributes, dimensions) =>
24
24
  const values = R.path([concept, 'values'], indexedDimensions);
25
25
  relationship = R.length(values) > 1 ? R.append(concept, relationship) : relationship;
26
26
  ids = { ...ids, [concept]: concept };
27
- const displayableValues = getDisplayableValues(values);
28
- displayable_values_count = R.pathOr(true, [concept, 'display'], indexedDimensions)
29
- ? displayable_values_count + R.length(displayableValues)
30
- : displayable_values_count;
27
+ displayable_values_count += R.length(values);
31
28
  return R.length(values) > 1;
32
29
  }
33
30
  else if (!R.has(concept, indexedAttributes)) {
34
31
  return false;
35
32
  }
36
33
  const attribute = R.prop(concept, indexedAttributes);
37
- relationship = attribute.series
38
- ? R.pipe(
34
+ const displayableValues = getDisplayableValues(attribute.values || []);
35
+ const isDisplayable = R.length(displayableValues) !== 0 && R.propOr(true, 'display', attribute);
36
+ relationship = attribute.series && isDisplayable
37
+ ? R.pipe(
39
38
  R.reject(id => R.has(id, ids)),
40
39
  R.concat(relationship),
41
40
  )(attribute.relationship)
42
- : relationship;
41
+ : relationship;
43
42
  ids = attribute.series ? { ...ids, ...R.indexBy(R.identity, attribute.relationship) } : ids;
44
- const displayableValues = getDisplayableValues(attribute.values || []);
45
- displayable_values_count = R.propOr(true, 'display', attribute)
43
+ displayable_values_count = isDisplayable
46
44
  ? displayable_values_count + R.length(displayableValues)
47
45
  : displayable_values_count;
48
- return attribute.series;
46
+ return attribute.series && isDisplayable;
49
47
  },
50
48
  comb.concepts
51
49
  );
package/test/enhanceObservations2.test.js CHANGED
@@ -245,9 +245,9 @@ describe('enhanceObservations tests', () => {
245
245
  A1: { id: 'A1', display: false, value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
246
246
  A2: { id: 'A2', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
247
247
  A3: { id: 'A3', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
248
- A4: { id: 'A4', display: false, value: { id: 'A4v', display: true }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
249
- A5: { id: 'A5', value: { id: 'A5v', display: false }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
250
- A6: { id: 'A6', value: { id: '_T', display: false }, relationship: [], serieKey: null, coordinates: {}, isObs: true },
248
+ A4: { id: 'A4', display: false, value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
249
+ A5: { id: 'A5', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
250
+ A6: { id: 'A6', value: null, relationship: [], serieKey: null, coordinates: {}, isObs: true },
251
251
  },
252
252
  indexedDimValIds: {}
253
253
  }
package/test/parseCombinations.test.js CHANGED
@@ -9,7 +9,11 @@ describe('parseCombinations tests', () => {
9
9
  { id: 'COMB3', concepts: ['ATTR1', 'ATTR2'] },
10
10
  { id: 'COMB4', concepts: ['ATTR3', 'ATTR4'] },
11
11
  { id: 'COMB5', concepts: ['DIM1', 'ATTR4'] },
12
- { id: 'COMB6', concepts: ['DIM5', 'ATTR5'] }
12
+ { id: 'COMB6', concepts: ['DIM5', 'ATTR5'] },
13
+ { id: 'COMB7', concepts: ['ATTR5', 'ATTR6'] },
14
+ { id: 'COMB8', concepts: ['DIM5', 'DIM6'] },
15
+ { id: 'COMB9', concepts: ['DIM1', 'ATTR5'] },
16
+ { id: 'COMB10', concepts: ['DIM4', 'ATTR5'] }
13
17
  ];
14
18
 
15
19
  const dimensions = [
@@ -18,6 +22,7 @@ describe('parseCombinations tests', () => {
18
22
  { id: 'DIM3', values: [{ id: 'v1' }, { id: 'v2' }] },
19
23
  { id: 'DIM4', values: [{ id: 'v1' }, { id: 'v2' }] },
20
24
  { id: 'DIM5', values: [{ id: '_Z' }, { id: 'v2', display: false }] },
25
+ { id: 'DIM6', values: [{ id: 'v1', display: false }, { id: 'v2', display: false }] }
21
26
  ];
22
27
 
23
28
  const attributes = [
@@ -26,6 +31,7 @@ describe('parseCombinations tests', () => {
26
31
  { id: 'ATTR3', header: true, relationship: [], values: [{ id: 'v' }] },
27
32
  { id: 'ATTR4', series: true, relationship: ['DIM3', 'DIM4'], values: [{ id: 'v' }] },
28
33
  { id: 'ATTR5', series: true, display: false, relationship: ['DIM5'], values: [{ id: 'v' }] },
34
+ { id: 'ATTR6', series: true, relationship: [], values: [{ id: '0', display: false }, { id: '_Z' }] }
29
35
  ];
30
36
 
31
37
  expect(parseCombinations(combinations, attributes, dimensions)).to.deep.equal([
@@ -34,7 +40,11 @@ describe('parseCombinations tests', () => {
34
40
  { id: 'COMB3', concepts: ['ATTR1', 'ATTR2'], header: true, display: true },
35
41
  { id: 'COMB4', concepts: ['ATTR3', 'ATTR4'], series: true, relationship: ['DIM3', 'DIM4'], display: true },
36
42
  { id: 'COMB5', concepts: ['DIM1', 'ATTR4'], series: true, relationship: ['DIM3', 'DIM4'], display: true },
37
- { id: 'COMB6', concepts: ['DIM5', 'ATTR5'], series: true, relationship: ['DIM5'], display: false }
43
+ { id: 'COMB6', concepts: ['DIM5', 'ATTR5'], series: true, relationship: ['DIM5'], display: true },
44
+ { id: 'COMB7', concepts: ['ATTR5', 'ATTR6'], header: true, display: false },
45
+ { id: 'COMB8', concepts: ['DIM5', 'DIM6'], series: true, relationship: ['DIM5', 'DIM6'], display: true },
46
+ { id: 'COMB9', concepts: ['DIM1', 'ATTR5'], header: true, display: true },
47
+ { id: 'COMB10', concepts: ['DIM4', 'ATTR5'], series: true, relationship: ['DIM4'], display: true }
38
48
  ]);
39
49
  });
40
50
  });