@sis-cc/dotstatsuite-components 17.19.0 → 17.20.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.
|
@@ -75,7 +75,7 @@ var parseCombinations = exports.parseCombinations = function parseCombinations(c
|
|
|
75
75
|
relationship = attribute.series && isDisplayable ? R.pipe(R.reject(function (id) {
|
|
76
76
|
return R.has(id, ids);
|
|
77
77
|
}), R.concat(relationship))(attribute.relationship) : relationship;
|
|
78
|
-
ids = attribute.series ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
|
|
78
|
+
ids = attribute.series && isDisplayable ? (0, _extends4.default)({}, ids, R.indexBy(R.identity, attribute.relationship)) : ids;
|
|
79
79
|
displayable_values_count = isDisplayable ? displayable_values_count + R.length(displayableValues) : displayable_values_count;
|
|
80
80
|
return attribute.series && isDisplayable;
|
|
81
81
|
}, comb.concepts);
|
package/package.json
CHANGED
|
@@ -72,7 +72,7 @@ export const parseCombinations = (
|
|
|
72
72
|
R.concat(relationship),
|
|
73
73
|
)(attribute.relationship)
|
|
74
74
|
: relationship;
|
|
75
|
-
ids = attribute.series
|
|
75
|
+
ids = attribute.series && isDisplayable
|
|
76
76
|
? { ...ids, ...R.indexBy(R.identity, attribute.relationship) }
|
|
77
77
|
: ids;
|
|
78
78
|
displayable_values_count = isDisplayable
|
|
@@ -17,6 +17,7 @@ describe('parseCombinations tests', () => {
|
|
|
17
17
|
{ id: 'COMB11', concepts: ['DIM4', 'DIM7'] },
|
|
18
18
|
{ id: 'COMB12', concepts: ['DIM4', 'ATTR7'] },
|
|
19
19
|
{ id: 'COMB13', concepts: ['DIM7', 'ATTR7'] },
|
|
20
|
+
{ id: 'COMB14', concepts: ['DIM3', 'ATTR5', 'ATTR8'] }
|
|
20
21
|
];
|
|
21
22
|
|
|
22
23
|
const dimensions = [
|
|
@@ -78,6 +79,12 @@ describe('parseCombinations tests', () => {
|
|
|
78
79
|
relationship: [],
|
|
79
80
|
values: [],
|
|
80
81
|
},
|
|
82
|
+
{
|
|
83
|
+
id: 'ATTR8',
|
|
84
|
+
series: true,
|
|
85
|
+
relationship: ['DIM5'],
|
|
86
|
+
values: [{ id: 'v' }],
|
|
87
|
+
},
|
|
81
88
|
];
|
|
82
89
|
|
|
83
90
|
expect(
|
|
@@ -159,6 +166,13 @@ describe('parseCombinations tests', () => {
|
|
|
159
166
|
display: false,
|
|
160
167
|
header: true,
|
|
161
168
|
},
|
|
169
|
+
{
|
|
170
|
+
id: 'COMB14',
|
|
171
|
+
concepts: ['DIM3', 'ATTR5', 'ATTR8'],
|
|
172
|
+
relationship: ['DIM3', 'DIM5'],
|
|
173
|
+
display: true,
|
|
174
|
+
series: true,
|
|
175
|
+
},
|
|
162
176
|
]);
|
|
163
177
|
});
|
|
164
178
|
});
|