@sis-cc/dotstatsuite-components 15.0.17 → 15.0.18

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 (6) hide show
  1. package/lib/rules/src/table/factories/getTableData.js +1 -3
  2. package/lib/rules2/src/refineMetadataCoordinates.js +3 -2
  3. package/package.json +1 -1
  4. package/src/rules/src/table/factories/getTableData.js +1 -5
  5. package/src/rules2/src/refineMetadataCoordinates.js +3 -2
  6. package/test/refineMetadataCoordinates.test.js +86 -0
package/lib/rules/src/table/factories/getTableData.js CHANGED
@@ -53,9 +53,7 @@ var getTableProps = exports.getTableProps = function getTableProps(_ref) {
53
53
 
54
54
  var confirmedSeriesAttributesIds = (0, _getConfirmedSeriesAttributesIds.getConfirmedSeriesAttributesIds)(seriesAttributes, layoutIds);
55
55
 
56
- var headerDimensionsIds = R.pluck('id', R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data))));
57
-
58
- var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds, headerDimensionsIds);
56
+ var refinedMetadataCoordinates = (0, _refineMetadataCoordinates.refineMetadataCoordinates)(data.metadataCoordinates, layoutIds);
59
57
 
60
58
  var _R$propOr = R.propOr({}, 'units', data),
61
59
  rejectedValueIds = _R$propOr.rejectedValueIds,
package/lib/rules2/src/refineMetadataCoordinates.js CHANGED
@@ -11,9 +11,10 @@ var R = _interopRequireWildcard(_ramda);
11
11
 
12
12
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
13
13
 
14
- var refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds, headerDimensionsIds) {
14
+ var refineMetadataCoordinates = exports.refineMetadataCoordinates = function refineMetadataCoordinates(metadataCoordinates, layoutIds) {
15
+ var relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
15
16
  return R.reduce(function (acc, coordinates) {
16
- var refinedCoord = R.omit(headerDimensionsIds, coordinates);
17
+ var refinedCoord = R.pick(relevantIds, coordinates);
17
18
  if (R.isEmpty(refinedCoord)) {
18
19
  return acc;
19
20
  }
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": "15.0.17",
4
+ "version": "15.0.18",
5
5
  "main": "lib/index.js",
6
6
  "author": "OECD",
7
7
  "license": "MIT",
package/src/rules/src/table/factories/getTableData.js CHANGED
@@ -23,11 +23,7 @@ export const getTableProps = ({ data, layoutIds, display, customAttributes, limi
23
23
  layoutIds
24
24
  );
25
25
 
26
- const headerDimensionsIds = R.pluck('id',
27
- R.concat(R.pathOr([], ['units', 'headerUnits'], data), R.values(R.pathOr({}, ['dimensions', 'one'], data)))
28
- );
29
-
30
- const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds, headerDimensionsIds);
26
+ const refinedMetadataCoordinates = refineMetadataCoordinates(data.metadataCoordinates, layoutIds);
31
27
 
32
28
  const {
33
29
  rejectedValueIds,
package/src/rules2/src/refineMetadataCoordinates.js CHANGED
@@ -1,9 +1,10 @@
1
1
  import * as R from 'ramda';
2
2
 
3
- export const refineMetadataCoordinates = (metadataCoordinates, layoutIds, headerDimensionsIds) => {
3
+ export const refineMetadataCoordinates = (metadataCoordinates, layoutIds) => {
4
+ const relevantIds = R.pipe(R.values, R.unnest)(layoutIds);
4
5
  return R.reduce(
5
6
  (acc, coordinates) => {
6
- const refinedCoord = R.omit(headerDimensionsIds, coordinates);
7
+ const refinedCoord = R.pick(relevantIds, coordinates);
7
8
  if (R.isEmpty(refinedCoord)) {
8
9
  return acc;
9
10
  }
package/test/refineMetadataCoordinates.test.js ADDED
@@ -0,0 +1,86 @@
1
+ import { expect } from 'chai';
2
+ import { refineMetadataCoordinates } from "../src/rules2/src/refineMetadataCoordinates";
3
+
4
+ describe('refineMetadataCoordinates', () => {
5
+ it('test', () => {
6
+ const coordinates = [
7
+ {},
8
+ {
9
+ "MEASURE": "EMP",
10
+ "ACTIVITY": "_T",
11
+ "UNIT_MEASURE": "PS",
12
+ "PRICE_BASE": "_Z",
13
+ "ADJUSTMENT": "Y",
14
+ "TRANSFORMATION": "N"
15
+ },
16
+ {
17
+ "MEASURE": "POP",
18
+ "ACTIVITY": "_Z",
19
+ "UNIT_MEASURE": "PS",
20
+ "PRICE_BASE": "_Z",
21
+ "ADJUSTMENT": "Y",
22
+ "TRANSFORMATION": "N"
23
+ },
24
+ {
25
+ "MEASURE": "SAL",
26
+ "ACTIVITY": "_T",
27
+ "UNIT_MEASURE": "PS",
28
+ "PRICE_BASE": "_Z",
29
+ "ADJUSTMENT": "Y",
30
+ "TRANSFORMATION": "N"
31
+ },
32
+ {
33
+ "MEASURE": "SELF",
34
+ "ACTIVITY": "_T",
35
+ "UNIT_MEASURE": "PS",
36
+ "PRICE_BASE": "_Z",
37
+ "ADJUSTMENT": "Y",
38
+ "TRANSFORMATION": "N"
39
+ }
40
+ ];
41
+ const layoutIds = {
42
+ header: ['TIME_PERIOD'],
43
+ sections: ['ACTIVITY', 'ADJUSTMENT'],
44
+ rows: ['MEASURE', 'UNIT_MEASURE', 'PRICE_BASE', 'TRANSFORMATION']
45
+ };
46
+ expect(refineMetadataCoordinates(coordinates, layoutIds, [])).to.deep.equal({
47
+ cells: [],
48
+ header: [],
49
+ sections: [],
50
+ rows: [
51
+ {
52
+ "MEASURE": "EMP",
53
+ "ACTIVITY": "_T",
54
+ "UNIT_MEASURE": "PS",
55
+ "PRICE_BASE": "_Z",
56
+ "ADJUSTMENT": "Y",
57
+ "TRANSFORMATION": "N"
58
+ },
59
+ {
60
+ "MEASURE": "POP",
61
+ "ACTIVITY": "_Z",
62
+ "UNIT_MEASURE": "PS",
63
+ "PRICE_BASE": "_Z",
64
+ "ADJUSTMENT": "Y",
65
+ "TRANSFORMATION": "N"
66
+ },
67
+ {
68
+ "MEASURE": "SAL",
69
+ "ACTIVITY": "_T",
70
+ "UNIT_MEASURE": "PS",
71
+ "PRICE_BASE": "_Z",
72
+ "ADJUSTMENT": "Y",
73
+ "TRANSFORMATION": "N"
74
+ },
75
+ {
76
+ "MEASURE": "SELF",
77
+ "ACTIVITY": "_T",
78
+ "UNIT_MEASURE": "PS",
79
+ "PRICE_BASE": "_Z",
80
+ "ADJUSTMENT": "Y",
81
+ "TRANSFORMATION": "N"
82
+ }
83
+ ]
84
+ });
85
+ });
86
+ });