@dhis2/analytics 23.2.0 → 23.3.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 (12) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/build/cjs/api/analytics/AnalyticsRequest.js +5 -1
  3. package/build/cjs/locales/en/translations.json +9 -9
  4. package/build/cjs/modules/layout/dimension.js +9 -2
  5. package/build/cjs/modules/layout/dimensionCreate.js +3 -0
  6. package/build/cjs/modules/visTypes.js +39 -40
  7. package/build/es/api/analytics/AnalyticsRequest.js +5 -1
  8. package/build/es/locales/en/translations.json +9 -9
  9. package/build/es/modules/layout/dimension.js +7 -1
  10. package/build/es/modules/layout/dimensionCreate.js +4 -1
  11. package/build/es/modules/visTypes.js +28 -29
  12. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,31 @@
1
+ # [23.3.0](https://github.com/dhis2/analytics/compare/v23.2.3...v23.3.0) (2022-02-16)
2
+
3
+
4
+ ### Features
5
+
6
+ * support programStage in dimension create ([#1158](https://github.com/dhis2/analytics/issues/1158)) ([304b822](https://github.com/dhis2/analytics/commit/304b8222ff0ec6ef55305348317b265cbc543449))
7
+
8
+ ## [23.2.3](https://github.com/dhis2/analytics/compare/v23.2.2...v23.2.3) (2022-02-15)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * **translations:** sync translations from transifex (master) ([d6ec5a8](https://github.com/dhis2/analytics/commit/d6ec5a8ee359fd3c21c887ca3ca175e509280a01))
14
+
15
+ ## [23.2.2](https://github.com/dhis2/analytics/compare/v23.2.1...v23.2.2) (2022-02-11)
16
+
17
+
18
+ ### Bug Fixes
19
+
20
+ * 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))
21
+
22
+ ## [23.2.1](https://github.com/dhis2/analytics/compare/v23.2.0...v23.2.1) (2022-02-09)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * export line list icon ([#1149](https://github.com/dhis2/analytics/issues/1149)) ([d65517a](https://github.com/dhis2/analytics/commit/d65517a8665efa389dc46da01abb086a0fb6a62a))
28
+
1
29
  # [23.2.0](https://github.com/dhis2/analytics/compare/v23.1.1...v23.2.0) (2022-02-08)
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/locales/en/translations.json CHANGED
@@ -297,21 +297,21 @@
297
297
  "Organisation Unit": "Organisation Unit",
298
298
  "Assigned Categories": "Assigned Categories",
299
299
  "Pivot table": "Pivot table",
300
- "Column": "Column",
301
- "Stacked column": "Stacked column",
300
+ "Area": "Area",
301
+ "Stacked area": "Stacked area",
302
302
  "Bar": "Bar",
303
303
  "Stacked bar": "Stacked bar",
304
+ "Column": "Column",
305
+ "Year over year (column)": "Year over year (column)",
306
+ "Stacked column": "Stacked column",
307
+ "Gauge": "Gauge",
304
308
  "Line": "Line",
305
- "Area": "Area",
306
- "Stacked area": "Stacked area",
309
+ "Line list": "Line list",
310
+ "Year over year (line)": "Year over year (line)",
307
311
  "Pie": "Pie",
308
312
  "Radar": "Radar",
309
- "Gauge": "Gauge",
310
- "Year over year (line)": "Year over year (line)",
311
- "Year over year (column)": "Year over year (column)",
312
- "Single value": "Single value",
313
313
  "Scatter": "Scatter",
314
- "Line list": "Line list",
314
+ "Single value": "Single value",
315
315
  "All charts": "All charts",
316
316
  "{{seriesName}} (trend)": "{{seriesName}} (trend)",
