@dhis2/analytics 23.5.2 → 23.6.2
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.
- package/CHANGELOG.md +21 -0
- package/build/cjs/components/FileMenu/FileMenu.js +2 -3
- package/build/cjs/index.js +6 -0
- package/build/cjs/modules/axis.js +6 -0
- package/build/cjs/modules/layoutTypes.js +4 -2
- package/build/cjs/modules/visTypeToLayoutType.js +2 -1
- package/build/es/components/FileMenu/FileMenu.js +2 -3
- package/build/es/index.js +1 -1
- package/build/es/modules/axis.js +7 -1
- package/build/es/modules/layoutTypes.js +2 -1
- package/build/es/modules/visTypeToLayoutType.js +4 -3
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
|
+
## [23.6.2](https://github.com/dhis2/analytics/compare/v23.6.1...v23.6.2) (2022-03-06)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **translations:** sync translations from transifex (master) ([2bb2866](https://github.com/dhis2/analytics/commit/2bb2866b1c1a9a59a415f083319e35cbcc1b29ac))
|
|
7
|
+
|
|
8
|
+
## [23.6.1](https://github.com/dhis2/analytics/compare/v23.6.0...v23.6.1) (2022-03-05)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* add to layout button for line list (TECH-1021) ([#1168](https://github.com/dhis2/analytics/issues/1168)) ([036072c](https://github.com/dhis2/analytics/commit/036072c90933683b4eaef9ce2e358a5e0b284a1e))
|
|
14
|
+
|
|
15
|
+
# [23.6.0](https://github.com/dhis2/analytics/compare/v23.5.2...v23.6.0) (2022-03-02)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Features
|
|
19
|
+
|
|
20
|
+
* disable Save button when onSave not passed (TECH-1013) ([#1167](https://github.com/dhis2/analytics/issues/1167)) ([fa87c8b](https://github.com/dhis2/analytics/commit/fa87c8b9ef3fe8e237e7d21423c81daf0ff6c817))
|
|
21
|
+
|
|
1
22
|
## [23.5.2](https://github.com/dhis2/analytics/compare/v23.5.1...v23.5.2) (2022-02-28)
|
|
2
23
|
|
|
3
24
|
|
|
@@ -196,9 +196,9 @@ const FileMenu = ({
|
|
|
196
196
|
}), /*#__PURE__*/_react.default.createElement(_ui.MenuItem, {
|
|
197
197
|
label: fileObject !== null && fileObject !== void 0 && fileObject.id ? _index.default.t('Save') : _index.default.t('Save…'),
|
|
198
198
|
icon: /*#__PURE__*/_react.default.createElement(_ui.IconSave24, {
|
|
199
|
-
color: !(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update ?
|
|
199
|
+
color: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update) ? iconInactiveColor : iconActiveColor
|
|
200
200
|
}),
|
|
201
|
-
disabled: !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
|
|
201
|
+
disabled: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
|
|
202
202
|
onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? () => {
|
|
203
203
|
toggleMenu();
|
|
204
204
|
onSave();
|
|
@@ -263,7 +263,6 @@ FileMenu.defaultProps = {
|
|
|
263
263
|
onNew: Function.prototype,
|
|
264
264
|
onOpen: Function.prototype,
|
|
265
265
|
onRename: Function.prototype,
|
|
266
|
-
onSave: Function.prototype,
|
|
267
266
|
onSaveAs: Function.prototype,
|
|
268
267
|
onTranslate: Function.prototype
|
|
269
268
|
};
|
package/build/cjs/index.js
CHANGED
|
@@ -771,6 +771,12 @@ Object.defineProperty(exports, "LAYOUT_TYPE_SCATTER", {
|
|
|
771
771
|
return _layoutTypes.LAYOUT_TYPE_SCATTER;
|
|
772
772
|
}
|
|
773
773
|
});
|
|
774
|
+
Object.defineProperty(exports, "LAYOUT_TYPE_LINE_LIST", {
|
|
775
|
+
enumerable: true,
|
|
776
|
+
get: function () {
|
|
777
|
+
return _layoutTypes.LAYOUT_TYPE_LINE_LIST;
|
|
778
|
+
}
|
|
779
|
+
});
|
|
774
780
|
Object.defineProperty(exports, "getAvailableAxes", {
|
|
775
781
|
enumerable: true,
|
|
776
782
|
get: function () {
|
|
@@ -32,6 +32,12 @@ const getAxisNamesByLayoutType = layoutType => {
|
|
|
32
32
|
[_axis.AXIS_ID_FILTERS]: _index.default.t('Filter')
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
+
case _layoutTypes.LAYOUT_TYPE_LINE_LIST:
|
|
36
|
+
return {
|
|
37
|
+
[_axis.AXIS_ID_COLUMNS]: _index.default.t('Columns'),
|
|
38
|
+
[_axis.AXIS_ID_FILTERS]: _index.default.t('Filter')
|
|
39
|
+
};
|
|
40
|
+
|
|
35
41
|
case _layoutTypes.LAYOUT_TYPE_SCATTER:
|
|
36
42
|
return {
|
|
37
43
|
[_axis.AXIS_ID_ROWS]: _index.default.t('Points'),
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.LAYOUT_TYPE_SCATTER = exports.LAYOUT_TYPE_PIVOT_TABLE = exports.LAYOUT_TYPE_YEAR_OVER_YEAR = exports.LAYOUT_TYPE_SINGLE_VALUE = exports.LAYOUT_TYPE_PIE = exports.LAYOUT_TYPE_DEFAULT = void 0;
|
|
6
|
+
exports.LAYOUT_TYPE_LINE_LIST = exports.LAYOUT_TYPE_SCATTER = exports.LAYOUT_TYPE_PIVOT_TABLE = exports.LAYOUT_TYPE_YEAR_OVER_YEAR = exports.LAYOUT_TYPE_SINGLE_VALUE = exports.LAYOUT_TYPE_PIE = exports.LAYOUT_TYPE_DEFAULT = void 0;
|
|
7
7
|
const LAYOUT_TYPE_DEFAULT = 'LAYOUT_TYPE_DEFAULT';
|
|
8
8
|
exports.LAYOUT_TYPE_DEFAULT = LAYOUT_TYPE_DEFAULT;
|
|
9
9
|
const LAYOUT_TYPE_PIE = 'LAYOUT_TYPE_PIE';
|
|
@@ -15,4 +15,6 @@ exports.LAYOUT_TYPE_YEAR_OVER_YEAR = LAYOUT_TYPE_YEAR_OVER_YEAR;
|
|
|
15
15
|
const LAYOUT_TYPE_PIVOT_TABLE = 'LAYOUT_TYPE_PIVOT_TABLE';
|
|
16
16
|
exports.LAYOUT_TYPE_PIVOT_TABLE = LAYOUT_TYPE_PIVOT_TABLE;
|
|
17
17
|
const LAYOUT_TYPE_SCATTER = 'LAYOUT_TYPE_SCATTER';
|
|
18
|
-
exports.LAYOUT_TYPE_SCATTER = LAYOUT_TYPE_SCATTER;
|
|
18
|
+
exports.LAYOUT_TYPE_SCATTER = LAYOUT_TYPE_SCATTER;
|
|
19
|
+
const LAYOUT_TYPE_LINE_LIST = 'LAYOUT_TYPE_LINE_LIST';
|
|
20
|
+
exports.LAYOUT_TYPE_LINE_LIST = LAYOUT_TYPE_LINE_LIST;
|
|
@@ -24,7 +24,8 @@ const visTypeToLayoutType = {
|
|
|
24
24
|
[_visTypes.VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: _layoutTypes.LAYOUT_TYPE_YEAR_OVER_YEAR,
|
|
25
25
|
[_visTypes.VIS_TYPE_SINGLE_VALUE]: _layoutTypes.LAYOUT_TYPE_PIE,
|
|
26
26
|
[_visTypes.VIS_TYPE_PIVOT_TABLE]: _layoutTypes.LAYOUT_TYPE_PIVOT_TABLE,
|
|
27
|
-
[_visTypes.VIS_TYPE_SCATTER]: _layoutTypes.LAYOUT_TYPE_SCATTER
|
|
27
|
+
[_visTypes.VIS_TYPE_SCATTER]: _layoutTypes.LAYOUT_TYPE_SCATTER,
|
|
28
|
+
[_visTypes.VIS_TYPE_LINE_LIST]: _layoutTypes.LAYOUT_TYPE_LINE_LIST
|
|
28
29
|
};
|
|
29
30
|
|
|
30
31
|
const getLayoutTypeByVisType = visType => visTypeToLayoutType[visType];
|
|
@@ -170,9 +170,9 @@ export const FileMenu = ({
|
|
|
170
170
|
}), /*#__PURE__*/React.createElement(MenuItem, {
|
|
171
171
|
label: fileObject !== null && fileObject !== void 0 && fileObject.id ? i18n.t('Save') : i18n.t('Save…'),
|
|
172
172
|
icon: /*#__PURE__*/React.createElement(IconSave24, {
|
|
173
|
-
color: !(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update ?
|
|
173
|
+
color: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access = fileObject.access) !== null && _fileObject$access !== void 0 && _fileObject$access.update) ? iconInactiveColor : iconActiveColor
|
|
174
174
|
}),
|
|
175
|
-
disabled: !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
|
|
175
|
+
disabled: !onSave || !(!(fileObject !== null && fileObject !== void 0 && fileObject.id) || fileObject !== null && fileObject !== void 0 && (_fileObject$access2 = fileObject.access) !== null && _fileObject$access2 !== void 0 && _fileObject$access2.update),
|
|
176
176
|
onClick: fileObject !== null && fileObject !== void 0 && fileObject.id ? () => {
|
|
177
177
|
toggleMenu();
|
|
178
178
|
onSave();
|
|
@@ -235,7 +235,6 @@ FileMenu.defaultProps = {
|
|
|
235
235
|
onNew: Function.prototype,
|
|
236
236
|
onOpen: Function.prototype,
|
|
237
237
|
onRename: Function.prototype,
|
|
238
|
-
onSave: Function.prototype,
|
|
239
238
|
onSaveAs: Function.prototype,
|
|
240
239
|
onTranslate: Function.prototype
|
|
241
240
|
};
|
package/build/es/index.js
CHANGED
|
@@ -71,7 +71,7 @@ export { getLayoutTypeByVisType } from './modules/visTypeToLayoutType.js'; // Mo
|
|
|
71
71
|
|
|
72
72
|
export { VIS_TYPE_GROUP_ALL, VIS_TYPE_GROUP_CHARTS, VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_BUBBLE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST, visTypeDisplayNames, visTypeIcons, getDisplayNameByVisType, defaultVisType, isStacked, isMultiType, isYearOverYear, isDualAxisType, isSingleValue, isTwoCategoryChartType, isLegendSetType, isColumnBasedType, isVerticalType } from './modules/visTypes.js'; // Modules: layoutTypes
|
|
73
73
|
|
|
74
|
-
export { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_SINGLE_VALUE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER } from './modules/layoutTypes.js'; // Modules: layoutUiRules
|
|
74
|
+
export { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_SINGLE_VALUE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST } from './modules/layoutTypes.js'; // Modules: layoutUiRules
|
|
75
75
|
|
|
76
76
|
export { getAvailableAxes, getDisallowedDimensions, getAxisMaxNumberOfItems, getAxisMaxNumberOfDimensions, getAxisMinNumberOfDimensions, hasAxisTooManyItems, getAxisPerLockedDimension, getAllLockedDimensionIds, canDimensionBeAddedToAxis, isDimensionLocked, isAxisFull, getTransferableDimension } from './modules/layoutUiRules/index.js'; // Visualizations
|
|
77
77
|
|
package/build/es/modules/axis.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import i18n from '../locales/index.js';
|
|
2
2
|
import { AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS } from './layout/axis.js';
|
|
3
|
-
import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER } from './layoutTypes.js';
|
|
3
|
+
import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST } from './layoutTypes.js';
|
|
4
4
|
|
|
5
5
|
const getAxisNamesByLayoutType = layoutType => {
|
|
6
6
|
switch (layoutType) {
|
|
@@ -21,6 +21,12 @@ const getAxisNamesByLayoutType = layoutType => {
|
|
|
21
21
|
[AXIS_ID_FILTERS]: i18n.t('Filter')
|
|
22
22
|
};
|
|
23
23
|
|
|
24
|
+
case LAYOUT_TYPE_LINE_LIST:
|
|
25
|
+
return {
|
|
26
|
+
[AXIS_ID_COLUMNS]: i18n.t('Columns'),
|
|
27
|
+
[AXIS_ID_FILTERS]: i18n.t('Filter')
|
|
28
|
+
};
|
|
29
|
+
|
|
24
30
|
case LAYOUT_TYPE_SCATTER:
|
|
25
31
|
return {
|
|
26
32
|
[AXIS_ID_ROWS]: i18n.t('Points'),
|
|
@@ -3,4 +3,5 @@ export const LAYOUT_TYPE_PIE = 'LAYOUT_TYPE_PIE';
|
|
|
3
3
|
export const LAYOUT_TYPE_SINGLE_VALUE = 'LAYOUT_TYPE_SINGLE_VALUE';
|
|
4
4
|
export const LAYOUT_TYPE_YEAR_OVER_YEAR = 'LAYOUT_TYPE_YEAR_OVER_YEAR';
|
|
5
5
|
export const LAYOUT_TYPE_PIVOT_TABLE = 'LAYOUT_TYPE_PIVOT_TABLE';
|
|
6
|
-
export const LAYOUT_TYPE_SCATTER = 'LAYOUT_TYPE_SCATTER';
|
|
6
|
+
export const LAYOUT_TYPE_SCATTER = 'LAYOUT_TYPE_SCATTER';
|
|
7
|
+
export const LAYOUT_TYPE_LINE_LIST = 'LAYOUT_TYPE_LINE_LIST';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER } from './layoutTypes.js';
|
|
2
|
-
import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER } from './visTypes.js';
|
|
1
|
+
import { LAYOUT_TYPE_DEFAULT, LAYOUT_TYPE_PIE, LAYOUT_TYPE_YEAR_OVER_YEAR, LAYOUT_TYPE_PIVOT_TABLE, LAYOUT_TYPE_SCATTER, LAYOUT_TYPE_LINE_LIST } from './layoutTypes.js';
|
|
2
|
+
import { VIS_TYPE_COLUMN, VIS_TYPE_STACKED_COLUMN, VIS_TYPE_BAR, VIS_TYPE_STACKED_BAR, VIS_TYPE_LINE, VIS_TYPE_AREA, VIS_TYPE_STACKED_AREA, VIS_TYPE_PIE, VIS_TYPE_RADAR, VIS_TYPE_GAUGE, VIS_TYPE_YEAR_OVER_YEAR_LINE, VIS_TYPE_YEAR_OVER_YEAR_COLUMN, VIS_TYPE_SINGLE_VALUE, VIS_TYPE_PIVOT_TABLE, VIS_TYPE_SCATTER, VIS_TYPE_LINE_LIST } from './visTypes.js';
|
|
3
3
|
const visTypeToLayoutType = {
|
|
4
4
|
[VIS_TYPE_COLUMN]: LAYOUT_TYPE_DEFAULT,
|
|
5
5
|
[VIS_TYPE_STACKED_COLUMN]: LAYOUT_TYPE_DEFAULT,
|
|
@@ -15,6 +15,7 @@ const visTypeToLayoutType = {
|
|
|
15
15
|
[VIS_TYPE_YEAR_OVER_YEAR_COLUMN]: LAYOUT_TYPE_YEAR_OVER_YEAR,
|
|
16
16
|
[VIS_TYPE_SINGLE_VALUE]: LAYOUT_TYPE_PIE,
|
|
17
17
|
[VIS_TYPE_PIVOT_TABLE]: LAYOUT_TYPE_PIVOT_TABLE,
|
|
18
|
-
[VIS_TYPE_SCATTER]: LAYOUT_TYPE_SCATTER
|
|
18
|
+
[VIS_TYPE_SCATTER]: LAYOUT_TYPE_SCATTER,
|
|
19
|
+
[VIS_TYPE_LINE_LIST]: LAYOUT_TYPE_LINE_LIST
|
|
19
20
|
};
|
|
20
21
|
export const getLayoutTypeByVisType = visType => visTypeToLayoutType[visType];
|