@dhis2/analytics 21.0.7 → 21.0.8

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 (4) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js +4 -2
  3. package/build/es/components/OrgUnitDimension/OrgUnitDimension.js +4 -2
  4. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [21.0.8](https://github.com/dhis2/analytics/compare/v21.0.7...v21.0.8) (2021-12-02)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * disable org unit filters and groups when user org units are used ([#1100](https://github.com/dhis2/analytics/issues/1100)) ([ce63e14](https://github.com/dhis2/analytics/commit/ce63e14517abfe5f7edc6f42b46c6e1dc07a3555))
7
+
1
8
  ## [21.0.7](https://github.com/dhis2/analytics/compare/v21.0.6...v21.0.7) (2021-12-01)
2
9
 
3
10
 
package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js CHANGED
@@ -56,7 +56,7 @@ const OrgUnitDimension = ({
56
56
  let result = [...selected];
57
57
 
58
58
  if (checked && DYNAMIC_ORG_UNITS.includes(id)) {
59
- result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id) || _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) || _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)), {
59
+ result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id)), {
60
60
  id,
61
61
  displayName
62
62
  }];
@@ -216,7 +216,9 @@ const OrgUnitDimension = ({
216
216
  onChange: onSelectItems,
217
217
  dataTest: 'org-unit-tree'
218
218
  })), /*#__PURE__*/_react.default.createElement("div", {
219
- className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "selectsWrapper"
219
+ className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + ((0, _classnames.default)('selectsWrapper', {
220
+ disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
221
+ }) || "")
220
222
  }, /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
221
223
  selected: ouLevels.length ? selected.filter(item => _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id)).map(item => _ouIdHelper.ouIdHelper.removePrefix(item.id)) : [],
222
224
  onChange: ({
package/build/es/components/OrgUnitDimension/OrgUnitDimension.js CHANGED
@@ -31,7 +31,7 @@ const OrgUnitDimension = ({
31
31
  let result = [...selected];
32
32
 
33
33
  if (checked && DYNAMIC_ORG_UNITS.includes(id)) {
34
- result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id) || ouIdHelper.hasLevelPrefix(item.id) || ouIdHelper.hasGroupPrefix(item.id)), {
34
+ result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id)), {
35
35
  id,
36
36
  displayName
37
37
  }];
@@ -191,7 +191,9 @@ const OrgUnitDimension = ({
191
191
  onChange: onSelectItems,
192
192
  dataTest: 'org-unit-tree'
193
193
  })), /*#__PURE__*/React.createElement("div", {
194
- className: "jsx-".concat(styles.__hash) + " " + "selectsWrapper"
194
+ className: "jsx-".concat(styles.__hash) + " " + (cx('selectsWrapper', {
195
+ disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
196
+ }) || "")
195
197
  }, /*#__PURE__*/React.createElement(MultiSelect, {
196
198
  selected: ouLevels.length ? selected.filter(item => ouIdHelper.hasLevelPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
197
199
  onChange: ({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2/analytics",
3
- "version": "21.0.7",
3
+ "version": "21.0.8",
4
4
  "main": "./build/cjs/index.js",
5
5
  "module": "./build/es/index.js",
6
6
  "exports": {