317
317
  "Trend": "Trend",
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/visTypes.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.isColumnBasedType = exports.isLegendSetType = exports.isVerticalType = exports.isTwoCategoryChartType = exports.isSingleValue = exports.isMultiType = exports.isDualAxisType = exports.isYearOverYear = exports.isStacked = exports.defaultVisType = exports.getDisplayNameByVisType = exports.visTypeIcons = exports.visTypeDisplayNames = exports.VIS_TYPE_GROUP_CHARTS = exports.VIS_TYPE_GROUP_ALL = exports.VIS_TYPE_LINE_LIST = exports.VIS_TYPE_SCATTER = exports.VIS_TYPE_PIVOT_TABLE = exports.VIS_TYPE_SINGLE_VALUE = exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = exports.VIS_TYPE_BUBBLE = exports.VIS_TYPE_GAUGE = exports.VIS_TYPE_RADAR = exports.VIS_TYPE_PIE = exports.VIS_TYPE_STACKED_AREA = exports.VIS_TYPE_AREA = exports.VIS_TYPE_LINE = exports.VIS_TYPE_STACKED_BAR = exports.VIS_TYPE_BAR = exports.VIS_TYPE_STACKED_COLUMN = exports.VIS_TYPE_COLUMN = void 0;
6
+ exports.isColumnBasedType = exports.isLegendSetType = exports.isVerticalType = exports.isTwoCategoryChartType = exports.isSingleValue = exports.isMultiType = exports.isDualAxisType = exports.isYearOverYear = exports.isStacked = exports.defaultVisType = exports.getDisplayNameByVisType = exports.visTypeIcons = exports.visTypeDisplayNames = exports.VIS_TYPE_GROUP_CHARTS = exports.VIS_TYPE_GROUP_ALL = exports.VIS_TYPE_BUBBLE = exports.VIS_TYPE_SINGLE_VALUE = exports.VIS_TYPE_SCATTER = exports.VIS_TYPE_RADAR = exports.VIS_TYPE_PIE = exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = exports.VIS_TYPE_LINE_LIST = exports.VIS_TYPE_LINE = exports.VIS_TYPE_GAUGE = exports.VIS_TYPE_STACKED_COLUMN = exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = exports.VIS_TYPE_COLUMN = exports.VIS_TYPE_STACKED_BAR = exports.VIS_TYPE_BAR = exports.VIS_TYPE_STACKED_AREA = exports.VIS_TYPE_AREA = exports.VIS_TYPE_PIVOT_TABLE = void 0;
7
7
 
8
8
  var _ui = require("@dhis2/ui");
9
9
 
@@ -11,83 +11,82 @@ var _index = _interopRequireDefault(require("../locales/index.js"));
11
11
 
12
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
13
13
 
14
- const VIS_TYPE_COLUMN = 'COLUMN';
15
- exports.VIS_TYPE_COLUMN = VIS_TYPE_COLUMN;
16
- const VIS_TYPE_STACKED_COLUMN = 'STACKED_COLUMN';
17
- exports.VIS_TYPE_STACKED_COLUMN = VIS_TYPE_STACKED_COLUMN;
14
+ const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
15
+ exports.VIS_TYPE_PIVOT_TABLE = VIS_TYPE_PIVOT_TABLE;
16
+ const VIS_TYPE_AREA = 'AREA';
17
+ exports.VIS_TYPE_AREA = VIS_TYPE_AREA;
18
+ const VIS_TYPE_STACKED_AREA = 'STACKED_AREA';
19
+ exports.VIS_TYPE_STACKED_AREA = VIS_TYPE_STACKED_AREA;
18
20
  const VIS_TYPE_BAR = 'BAR';
19
21
  exports.VIS_TYPE_BAR = VIS_TYPE_BAR;
20
22
  const VIS_TYPE_STACKED_BAR = 'STACKED_BAR';
21
23
  exports.VIS_TYPE_STACKED_BAR = VIS_TYPE_STACKED_BAR;
24
+ const VIS_TYPE_COLUMN = 'COLUMN';
25
+ exports.VIS_TYPE_COLUMN = VIS_TYPE_COLUMN;
26
+ const VIS_TYPE_YEAR_OVER_YEAR_COLUMN = 'YEAR_OVER_YEAR_COLUMN';
27
+ exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = VIS_TYPE_YEAR_OVER_YEAR_COLUMN;
28
+ const VIS_TYPE_STACKED_COLUMN = 'STACKED_COLUMN';
29
+ exports.VIS_TYPE_STACKED_COLUMN = VIS_TYPE_STACKED_COLUMN;
30
+ const VIS_TYPE_GAUGE = 'GAUGE';
31
+ exports.VIS_TYPE_GAUGE = VIS_TYPE_GAUGE;
22
32
  const VIS_TYPE_LINE = 'LINE';
23
33
  exports.VIS_TYPE_LINE = VIS_TYPE_LINE;
