@dhis2/analytics 23.2.1 → 23.4.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 (10) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/build/cjs/api/analytics/AnalyticsRequest.js +5 -1
  3. package/build/cjs/modules/layout/dimension.js +9 -2
  4. package/build/cjs/modules/layout/dimensionCreate.js +3 -0
  5. package/build/cjs/modules/layout/dimensionGetId.js +5 -1
  6. package/build/es/api/analytics/AnalyticsRequest.js +5 -1
  7. package/build/es/modules/layout/dimension.js +7 -1
  8. package/build/es/modules/layout/dimensionCreate.js +4 -1
  9. package/build/es/modules/layout/dimensionGetId.js +6 -2
  10. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,31 @@
1
+ # [23.4.0](https://github.com/dhis2/analytics/compare/v23.3.0...v23.4.0) (2022-02-17)
2
+
3
+
4
+ ### Features
5
+
6
+ * program stage prefix in layout ([#1159](https://github.com/dhis2/analytics/issues/1159)) ([665b251](https://github.com/dhis2/analytics/commit/665b25180a3d718f03fa1bbca9f429bdfa3f728d))
7
+
8
+ # [23.3.0](https://github.com/dhis2/analytics/compare/v23.2.3...v23.3.0) (2022-02-16)
9
+
10
+
11
+ ### Features
12
+
13
+ * support programStage in dimension create ([#1158](https://github.com/dhis2/analytics/issues/1158)) ([304b822](https://github.com/dhis2/analytics/commit/304b8222ff0ec6ef55305348317b265cbc543449))
14
+
15
+ ## [23.2.3](https://github.com/dhis2/analytics/compare/v23.2.2...v23.2.3) (2022-02-15)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * **translations:** sync translations from transifex (master) ([d6ec5a8](https://github.com/dhis2/analytics/commit/d6ec5a8ee359fd3c21c887ca3ca175e509280a01))
21
+
22
+ ## [23.2.2](https://github.com/dhis2/analytics/compare/v23.2.1...v23.2.2) (2022-02-11)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * use stage id as prefix for dimensions in analytics request ([#1150](https://github.com/dhis2/analytics/issues/1150)) ([0a9253e](https://github.com/dhis2/analytics/commit/0a9253e0200a6bc93aa8499ad2c70e20dc09203d))
28
+
1
29
  ## [23.2.1](https://github.com/dhis2/analytics/compare/v23.2.0...v23.2.1) (2022-02-09)
2
30
 
3
31
 
package/build/cjs/api/analytics/AnalyticsRequest.js CHANGED
@@ -56,7 +56,7 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
56
56
  const columns = visualization.columns || [];
57
57
  const rows = visualization.rows || [];
58
58
  columns.concat(rows).forEach(d => {
59
- var _d$legendSet, _d$items;
59
+ var _d$legendSet, _d$programStage, _d$items;
60
60
 
61
61
  let dimension = d.dimension;
62
62
 
@@ -64,6 +64,10 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
64
64
  dimension += "-".concat(d.legendSet.id);
65
65
  }
66
66
 
67
+ if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
68
+ dimension = "".concat(d.programStage.id, ".").concat(dimension);
69
+ }
70
+
67
71
  if (d.filter) {
68
72
  dimension += ":".concat(d.filter);
69
73
  }
package/build/cjs/modules/layout/dimension.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.DIMENSION_PROPS = exports.DIMENSION_PROP_LEGEND_SET = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
6
+ exports.DIMENSION_PROPS = exports.DIMENSION_PROP_PROGRAM_STAGE = exports.DIMENSION_PROP_LEGEND_SET = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
7
7
 
8
8
  var _isObject = _interopRequireDefault(require("lodash/isObject"));
9
9
 
@@ -45,5 +45,12 @@ const DIMENSION_PROP_LEGEND_SET = {
45
45
  isValid: prop => (0, _isString.default)(prop)
46
46
  };
47
47
  exports.DIMENSION_PROP_LEGEND_SET = DIMENSION_PROP_LEGEND_SET;
48
- const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET];
48
+ const DIMENSION_PROP_PROGRAM_STAGE = {
49
+ name: 'programStage',
50
+ defaultValue: {},
51
+ required: false,
52
+ isValid: prop => (0, _isObject.default)(prop)
53
+ };
54
+ exports.DIMENSION_PROP_PROGRAM_STAGE = DIMENSION_PROP_PROGRAM_STAGE;
55
+ const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE];
49
56
  exports.DIMENSION_PROPS = DIMENSION_PROPS;
package/build/cjs/modules/layout/dimensionCreate.js CHANGED
@@ -20,6 +20,9 @@ const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
20
20
  }),
