@sis-cc/dotstatsuite-components 17.12.3 → 17.12.4

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 (3) hide show
  1. package/lib/rules2/src/combinedValuesDisplay.js +4 -2
  2. package/package.json +1 -1
  3. package/src/rules2/src/combinedValuesDisplay.js +56 -45
package/lib/rules2/src/combinedValuesDisplay.js CHANGED
@@ -60,8 +60,10 @@ var _combinedValuesDisplay = function _combinedValuesDisplay(_display) {
60
60
  var combinedValuesDisplay = exports.combinedValuesDisplay = function combinedValuesDisplay(display, values) {
61
61
  if (display === 'both') {
62
62
  return R.converge(function (_ids, labels) {
63
- var ids = R.isEmpty(_ids) ? _ids : '(' + _ids + ')';
64
- return R.isEmpty(ids) ? labels : ids + ' ' + labels;
63
+ return (0, _src.dimensionValueDisplay)('both')({
64
+ id: _ids,
65
+ name: labels
66
+ });
65
67
  }, [_combinedValuesDisplay('code'), _combinedValuesDisplay('label')])(values);
66
68
  }
67
69
  return _combinedValuesDisplay(display)(values);
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": "17.12.3",
4
+ "version": "17.12.4",
5
5
  "main": "lib/index.js",
6
6
  "author": "OECD",
7
7
  "license": "MIT",
package/src/rules2/src/combinedValuesDisplay.js CHANGED
@@ -5,7 +5,10 @@ import { REJECTED_VALUE_IDS } from './constants';
5
5
  const getRefinedMissinParentsLabels = R.pipe(
6
6
  R.propOr([], 'missingParents'),
7
7
  R.reduce((acc, par) => {
8
- if (!R.propOr(true, 'display', par) || R.includes(par.id, REJECTED_VALUE_IDS)) {
8
+ if (
9
+ !R.propOr(true, 'display', par) ||
10
+ R.includes(par.id, REJECTED_VALUE_IDS)
11
+ ) {
9
12
  return acc;
10
13
  }
11
14
  return R.append(dimensionValueDisplay('label')(par), acc);
@@ -13,54 +16,62 @@ const getRefinedMissinParentsLabels = R.pipe(
13
16
  );
14
17
 
15
18
  export const singleValueDisplay = (display, value) => {
16
- if (display === 'label') {
17
- return R.converge(
18
- (missingParents, label) =>
19
- R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents)),
20
- [
21
- getRefinedMissinParentsLabels,
22
- dimensionValueDisplay(display),
23
- ],
24
- )(value);
25
- } else if (display === 'both') {
26
- return `(${singleValueDisplay('code', value)}) ${singleValueDisplay('label', value)}`;
27
- }
28
- return dimensionValueDisplay(display)(value);
29
- };
19
+ if (display === 'label') {
20
+ return R.converge(
21
+ (missingParents, label) =>
22
+ R.isEmpty(missingParents)
23
+ ? label
24
+ : R.join(' > ', R.append(label, missingParents)),
25
+ [getRefinedMissinParentsLabels, dimensionValueDisplay(display)],
26
+ )(value);
27
+ } else if (display === 'both') {
28
+ return `(${singleValueDisplay('code', value)}) ${singleValueDisplay(
29
+ 'label',
30
+ value,
31
+ )}`;
32
+ }
33
+ return dimensionValueDisplay(display)(value);
34
+ };
30
35
 
31
- const _combinedValuesDisplay = _display => values => R.pipe(
32
- R.reduce((acc, val) => {
33
- if ((!R.propOr(true, 'display', val) || R.includes(val.id, REJECTED_VALUE_IDS))
34
- && _display === 'label') {
35
- return acc;
36
- }
37
- return R.append(singleValueDisplay(_display, val), acc);
38
- }, []),
39
- labels => {
40
- if (!R.isEmpty(labels) || _display !== 'label') {
41
- return R.join(', ', labels);
42
- }
43
- const totalValue = R.find(R.propEq('id', '_T'), values);
44
- if (!R.isNil(totalValue)) {
45
- return dimensionValueDisplay('label')(totalValue);
46
- }
47
- if (R.isEmpty(values)) {
48
- return '';
49
- }
50
- const firstValue = R.head(values);
51
- return dimensionValueDisplay('label')(firstValue);
52
- },
53
- )(values);
36
+ const _combinedValuesDisplay = (_display) => (values) =>
37
+ R.pipe(
38
+ R.reduce((acc, val) => {
39
+ if (
40
+ (!R.propOr(true, 'display', val) ||
41
+ R.includes(val.id, REJECTED_VALUE_IDS)) &&
42
+ _display === 'label'
43
+ ) {
44
+ return acc;
45
+ }
46
+ return R.append(singleValueDisplay(_display, val), acc);
47
+ }, []),
48
+ (labels) => {
49
+ if (!R.isEmpty(labels) || _display !== 'label') {
50
+ return R.join(', ', labels);
51
+ }
52
+ const totalValue = R.find(R.propEq('id', '_T'), values);
53
+ if (!R.isNil(totalValue)) {
54
+ return dimensionValueDisplay('label')(totalValue);
55
+ }
56
+ if (R.isEmpty(values)) {
57
+ return '';
58
+ }
59
+ const firstValue = R.head(values);
60
+ return dimensionValueDisplay('label')(firstValue);
61
+ },
62
+ )(values);
54
63
 
55
64
  export const combinedValuesDisplay = (display, values) => {
56
65
  if (display === 'both') {
57
- return R.converge((_ids, labels) => {
58
- const ids = R.isEmpty(_ids) ? _ids : `(${_ids})`;
59
- return R.isEmpty(ids) ? labels : `${ids} ${labels}`;
60
- }, [
61
- _combinedValuesDisplay('code'),
62
- _combinedValuesDisplay('label'),
63
- ])(values);
66
+ return R.converge(
67
+ (_ids, labels) => {
68
+ return dimensionValueDisplay('both')({
69
+ id: _ids,
70
+ name: labels,
71
+ });
72
+ },
73
+ [_combinedValuesDisplay('code'), _combinedValuesDisplay('label')],
74
+ )(values);
64
75
  }
65
76
  return _combinedValuesDisplay(display)(values);
66
77
  };