24
- const VIS_TYPE_AREA = 'AREA';
25
- exports.VIS_TYPE_AREA = VIS_TYPE_AREA;
26
- const VIS_TYPE_STACKED_AREA = 'STACKED_AREA';
27
- exports.VIS_TYPE_STACKED_AREA = VIS_TYPE_STACKED_AREA;
34
+ const VIS_TYPE_LINE_LIST = 'LINE_LIST';
35
+ exports.VIS_TYPE_LINE_LIST = VIS_TYPE_LINE_LIST;
36
+ const VIS_TYPE_YEAR_OVER_YEAR_LINE = 'YEAR_OVER_YEAR_LINE';
37
+ exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = VIS_TYPE_YEAR_OVER_YEAR_LINE;
28
38
  const VIS_TYPE_PIE = 'PIE';
29
39
  exports.VIS_TYPE_PIE = VIS_TYPE_PIE;
30
40
  const VIS_TYPE_RADAR = 'RADAR';
31
41
  exports.VIS_TYPE_RADAR = VIS_TYPE_RADAR;
32
- const VIS_TYPE_GAUGE = 'GAUGE';
33
- exports.VIS_TYPE_GAUGE = VIS_TYPE_GAUGE;
34
- const VIS_TYPE_BUBBLE = 'BUBBLE';
35
- exports.VIS_TYPE_BUBBLE = VIS_TYPE_BUBBLE;
36
- const VIS_TYPE_YEAR_OVER_YEAR_LINE = 'YEAR_OVER_YEAR_LINE';
37
- exports.VIS_TYPE_YEAR_OVER_YEAR_LINE = VIS_TYPE_YEAR_OVER_YEAR_LINE;
38
- const VIS_TYPE_YEAR_OVER_YEAR_COLUMN = 'YEAR_OVER_YEAR_COLUMN';
39
- exports.VIS_TYPE_YEAR_OVER_YEAR_COLUMN = VIS_TYPE_YEAR_OVER_YEAR_COLUMN;
40
- const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
41
- exports.VIS_TYPE_SINGLE_VALUE = VIS_TYPE_SINGLE_VALUE;
42
- const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
43
- exports.VIS_TYPE_PIVOT_TABLE = VIS_TYPE_PIVOT_TABLE;
44
42
  const VIS_TYPE_SCATTER = 'SCATTER';
45
43
  exports.VIS_TYPE_SCATTER = VIS_TYPE_SCATTER;
46
- const VIS_TYPE_LINE_LIST = 'LINE_LIST';
47
- exports.VIS_TYPE_LINE_LIST = VIS_TYPE_LINE_LIST;
44
+ const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
45
+ exports.VIS_TYPE_SINGLE_VALUE = VIS_TYPE_SINGLE_VALUE;
46
+ const VIS_TYPE_BUBBLE = 'BUBBLE';
47
+ exports.VIS_TYPE_BUBBLE = VIS_TYPE_BUBBLE;
48
48
  const VIS_TYPE_GROUP_ALL = 'ALL';
49
49
  exports.VIS_TYPE_GROUP_ALL = VIS_TYPE_GROUP_ALL;
50
50
  const VIS_TYPE_GROUP_CHARTS = 'CHARTS';
51
51
  exports.VIS_TYPE_GROUP_CHARTS = VIS_TYPE_GROUP_CHARTS;
52
52
  const visTypeDisplayNames = {
53
53
  [VIS_TYPE_PIVOT_TABLE]: _index.default.t('Pivot table'),
54
- [VIS_TYPE_COLUMN]: _index.default.t('Column'),
55
- [VIS_TYPE_STACKED_COLUMN]: _index.default.t('Stacked column'),
54
+ [VIS_TYPE_AREA]: _index.default.t('Area'),
55
+ [VIS_TYPE_STACKED_AREA]: _index.default.t('Stacked area'),
56
56
  [VIS_TYPE_BAR]: _index.default.t('Bar'),
57
57
  [VIS_TYPE_STACKED_BAR]: _index.default.t('Stacked bar'),
58
+ [VIS_TYPE_COLUMN]: _index.default.t('Column'),
59
+ [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _index.default.t('Year over year (column)'),
60
+ [VIS_TYPE_STACKED_COLUMN]: _index.default.t('Stacked column'),
61
+ [VIS_TYPE_GAUGE]: _index.default.t('Gauge'),
58
62
  [VIS_TYPE_LINE]: _index.default.t('Line'),
59
- [VIS_TYPE_AREA]: _index.default.t('Area'),
60
- [VIS_TYPE_STACKED_AREA]: _index.default.t('Stacked area'),
63
+ [VIS_TYPE_LINE_LIST]: _index.default.t('Line list'),
64
+ [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _index.default.t('Year over year (line)'),
61
65
  [VIS_TYPE_PIE]: _index.default.t('Pie'),
62
66
  [VIS_TYPE_RADAR]: _index.default.t('Radar'),
63
- [VIS_TYPE_GAUGE]: _index.default.t('Gauge'),
64
- [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _index.default.t('Year over year (line)'),
65
- [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _index.default.t('Year over year (column)'),
66
- [VIS_TYPE_SINGLE_VALUE]: _index.default.t('Single value'),
67
67
  [VIS_TYPE_SCATTER]: _index.default.t('Scatter'),
68
- [VIS_TYPE_LINE_LIST]: _index.default.t('Line list'),
68
+ [VIS_TYPE_SINGLE_VALUE]: _index.default.t('Single value'),
69
69
  [VIS_TYPE_GROUP_ALL]: _index.default.t('All types'),
70
70
  [VIS_TYPE_GROUP_CHARTS]: _index.default.t('All charts')
71
71
  };
72
72
  exports.visTypeDisplayNames = visTypeDisplayNames;
73
73
  const visTypeIcons = {
74
74
  [VIS_TYPE_PIVOT_TABLE]: _ui.IconTable24,
75
+ [VIS_TYPE_AREA]: _ui.IconVisualizationArea24,
76
+ [VIS_TYPE_STACKED_AREA]: _ui.IconVisualizationAreaStacked24,
75
77
  [VIS_TYPE_BAR]: _ui.IconVisualizationBar24,
76
78
  [VIS_TYPE_STACKED_BAR]: _ui.IconVisualizationBarStacked24,
77
79
  [VIS_TYPE_COLUMN]: _ui.IconVisualizationColumn24,
80
+ [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _ui.IconVisualizationColumnMulti24,
78
81
  [VIS_TYPE_STACKED_COLUMN]: _ui.IconVisualizationColumnStacked24,
82
+ [VIS_TYPE_GAUGE]: _ui.IconVisualizationGauge24,
79
83
  [VIS_TYPE_LINE]: _ui.IconVisualizationLine24,
80
- [VIS_TYPE_AREA]: _ui.IconVisualizationArea24,
81
- [VIS_TYPE_STACKED_AREA]: _ui.IconVisualizationAreaStacked24,
84
+ [VIS_TYPE_LINE_LIST]: _ui.IconVisualizationLinelist24,
85
+ [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _ui.IconVisualizationLineMulti24,
82
86
  [VIS_TYPE_PIE]: _ui.IconVisualizationPie24,
83
87
  [VIS_TYPE_RADAR]: _ui.IconVisualizationRadar24,
84
- [VIS_TYPE_GAUGE]: _ui.IconVisualizationGauge24,
85
- [VIS_TYPE_YEAR_OVER_YEAR_LINE]: _ui.IconVisualizationLineMulti24,
86
- [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _ui.IconVisualizationColumnMulti24,
87
- [VIS_TYPE_SINGLE_VALUE]: _ui.IconVisualizationSingleValue24,
88
88
  [VIS_TYPE_SCATTER]: _ui.IconVisualizationScatter24,
89
- [VIS_TYPE_LINE_LIST]: _ui.IconTable24 // TODO different icon @joe
90
-
89
+ [VIS_TYPE_SINGLE_VALUE]: _ui.IconVisualizationSingleValue24
91
90
  };
92
91
  exports.visTypeIcons = visTypeIcons;
93
92
 
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/locales/en/translations.json CHANGED
@@ -297,21 +297,21 @@
297
297
  "Organisation Unit": "Organisation Unit",
298
298
  "Assigned Categories": "Assigned Categories",
299
299
  "Pivot table": "Pivot table",
300
- "Column": "Column",
301
- "Stacked column": "Stacked column",
300
+ "Area": "Area",
301
+ "Stacked area": "Stacked area",
302
302
  "Bar": "Bar",
303
303
  "Stacked bar": "Stacked bar",
304
+ "Column": "Column",
305
+ "Year over year (column)": "Year over year (column)",
306
+ "Stacked column": "Stacked column",
307
+ "Gauge": "Gauge",
304
308
  "Line": "Line",
305
- "Area": "Area",
306
- "Stacked area": "Stacked area",
309
+ "Line list": "Line list",
310
+ "Year over year (line)": "Year over year (line)",
307
311
  "Pie": "Pie",
308
312
  "Radar": "Radar",
309
- "Gauge": "Gauge",
310
- "Year over year (line)": "Year over year (line)",
311
- "Year over year (column)": "Year over year (column)",
312
- "Single value": "Single value",
313
313
  "Scatter": "Scatter",
314
- "Line list": "Line list",
314
+ "Single value": "Single value",
315
315
  "All charts": "All charts",
316
316
  "{{seriesName}} (trend)": "{{seriesName}} (trend)",
317
317
  "Trend": "Trend",
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/visTypes.js CHANGED
@@ -1,62 +1,61 @@
1
- import { IconTable24, IconVisualizationArea24, IconVisualizationAreaStacked24, IconVisualizationBar24, IconVisualizationBarStacked24, IconVisualizationColumn24, IconVisualizationColumnMulti24, IconVisualizationColumnStacked24, IconVisualizationGauge24, IconVisualizationLine24, IconVisualizationLineMulti24, IconVisualizationPie24, IconVisualizationRadar24, IconVisualizationScatter24, IconVisualizationSingleValue24 } from '@dhis2/ui';
1
+ import { IconTable24, IconVisualizationArea24, IconVisualizationAreaStacked24, IconVisualizationBar24, IconVisualizationBarStacked24, IconVisualizationColumn24, IconVisualizationColumnMulti24, IconVisualizationColumnStacked24, IconVisualizationGauge24, IconVisualizationLine24, IconVisualizationLinelist24, IconVisualizationLineMulti24, IconVisualizationPie24, IconVisualizationRadar24, IconVisualizationScatter24, IconVisualizationSingleValue24 } from '@dhis2/ui';
2
2
  import i18n from '../locales/index.js';
3
- export const VIS_TYPE_COLUMN = 'COLUMN';
4
- export const VIS_TYPE_STACKED_COLUMN = 'STACKED_COLUMN';
3
+ export const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
4
+ export const VIS_TYPE_AREA = 'AREA';
5
+ export const VIS_TYPE_STACKED_AREA = 'STACKED_AREA';
5
6
  export const VIS_TYPE_BAR = 'BAR';
6
7
  export const VIS_TYPE_STACKED_BAR = 'STACKED_BAR';
8
+ export const VIS_TYPE_COLUMN = 'COLUMN';
9
+ export const VIS_TYPE_YEAR_OVER_YEAR_COLUMN = 'YEAR_OVER_YEAR_COLUMN';
10
+ export const VIS_TYPE_STACKED_COLUMN = 'STACKED_COLUMN';
11
+ export const VIS_TYPE_GAUGE = 'GAUGE';
7
12
  export const VIS_TYPE_LINE = 'LINE';
8
- export const VIS_TYPE_AREA = 'AREA';
9
- export const VIS_TYPE_STACKED_AREA = 'STACKED_AREA';
13
+ export const VIS_TYPE_LINE_LIST = 'LINE_LIST';
14
+ export const VIS_TYPE_YEAR_OVER_YEAR_LINE = 'YEAR_OVER_YEAR_LINE';
10
15
  export const VIS_TYPE_PIE = 'PIE';
11
16
  export const VIS_TYPE_RADAR = 'RADAR';
12
- export const VIS_TYPE_GAUGE = 'GAUGE';
13
- export const VIS_TYPE_BUBBLE = 'BUBBLE';
14
- export const VIS_TYPE_YEAR_OVER_YEAR_LINE = 'YEAR_OVER_YEAR_LINE';
15
- export const VIS_TYPE_YEAR_OVER_YEAR_COLUMN = 'YEAR_OVER_YEAR_COLUMN';
16
- export const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
17
- export const VIS_TYPE_PIVOT_TABLE = 'PIVOT_TABLE';
18
17
  export const VIS_TYPE_SCATTER = 'SCATTER';
19
- export const VIS_TYPE_LINE_LIST = 'LINE_LIST';
18
+ export const VIS_TYPE_SINGLE_VALUE = 'SINGLE_VALUE';
19
+ export const VIS_TYPE_BUBBLE = 'BUBBLE';
20
20
  export const VIS_TYPE_GROUP_ALL = 'ALL';
21
21
  export const VIS_TYPE_GROUP_CHARTS = 'CHARTS';
22
22
  export const visTypeDisplayNames = {
23
23
  [VIS_TYPE_PIVOT_TABLE]: i18n.t('Pivot table'),
24
- [VIS_TYPE_COLUMN]: i18n.t('Column'),
25
- [VIS_TYPE_STACKED_COLUMN]: i18n.t('Stacked column'),
24
+ [VIS_TYPE_AREA]: i18n.t('Area'),
25
+ [VIS_TYPE_STACKED_AREA]: i18n.t('Stacked area'),
26
26
  [VIS_TYPE_BAR]: i18n.t('Bar'),
27
27
  [VIS_TYPE_STACKED_BAR]: i18n.t('Stacked bar'),
28
+ [VIS_TYPE_COLUMN]: i18n.t('Column'),
29
+ [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: i18n.t('Year over year (column)'),
30
+ [VIS_TYPE_STACKED_COLUMN]: i18n.t('Stacked column'),
31
+ [VIS_TYPE_GAUGE]: i18n.t('Gauge'),
28
32
  [VIS_TYPE_LINE]: i18n.t('Line'),
29
- [VIS_TYPE_AREA]: i18n.t('Area'),
30
- [VIS_TYPE_STACKED_AREA]: i18n.t('Stacked area'),
33
+ [VIS_TYPE_LINE_LIST]: i18n.t('Line list'),
34
+ [VIS_TYPE_YEAR_OVER_YEAR_LINE]: i18n.t('Year over year (line)'),
31
35
  [VIS_TYPE_PIE]: i18n.t('Pie'),
32
36
  [VIS_TYPE_RADAR]: i18n.t('Radar'),
33
- [VIS_TYPE_GAUGE]: i18n.t('Gauge'),
34
- [VIS_TYPE_YEAR_OVER_YEAR_LINE]: i18n.t('Year over year (line)'),
35
- [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: i18n.t('Year over year (column)'),
36
- [VIS_TYPE_SINGLE_VALUE]: i18n.t('Single value'),
37
37
  [VIS_TYPE_SCATTER]: i18n.t('Scatter'),
38
- [VIS_TYPE_LINE_LIST]: i18n.t('Line list'),
38
+ [VIS_TYPE_SINGLE_VALUE]: i18n.t('Single value'),
39
39
  [VIS_TYPE_GROUP_ALL]: i18n.t('All types'),
40
40
  [VIS_TYPE_GROUP_CHARTS]: i18n.t('All charts')
41
41
  };
42
42
  export const visTypeIcons = {
43
43
  [VIS_TYPE_PIVOT_TABLE]: IconTable24,
44
+ [VIS_TYPE_AREA]: IconVisualizationArea24,
45
+ [VIS_TYPE_STACKED_AREA]: IconVisualizationAreaStacked24,
44
46
  [VIS_TYPE_BAR]: IconVisualizationBar24,
45
47
  [VIS_TYPE_STACKED_BAR]: IconVisualizationBarStacked24,
46
48
  [VIS_TYPE_COLUMN]: IconVisualizationColumn24,
49
+ [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: IconVisualizationColumnMulti24,
47
50
  [VIS_TYPE_STACKED_COLUMN]: IconVisualizationColumnStacked24,
51
+ [VIS_TYPE_GAUGE]: IconVisualizationGauge24,
48
52
  [VIS_TYPE_LINE]: IconVisualizationLine24,
49
- [VIS_TYPE_AREA]: IconVisualizationArea24,
50
- [VIS_TYPE_STACKED_AREA]: IconVisualizationAreaStacked24,
53
+ [VIS_TYPE_LINE_LIST]: IconVisualizationLinelist24,
54
+ [VIS_TYPE_YEAR_OVER_YEAR_LINE]: IconVisualizationLineMulti24,
51
55
  [VIS_TYPE_PIE]: IconVisualizationPie24,
52
56
  [VIS_TYPE_RADAR]: IconVisualizationRadar24,
53
- [VIS_TYPE_GAUGE]: IconVisualizationGauge24,
54
- [VIS_TYPE_YEAR_OVER_YEAR_LINE]: IconVisualizationLineMulti24,
55
- [VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: IconVisualizationColumnMulti24,
56
- [VIS_TYPE_SINGLE_VALUE]: IconVisualizationSingleValue24,
57
57
  [VIS_TYPE_SCATTER]: IconVisualizationScatter24,
58
- [VIS_TYPE_LINE_LIST]: IconTable24 // TODO different icon @joe
59
-
58
+ [VIS_TYPE_SINGLE_VALUE]: IconVisualizationSingleValue24
60
59
  };
61
60
  export const getDisplayNameByVisType = visType => {
62
61
  const displayName = visTypeDisplayNames[visType];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "23.2.0",
3
+ "version": "23.3.0",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {