@dhis2/analytics 24.6.0 → 24.8.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.
- package/CHANGELOG.md +14 -0
- package/build/cjs/__demo__/OrgUnitDimension.stories.js +49 -1
- package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js +29 -9
- package/build/cjs/components/OrgUnitDimension/styles/OrgUnitDimension.style.js +2 -2
- package/build/es/__demo__/OrgUnitDimension.stories.js +49 -1
- package/build/es/components/OrgUnitDimension/OrgUnitDimension.js +30 -10
- package/build/es/components/OrgUnitDimension/styles/OrgUnitDimension.style.js +2 -2
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [24.8.0](https://github.com/dhis2/analytics/compare/v24.7.0...v24.8.0) (2023-02-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* add prop for controlling user org unit selector DHIS2-14744 ([#1430](https://github.com/dhis2/analytics/issues/1430)) ([02d3057](https://github.com/dhis2/analytics/commit/02d3057c7c090e293ba7c3057720f491e71457ec))
|
|
7
|
+
|
|
8
|
+
# [24.7.0](https://github.com/dhis2/analytics/compare/v24.6.0...v24.7.0) (2023-02-15)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* new props for customising OrgUnitDimension DHIS2-14744 ([#1427](https://github.com/dhis2/analytics/issues/1427)) ([ae2f886](https://github.com/dhis2/analytics/commit/ae2f886167a487271bf42c2f4c694e45ea4b25b3))
|
|
14
|
+
|
|
1
15
|
# [24.6.0](https://github.com/dhis2/analytics/compare/v24.5.0...v24.6.0) (2023-02-13)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -15,7 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
15
15
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
16
|
|
|
17
17
|
const Wrapper = story => /*#__PURE__*/_react2.default.createElement(_appRuntime.DataProvider, {
|
|
18
|
-
baseUrl: "
|
|
18
|
+
baseUrl: "https://debug.dhis2.org/analytics-dev/",
|
|
19
19
|
apiVersion: ""
|
|
20
20
|
}, story());
|
|
21
21
|
|
|
@@ -101,4 +101,52 @@ const defaultRootOrgUnits = ['ImspTQPwCqd']; // Sierra Leone
|
|
|
101
101
|
roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
|
|
102
102
|
|
|
103
103
|
});
|
|
104
|
+
});
|
|
105
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without user org units selection', () => {
|
|
106
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
107
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
108
|
+
hideUserOrgUnits: true,
|
|
109
|
+
selected: selected,
|
|
110
|
+
onSelect: response => setSelected(response.items),
|
|
111
|
+
roots: defaultRootOrgUnits
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level selector', () => {
|
|
115
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
116
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
117
|
+
hideLevelSelect: true,
|
|
118
|
+
selected: selected,
|
|
119
|
+
onSelect: response => setSelected(response.items),
|
|
120
|
+
roots: defaultRootOrgUnits
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without group selector', () => {
|
|
124
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
125
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
126
|
+
hideGroupSelect: true,
|
|
127
|
+
selected: selected,
|
|
128
|
+
onSelect: response => setSelected(response.items),
|
|
129
|
+
roots: defaultRootOrgUnits
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector', () => {
|
|
133
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
134
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
135
|
+
hideLevelSelect: true,
|
|
136
|
+
hideGroupSelect: true,
|
|
137
|
+
selected: selected,
|
|
138
|
+
onSelect: response => setSelected(response.items),
|
|
139
|
+
roots: defaultRootOrgUnits
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
(0, _react.storiesOf)('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector, with warning text', () => {
|
|
143
|
+
const [selected, setSelected] = (0, _react2.useState)([]);
|
|
144
|
+
return /*#__PURE__*/_react2.default.createElement(_OrgUnitDimension.default, {
|
|
145
|
+
hideLevelSelect: true,
|
|
146
|
+
hideGroupSelect: true,
|
|
147
|
+
selected: selected,
|
|
148
|
+
onSelect: response => setSelected(response.items),
|
|
149
|
+
roots: defaultRootOrgUnits,
|
|
150
|
+
warning: 'No org. units selected'
|
|
151
|
+
});
|
|
104
152
|
});
|
|
@@ -41,7 +41,11 @@ const OrgUnitDimension = _ref => {
|
|
|
41
41
|
let {
|
|
42
42
|
roots,
|
|
43
43
|
selected,
|
|
44
|
-
onSelect
|
|
44
|
+
onSelect,
|
|
45
|
+
hideGroupSelect,
|
|
46
|
+
hideLevelSelect,
|
|
47
|
+
hideUserOrgUnits,
|
|
48
|
+
warning
|
|
45
49
|
} = _ref;
|
|
46
50
|
const [ouLevels, setOuLevels] = (0, _react.useState)([]);
|
|
47
51
|
const [ouGroups, setOuGroups] = (0, _react.useState)([]);
|
|
@@ -94,9 +98,9 @@ const OrgUnitDimension = _ref => {
|
|
|
94
98
|
setOuGroups(result);
|
|
95
99
|
};
|
|
96
100
|
|
|
97
|
-
doFetchOuLevels();
|
|
98
|
-
doFetchOuGroups();
|
|
99
|
-
}, [dataEngine]);
|
|
101
|
+
!hideLevelSelect && doFetchOuLevels();
|
|
102
|
+
!hideGroupSelect && doFetchOuGroups();
|
|
103
|
+
}, [dataEngine, hideLevelSelect, hideGroupSelect]);
|
|
100
104
|
|
|
101
105
|
const onLevelChange = ids => {
|
|
102
106
|
const items = ids.map(id => ({
|
|
@@ -171,7 +175,7 @@ const OrgUnitDimension = _ref => {
|
|
|
171
175
|
|
|
172
176
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
173
177
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "container"
|
|
174
|
-
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
178
|
+
}, !hideUserOrgUnits && /*#__PURE__*/_react.default.createElement("div", {
|
|
175
179
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "userOrgUnitsWrapper"
|
|
176
180
|
}, /*#__PURE__*/_react.default.createElement(_ui.Checkbox, {
|
|
177
181
|
label: _index.default.t('User organisation unit'),
|
|
@@ -227,9 +231,10 @@ const OrgUnitDimension = _ref => {
|
|
|
227
231
|
dataTest: 'org-unit-tree'
|
|
228
232
|
})), /*#__PURE__*/_react.default.createElement("div", {
|
|
229
233
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + ((0, _classnames.default)('selectsWrapper', {
|
|
230
|
-
disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
|
|
234
|
+
disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id)),
|
|
235
|
+
hidden: hideLevelSelect && hideGroupSelect
|
|
231
236
|
}) || "")
|
|
232
|
-
}, /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
|
|
237
|
+
}, !hideLevelSelect && /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
|
|
233
238
|
selected: ouLevels.length ? selected.filter(item => _index2.ouIdHelper.hasLevelPrefix(item.id)).map(item => _index2.ouIdHelper.removePrefix(item.id)) : [],
|
|
234
239
|
onChange: _ref5 => {
|
|
235
240
|
let {
|
|
@@ -246,7 +251,7 @@ const OrgUnitDimension = _ref => {
|
|
|
246
251
|
value: level.id,
|
|
247
252
|
label: level.displayName,
|
|
248
253
|
dataTest: "org-unit-level-select-option-".concat(level.id)
|
|
249
|
-
}))), /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
|
|
254
|
+
}))), !hideGroupSelect && /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
|
|
250
255
|
selected: ouGroups.length ? selected.filter(item => _index2.ouIdHelper.hasGroupPrefix(item.id)).map(item => _index2.ouIdHelper.removePrefix(item.id)) : [],
|
|
251
256
|
onChange: _ref6 => {
|
|
252
257
|
let {
|
|
@@ -265,7 +270,13 @@ const OrgUnitDimension = _ref => {
|
|
|
265
270
|
dataTest: "org-unit-group-select-option-".concat(group.id)
|
|
266
271
|
})))), /*#__PURE__*/_react.default.createElement("div", {
|
|
267
272
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "summaryWrapper"
|
|
268
|
-
}, /*#__PURE__*/_react.default.createElement("
|
|
273
|
+
}, warning ? /*#__PURE__*/_react.default.createElement("div", {
|
|
274
|
+
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "warningWrapper"
|
|
275
|
+
}, /*#__PURE__*/_react.default.createElement(_ui.IconWarningFilled16, {
|
|
276
|
+
color: _ui.colors.red500
|
|
277
|
+
}), /*#__PURE__*/_react.default.createElement("span", {
|
|
278
|
+
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "warningText"
|
|
279
|
+
}, warning)) : /*#__PURE__*/_react.default.createElement("span", {
|
|
269
280
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "summaryText"
|
|
270
281
|
}, getSummary()), /*#__PURE__*/_react.default.createElement("div", {
|
|
271
282
|
className: "jsx-".concat(_OrgUnitDimensionStyle.default.__hash) + " " + "deselectButton"
|
|
@@ -279,13 +290,22 @@ const OrgUnitDimension = _ref => {
|
|
|
279
290
|
}, _OrgUnitDimensionStyle.default));
|
|
280
291
|
};
|
|
281
292
|
|
|
293
|
+
OrgUnitDimension.defaultProps = {
|
|
294
|
+
hideGroupSelect: false,
|
|
295
|
+
hideLevelSelect: false,
|
|
296
|
+
hideUserOrgUnits: false
|
|
297
|
+
};
|
|
282
298
|
OrgUnitDimension.propTypes = {
|
|
299
|
+
hideGroupSelect: _propTypes.default.bool,
|
|
300
|
+
hideLevelSelect: _propTypes.default.bool,
|
|
301
|
+
hideUserOrgUnits: _propTypes.default.bool,
|
|
283
302
|
roots: _propTypes.default.arrayOf(_propTypes.default.string),
|
|
284
303
|
selected: _propTypes.default.arrayOf(_propTypes.default.shape({
|
|
285
304
|
id: _propTypes.default.string.isRequired,
|
|
286
305
|
name: _propTypes.default.string.isRequired,
|
|
287
306
|
path: _propTypes.default.string
|
|
288
307
|
})),
|
|
308
|
+
warning: _propTypes.default.string,
|
|
289
309
|
onSelect: _propTypes.default.func
|
|
290
310
|
};
|
|
291
311
|
var _default = OrgUnitDimension;
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _ui = require("@dhis2/ui");
|
|
9
9
|
|
|
10
|
-
const _defaultExport = [".container.jsx-
|
|
11
|
-
_defaultExport.__hash = "
|
|
10
|
+
const _defaultExport = [".container.jsx-2348205733{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".orgUnitTreeWrapper.jsx-2348205733{height:382px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;overflow:auto;}", ".orgUnitTreeWrapper.jsx-2348205733>*{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".disabled.jsx-2348205733{cursor:not-allowed;opacity:0.5;}", ".disabled.jsx-2348205733>*{pointer-events:none;}", ".userOrgUnitsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background:".concat(_ui.colors.grey200, ";padding:").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp8, " ").concat(_ui.spacers.dp24, ";margin-bottom:").concat(_ui.spacers.dp12, ";}"), ".userOrgUnitsWrapper.jsx-2348205733>*{margin-right:".concat(_ui.spacers.dp48, ";}"), ".selectsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(_ui.spacers.dp8, ";margin-top:").concat(_ui.spacers.dp12, ";}"), ".selectsWrapper.hidden.jsx-2348205733{display:none;}", ".selectsWrapper.jsx-2348205733>*{width:50%;}", ".summaryWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:".concat(_ui.spacers.dp8, ";}"), ".warningWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}", ".warningText.jsx-2348205733{margin-left:".concat(_ui.spacers.dp8, ";font-size:14px;line-height:18px;color:").concat(_ui.colors.red600, ";}"), ".summaryText.jsx-2348205733{font-size:14px;line-height:18px;color:".concat(_ui.colors.grey700, ";}"), ".deselectButton.jsx-2348205733{display:inline-block;margin-left:".concat(_ui.spacers.dp8, ";}")];
|
|
11
|
+
_defaultExport.__hash = "2348205733";
|
|
12
12
|
var _default = _defaultExport;
|
|
13
13
|
exports.default = _default;
|
|
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
|
|
|
4
4
|
import OrgUnitDimension from '../components/OrgUnitDimension/OrgUnitDimension.js';
|
|
5
5
|
|
|
6
6
|
const Wrapper = story => /*#__PURE__*/React.createElement(DataProvider, {
|
|
7
|
-
baseUrl: "
|
|
7
|
+
baseUrl: "https://debug.dhis2.org/analytics-dev/",
|
|
8
8
|
apiVersion: ""
|
|
9
9
|
}, story());
|
|
10
10
|
|
|
@@ -90,4 +90,52 @@ storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Multiple roots'
|
|
|
90
90
|
roots: ['O6uvpzGd5pu', 'fdc6uOvgoji'] // Bo + Bombali
|
|
91
91
|
|
|
92
92
|
});
|
|
93
|
+
});
|
|
94
|
+
storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without user org units selection', () => {
|
|
95
|
+
const [selected, setSelected] = useState([]);
|
|
96
|
+
return /*#__PURE__*/React.createElement(OrgUnitDimension, {
|
|
97
|
+
hideUserOrgUnits: true,
|
|
98
|
+
selected: selected,
|
|
99
|
+
onSelect: response => setSelected(response.items),
|
|
100
|
+
roots: defaultRootOrgUnits
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level selector', () => {
|
|
104
|
+
const [selected, setSelected] = useState([]);
|
|
105
|
+
return /*#__PURE__*/React.createElement(OrgUnitDimension, {
|
|
106
|
+
hideLevelSelect: true,
|
|
107
|
+
selected: selected,
|
|
108
|
+
onSelect: response => setSelected(response.items),
|
|
109
|
+
roots: defaultRootOrgUnits
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without group selector', () => {
|
|
113
|
+
const [selected, setSelected] = useState([]);
|
|
114
|
+
return /*#__PURE__*/React.createElement(OrgUnitDimension, {
|
|
115
|
+
hideGroupSelect: true,
|
|
116
|
+
selected: selected,
|
|
117
|
+
onSelect: response => setSelected(response.items),
|
|
118
|
+
roots: defaultRootOrgUnits
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector', () => {
|
|
122
|
+
const [selected, setSelected] = useState([]);
|
|
123
|
+
return /*#__PURE__*/React.createElement(OrgUnitDimension, {
|
|
124
|
+
hideLevelSelect: true,
|
|
125
|
+
hideGroupSelect: true,
|
|
126
|
+
selected: selected,
|
|
127
|
+
onSelect: response => setSelected(response.items),
|
|
128
|
+
roots: defaultRootOrgUnits
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
storiesOf('OrgUnitDimension', module).addDecorator(Wrapper).add('Without level and group selector, with warning text', () => {
|
|
132
|
+
const [selected, setSelected] = useState([]);
|
|
133
|
+
return /*#__PURE__*/React.createElement(OrgUnitDimension, {
|
|
134
|
+
hideLevelSelect: true,
|
|
135
|
+
hideGroupSelect: true,
|
|
136
|
+
selected: selected,
|
|
137
|
+
onSelect: response => setSelected(response.items),
|
|
138
|
+
roots: defaultRootOrgUnits,
|
|
139
|
+
warning: 'No org. units selected'
|
|
140
|
+
});
|
|
93
141
|
});
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _JSXStyle from "styled-jsx/style";
|
|
2
2
|
import { useDataEngine } from '@dhis2/app-runtime';
|
|
3
|
-
import { OrganisationUnitTree, Checkbox, MultiSelect, MultiSelectOption, Button } from '@dhis2/ui';
|
|
3
|
+
import { OrganisationUnitTree, Checkbox, MultiSelect, MultiSelectOption, Button, IconWarningFilled16, colors } from '@dhis2/ui';
|
|
4
4
|
import cx from 'classnames';
|
|
5
5
|
import PropTypes from 'prop-types';
|
|
6
6
|
import React, { useEffect, useState } from 'react';
|
|
@@ -16,7 +16,11 @@ const OrgUnitDimension = _ref => {
|
|
|
16
16
|
let {
|
|
17
17
|
roots,
|
|
18
18
|
selected,
|
|
19
|
-
onSelect
|
|
19
|
+
onSelect,
|
|
20
|
+
hideGroupSelect,
|
|
21
|
+
hideLevelSelect,
|
|
22
|
+
hideUserOrgUnits,
|
|
23
|
+
warning
|
|
20
24
|
} = _ref;
|
|
21
25
|
const [ouLevels, setOuLevels] = useState([]);
|
|
22
26
|
const [ouGroups, setOuGroups] = useState([]);
|
|
@@ -69,9 +73,9 @@ const OrgUnitDimension = _ref => {
|
|
|
69
73
|
setOuGroups(result);
|
|
70
74
|
};
|
|
71
75
|
|
|
72
|
-
doFetchOuLevels();
|
|
73
|
-
doFetchOuGroups();
|
|
74
|
-
}, [dataEngine]);
|
|
76
|
+
!hideLevelSelect && doFetchOuLevels();
|
|
77
|
+
!hideGroupSelect && doFetchOuGroups();
|
|
78
|
+
}, [dataEngine, hideLevelSelect, hideGroupSelect]);
|
|
75
79
|
|
|
76
80
|
const onLevelChange = ids => {
|
|
77
81
|
const items = ids.map(id => ({
|
|
@@ -146,7 +150,7 @@ const OrgUnitDimension = _ref => {
|
|
|
146
150
|
|
|
147
151
|
return /*#__PURE__*/React.createElement("div", {
|
|
148
152
|
className: "jsx-".concat(styles.__hash) + " " + "container"
|
|
149
|
-
}, /*#__PURE__*/React.createElement("div", {
|
|
153
|
+
}, !hideUserOrgUnits && /*#__PURE__*/React.createElement("div", {
|
|
150
154
|
className: "jsx-".concat(styles.__hash) + " " + "userOrgUnitsWrapper"
|
|
151
155
|
}, /*#__PURE__*/React.createElement(Checkbox, {
|
|
152
156
|
label: i18n.t('User organisation unit'),
|
|
@@ -202,9 +206,10 @@ const OrgUnitDimension = _ref => {
|
|
|
202
206
|
dataTest: 'org-unit-tree'
|
|
203
207
|
})), /*#__PURE__*/React.createElement("div", {
|
|
204
208
|
className: "jsx-".concat(styles.__hash) + " " + (cx('selectsWrapper', {
|
|
205
|
-
disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
|
|
209
|
+
disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id)),
|
|
210
|
+
hidden: hideLevelSelect && hideGroupSelect
|
|
206
211
|
}) || "")
|
|
207
|
-
}, /*#__PURE__*/React.createElement(MultiSelect, {
|
|
212
|
+
}, !hideLevelSelect && /*#__PURE__*/React.createElement(MultiSelect, {
|
|
208
213
|
selected: ouLevels.length ? selected.filter(item => ouIdHelper.hasLevelPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
|
|
209
214
|
onChange: _ref5 => {
|
|
210
215
|
let {
|
|
@@ -221,7 +226,7 @@ const OrgUnitDimension = _ref => {
|
|
|
221
226
|
value: level.id,
|
|
222
227
|
label: level.displayName,
|
|
223
228
|
dataTest: "org-unit-level-select-option-".concat(level.id)
|
|
224
|
-
}))), /*#__PURE__*/React.createElement(MultiSelect, {
|
|
229
|
+
}))), !hideGroupSelect && /*#__PURE__*/React.createElement(MultiSelect, {
|
|
225
230
|
selected: ouGroups.length ? selected.filter(item => ouIdHelper.hasGroupPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
|
|
226
231
|
onChange: _ref6 => {
|
|
227
232
|
let {
|
|
@@ -240,7 +245,13 @@ const OrgUnitDimension = _ref => {
|
|
|
240
245
|
dataTest: "org-unit-group-select-option-".concat(group.id)
|
|
241
246
|
})))), /*#__PURE__*/React.createElement("div", {
|
|
242
247
|
className: "jsx-".concat(styles.__hash) + " " + "summaryWrapper"
|
|
243
|
-
}, /*#__PURE__*/React.createElement("
|
|
248
|
+
}, warning ? /*#__PURE__*/React.createElement("div", {
|
|
249
|
+
className: "jsx-".concat(styles.__hash) + " " + "warningWrapper"
|
|
250
|
+
}, /*#__PURE__*/React.createElement(IconWarningFilled16, {
|
|
251
|
+
color: colors.red500
|
|
252
|
+
}), /*#__PURE__*/React.createElement("span", {
|
|
253
|
+
className: "jsx-".concat(styles.__hash) + " " + "warningText"
|
|
254
|
+
}, warning)) : /*#__PURE__*/React.createElement("span", {
|
|
244
255
|
className: "jsx-".concat(styles.__hash) + " " + "summaryText"
|
|
245
256
|
}, getSummary()), /*#__PURE__*/React.createElement("div", {
|
|
246
257
|
className: "jsx-".concat(styles.__hash) + " " + "deselectButton"
|
|
@@ -254,13 +265,22 @@ const OrgUnitDimension = _ref => {
|
|
|
254
265
|
}, styles));
|
|
255
266
|
};
|
|
256
267
|
|
|
268
|
+
OrgUnitDimension.defaultProps = {
|
|
269
|
+
hideGroupSelect: false,
|
|
270
|
+
hideLevelSelect: false,
|
|
271
|
+
hideUserOrgUnits: false
|
|
272
|
+
};
|
|
257
273
|
OrgUnitDimension.propTypes = {
|
|
274
|
+
hideGroupSelect: PropTypes.bool,
|
|
275
|
+
hideLevelSelect: PropTypes.bool,
|
|
276
|
+
hideUserOrgUnits: PropTypes.bool,
|
|
258
277
|
roots: PropTypes.arrayOf(PropTypes.string),
|
|
259
278
|
selected: PropTypes.arrayOf(PropTypes.shape({
|
|
260
279
|
id: PropTypes.string.isRequired,
|
|
261
280
|
name: PropTypes.string.isRequired,
|
|
262
281
|
path: PropTypes.string
|
|
263
282
|
})),
|
|
283
|
+
warning: PropTypes.string,
|
|
264
284
|
onSelect: PropTypes.func
|
|
265
285
|
};
|
|
266
286
|
export default OrgUnitDimension;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { colors, spacers } from '@dhis2/ui';
|
|
2
|
-
const _defaultExport = [".container.jsx-
|
|
3
|
-
_defaultExport.__hash = "
|
|
2
|
+
const _defaultExport = [".container.jsx-2348205733{height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;}", ".orgUnitTreeWrapper.jsx-2348205733{height:382px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;overflow:auto;}", ".orgUnitTreeWrapper.jsx-2348205733>*{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".disabled.jsx-2348205733{cursor:not-allowed;opacity:0.5;}", ".disabled.jsx-2348205733>*{pointer-events:none;}", ".userOrgUnitsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;background:".concat(colors.grey200, ";padding:").concat(spacers.dp8, " ").concat(spacers.dp8, " ").concat(spacers.dp8, " ").concat(spacers.dp24, ";margin-bottom:").concat(spacers.dp12, ";}"), ".userOrgUnitsWrapper.jsx-2348205733>*{margin-right:".concat(spacers.dp48, ";}"), ".selectsWrapper.jsx-2348205733{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:flex-start;-webkit-box-align:flex-start;-ms-flex-align:flex-start;align-items:flex-start;gap:".concat(spacers.dp8, ";margin-top:").concat(spacers.dp12, ";}"), ".selectsWrapper.hidden.jsx-2348205733{display:none;}", ".selectsWrapper.jsx-2348205733>*{width:50%;}", ".summaryWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:".concat(spacers.dp8, ";}"), ".warningWrapper.jsx-2348205733{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}", ".warningText.jsx-2348205733{margin-left:".concat(spacers.dp8, ";font-size:14px;line-height:18px;color:").concat(colors.red600, ";}"), ".summaryText.jsx-2348205733{font-size:14px;line-height:18px;color:".concat(colors.grey700, ";}"), ".deselectButton.jsx-2348205733{display:inline-block;margin-left:".concat(spacers.dp8, ";}")];
|
|
3
|
+
_defaultExport.__hash = "2348205733";
|
|
4
4
|
export default _defaultExport;
|