21
21
  ...(args.legendSet && {
22
22
  [_dimension.DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
23
+ }),
24
+ ...(args.programStage && {
25
+ [_dimension.DIMENSION_PROP_PROGRAM_STAGE.name]: args.programStage
23
26
  })
24
27
  };
25
28
  return dimension;
package/build/cjs/modules/layout/dimensionGetId.js CHANGED
@@ -7,6 +7,10 @@ exports.dimensionGetId = void 0;
7
7
 
8
8
  var _dimension = require("./dimension.js");
9
9
 
10
- const dimensionGetId = dimension => dimension[_dimension.DIMENSION_PROP_ID.name];
10
+ const dimensionGetId = dimension => {
11
+ var _dimension$DIMENSION_;
12
+
13
+ return (_dimension$DIMENSION_ = dimension[_dimension.DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? "".concat(dimension[_dimension.DIMENSION_PROP_PROGRAM_STAGE.name].id, ".").concat(dimension[_dimension.DIMENSION_PROP_ID.name]) : dimension[_dimension.DIMENSION_PROP_ID.name];
14
+ };
11
15
 
12
16
  exports.dimensionGetId = dimensionGetId;
package/build/es/api/analytics/AnalyticsRequest.js CHANGED
@@ -43,7 +43,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
43
43
  const columns = visualization.columns || [];
44
44
  const rows = visualization.rows || [];
45
45
  columns.concat(rows).forEach(d => {
46
- var _d$legendSet, _d$items;
46
+ var _d$legendSet, _d$programStage, _d$items;
47
47
 
48
48
  let dimension = d.dimension;
49
49
 
@@ -51,6 +51,10 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
51
51
  dimension += "-".concat(d.legendSet.id);
52
52
  }
53
53
 
54
+ if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
55
+ dimension = "".concat(d.programStage.id, ".").concat(dimension);
56
+ }
57
+
54
58
  if (d.filter) {
55
59
  dimension += ":".concat(d.filter);
56
60
  }
package/build/es/modules/layout/dimension.js CHANGED
@@ -29,4 +29,10 @@ export const DIMENSION_PROP_LEGEND_SET = {
29
29
  required: false,
30
30
  isValid: prop => isString(prop)
31
31
  };
32
- export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET];
32
+ export const DIMENSION_PROP_PROGRAM_STAGE = {
33
+ name: 'programStage',
34
+ defaultValue: {},
35
+ required: false,
36
+ isValid: prop => isObject(prop)
37
+ };
38
+ export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE];
package/build/es/modules/layout/dimensionCreate.js CHANGED
@@ -1,4 +1,4 @@
1
- import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET } from './dimension.js';
1
+ import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER, DIMENSION_PROP_LEGEND_SET, DIMENSION_PROP_PROGRAM_STAGE } from './dimension.js';
2
2
  export const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
3
3
  const dimension = {
4
4
  [DIMENSION_PROP_ID.name]: dimensionId,
@@ -12,6 +12,9 @@ export const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
12
12
  }),
13
13
  ...(args.legendSet && {
14
14
  [DIMENSION_PROP_LEGEND_SET.name]: args.legendSet
15
+ }),
16
+ ...(args.programStage && {
17
+ [DIMENSION_PROP_PROGRAM_STAGE.name]: args.programStage
15
18
  })
16
19
  };
17
20
  return dimension;
package/build/es/modules/layout/dimensionGetId.js CHANGED
@@ -1,2 +1,6 @@
1
- import { DIMENSION_PROP_ID } from './dimension.js';
2
- export const dimensionGetId = dimension => dimension[DIMENSION_PROP_ID.name];
1
+ import { DIMENSION_PROP_ID, DIMENSION_PROP_PROGRAM_STAGE } from './dimension.js';
2
+ export const dimensionGetId = dimension => {
3
+ var _dimension$DIMENSION_;
4
+
5
+ return (_dimension$DIMENSION_ = dimension[DIMENSION_PROP_PROGRAM_STAGE.name]) !== null && _dimension$DIMENSION_ !== void 0 && _dimension$DIMENSION_.id ? "".concat(dimension[DIMENSION_PROP_PROGRAM_STAGE.name].id, ".").concat(dimension[DIMENSION_PROP_ID.name]) : dimension[DIMENSION_PROP_ID.name];
6
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "23.2.1",
3
+ "version": "23.4.0",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {