@dhis2/analytics 20.7.0 → 21.0.0-alpha.4

package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.defaultState = void 0;
+exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _d2UiOrgUnitDialog = require("@dhis2/d2-ui-org-unit-dialog");
+var _appRuntime = require("@dhis2/app-runtime");
 
 var _ui = require("@dhis2/ui");
 
-var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
+var _classnames = _interopRequireDefault(require("classnames"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -19,6 +19,10 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _organisationUnits = require("../../api/organisationUnits");
 
+var _index = _interopRequireDefault(require("../../locales/index.js"));
+
+var _list = require("../../modules/list");
+
 var _ouIdHelper = require("../../modules/ouIdHelper");
 
 var _predefinedDimensions = require("../../modules/predefinedDimensions");
@@ -31,213 +35,239 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-const defaultState = {
-  root: undefined,
-  roots: undefined,
-  // use "selected" property for cloning org units while user org unit(s) is (are) selected
-  selected: [],
-  ouLevels: [],
-  ouGroups: [],
-  showOrgUnitsTree: true
-};
-exports.defaultState = defaultState;
-
-class OrgUnitDimension extends _react.Component {
-  constructor(props) {
-    super(props);
-
-    _defineProperty(this, "showOrgUnitsTree", () => {
-      this.setState({
-        showOrgUnitsTree: true
-      });
-    });
-
-    _defineProperty(this, "hideOrgUnitsTree", () => {
-      this.setState({
-        showOrgUnitsTree: false
+const DYNAMIC_ORG_UNITS = [_ouIdHelper.USER_ORG_UNIT, _ouIdHelper.USER_ORG_UNIT_CHILDREN, _ouIdHelper.USER_ORG_UNIT_GRANDCHILDREN];
+
+const OrgUnitDimension = ({
+  roots,
+  selected,
+  onSelect
+}) => {
+  const [ouLevels, setOuLevels] = (0, _react.useState)([]);
+  const [ouGroups, setOuGroups] = (0, _react.useState)([]);
+  const dataEngine = (0, _appRuntime.useDataEngine)();
+
+  const onSelectItems = selectedItem => {
+    const {
+      id,
+      checked,
+      displayName,
+      path
+    } = selectedItem;
+    let result = [...selected];
+
+    if (checked && DYNAMIC_ORG_UNITS.includes(id)) {
+      result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id) || _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) || _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)), {
+        id,
+        displayName
+      }];
+    } else if (checked) {
+      result.push({
+        id,
+        path,
+        name: displayName
       });
-    });
-
-    _defineProperty(this, "getUserOrgUnitsFromIds", ids => {
-      return _d2UiOrgUnitDialog.userOrgUnits.filter(ou => ids.includes(ou.id));
-    });
-
-    _defineProperty(this, "onLevelChange", event => {
-      const levelIds = event.target.value.filter(id => !!id);
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...this.props.ouItems.filter(ou => !_ouIdHelper.ouIdHelper.hasLevelPrefix(ou.id)), ...levelIds.map(id => {
-          const levelOu = this.state.ouLevels.find(ou => ou.id === id);
-          return { ...levelOu,
-            id: _ouIdHelper.ouIdHelper.addLevelPrefix(levelOu.id)
-          };
-        })]
-      });
-    });
-
-    _defineProperty(this, "onGroupChange", event => {
-      const groupIds = event.target.value.filter(id => !!id);
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...this.props.ouItems.filter(ou => !_ouIdHelper.ouIdHelper.hasGroupPrefix(ou.id)), ...groupIds.map(id => {
-          const groupOu = this.state.ouGroups.find(ou => ou.id === id);
-          return { ...groupOu,
-            id: _ouIdHelper.ouIdHelper.addGroupPrefix(id)
-          };
-        })]
-      });
-    });
+    } else {
+      result = [...result.filter(item => item.id !== id)];
+    }
 
-    _defineProperty(this, "onDeselectAllClick", () => this.props.onDeselect({
+    onSelect({
       dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-      itemIdsToRemove: this.props.ouItems.map(ou => ou.id)
-    }));
-
-    _defineProperty(this, "loadOrgUnitTree", (d2, displayNameProperty) => {
-      (0, _organisationUnits.apiFetchOrganisationUnits)(d2, displayNameProperty).then(rootLevel => rootLevel.toArray()).then(roots => {
-        this.setState({
-          roots,
-          root: roots[0]
-        });
-      });
+      items: result
     });
-
-    _defineProperty(this, "loadOrgUnitGroups", (d2, displayNameProperty) => {
-      (0, _organisationUnits.apiFetchOrganisationUnitGroups)(d2, displayNameProperty).then(organisationUnitGroups => this.setState({
-        ouGroups: organisationUnitGroups
-      }));
+  };
+
+  const clearSelection = () => onSelect({
+    dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
+    items: []
+  });
+
+  (0, _react.useEffect)(() => {
+    const doFetchOuLevels = async () => {
+      const result = await (0, _organisationUnits.apiFetchOrganisationUnitLevels)(dataEngine);
+      result.sort((a, b) => a.level > b.level ? 1 : -1);
+      setOuLevels(result);
+    };
+
+    const doFetchOuGroups = async () => {
+      const result = await (0, _organisationUnits.apiFetchOrganisationUnitGroups)(dataEngine);
+      setOuGroups(result);
+    };
+
+    doFetchOuLevels();
+    doFetchOuGroups();
+  }, [dataEngine]);
+
+  const onLevelChange = ids => {
+    const items = ids.map(id => ({
+      id: _ouIdHelper.ouIdHelper.addLevelPrefix(id),
+      name: ouLevels.find(level => level.id === id).displayName
+    }));
+    onSelect({
+      dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
+      items: [...selected.filter(ou => !_ouIdHelper.ouIdHelper.hasLevelPrefix(ou.id)), ...items]
     });
+  };
 
-    _defineProperty(this, "loadOrgUnitLevels", d2 => {
-      (0, _organisationUnits.apiFetchOrganisationUnitLevels)(d2).then(organisationUnitLevels => this.setState({
-        ouLevels: (0, _sortBy.default)(organisationUnitLevels, ['level'])
-      }));
+  const onGroupChange = ids => {
+    const items = ids.map(id => ({
+      id: _ouIdHelper.ouIdHelper.addGroupPrefix(id),
+      name: ouGroups.find(group => group.id === id).displayName
+    }));
+    onSelect({
+      dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
+      items: [...selected.filter(ou => !_ouIdHelper.ouIdHelper.hasGroupPrefix(ou.id)), ...items]
     });
+  };
+
+  const getSummary = () => {
+    let summary;
+
+    if (selected.length) {
+      const numberOfOrgUnits = selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).length;
+      const numberOfLevels = selected.filter(item => _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id)).length;
+      const numberOfGroups = selected.filter(item => _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).length;
+      const userOrgUnits = selected.filter(item => DYNAMIC_ORG_UNITS.includes(item.id));
+      const parts = [];
+
+      if (numberOfOrgUnits) {
+        parts.push(_index.default.t('{{count}} org units', {
+          count: numberOfOrgUnits,
+          defaultValue: '{{count}} org unit',
+          defaultValue_plural: '{{count}} org units'
+        }));
+      }
 
-    _defineProperty(this, "handleOrgUnitClick", (event, orgUnit) => {
-      const selected = this.props.ouItems;
-
-      if (selected.some(ou => ou.path === orgUnit.path)) {
-        this.props.onDeselect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          itemIdsToRemove: [orgUnit.id]
-        });
-      } else {
-        this.props.onSelect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          items: [...selected, { ...orgUnit,
-            name: orgUnit.name || orgUnit.displayName
-          }]
-        });
+      if (numberOfLevels) {
+        parts.push(_index.default.t('{{count}} levels', {
+          count: numberOfLevels,
+          defaultValue: '{{count}} level',
+          defaultValue_plural: '{{count}} levels'
+        }));
       }
-    });
 
-    _defineProperty(this, "handleUserOrgUnitClick", (event, checked) => {
-      if (checked) {
-        if (!this.state.selected.length) {
-          this.setState({
-            selected: this.props.ouItems.slice()
-          });
-        }
-
-        this.props.onSelect({
-          dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-          items: [...this.props.ouItems.filter(ou => this.userOrgUnitIds.includes(ou.id)), _d2UiOrgUnitDialog.userOrgUnits.find(ou => ou.id === event.target.name)]
-        });
-      } else {
-        if (this.props.ouItems.length === 1 && this.state.selected.length > 0) {
-          this.props.onSelect({
-            dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-            items: this.state.selected
-          });
-        } else {
-          this.props.onDeselect({
-            dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-            itemIdsToRemove: [event.target.name]
-          });
-        }
+      if (numberOfGroups) {
+        parts.push(_index.default.t('{{count}} groups', {
+          count: numberOfGroups,
+          defaultValue: '{{count}} group',
+          defaultValue_plural: '{{count}} groups'
+        }));
       }
-    });
 
-    _defineProperty(this, "handleMultipleOrgUnitsSelect", orgUnits => {
-      const selected = this.props.ouItems;
-      this.props.onSelect({
-        dimensionId: _predefinedDimensions.DIMENSION_ID_ORGUNIT,
-        items: [...selected, ...orgUnits.reduce((obj, ou) => {
-          // avoid duplicates when clicking "Select children" multiple times
-          if (!selected.find(i => i.id === ou.id)) {
-            obj.push({ ...ou,
-              name: ou.name || ou.displayName
-            });
-          }
-
-          return obj;
-        }, [])]
+      userOrgUnits.forEach(orgUnit => {
+        parts.push(orgUnit.name || orgUnit.displayName);
       });
-    });
-
-    _defineProperty(this, "render", () => {
-      const ids = this.props.ouItems.map(ou => ou.id);
-      const selected = this.props.ouItems.filter(ou => !this.userOrgUnitIds.includes(ou.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(ou.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(ou.id));
-      const userOrgUnits = this.getUserOrgUnitsFromIds(ids);
-      const level = ids.filter(_ouIdHelper.ouIdHelper.hasLevelPrefix).map(_ouIdHelper.ouIdHelper.removePrefix);
-      const group = ids.filter(_ouIdHelper.ouIdHelper.hasGroupPrefix).map(_ouIdHelper.ouIdHelper.removePrefix);
-      return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, this.state.root && this.state.showOrgUnitsTree && /*#__PURE__*/_react.default.createElement(_d2UiOrgUnitDialog.OrgUnitSelector, {
-        d2: this.props.d2,
-        root: this.state.root,
-        roots: this.state.roots,
-        selected: selected,
-        userOrgUnits: userOrgUnits,
-        level: level,
-        group: group,
-        levelOptions: this.state.ouLevels,
-        groupOptions: this.state.ouGroups,
-        onLevelChange: this.onLevelChange,
-        onGroupChange: this.onGroupChange,
-        onDeselectAllClick: this.onDeselectAllClick,
-        handleUserOrgUnitClick: this.handleUserOrgUnitClick,
-        handleOrgUnitClick: this.handleOrgUnitClick,
-        handleMultipleOrgUnitsSelect: this.handleMultipleOrgUnitsSelect,
-        checkboxColor: "secondary",
-        deselectAllTooltipFontColor: _ui.colors.grey900,
-        deselectAllTooltipBackgroundColor: _ui.colors.grey300,
-        displayNameProperty: this.props.displayNameProperty,
-        isUserDataViewFallback: true
-      }), !this.state.root && /*#__PURE__*/_react.default.createElement("div", {
-        className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "loader"
-      }, /*#__PURE__*/_react.default.createElement(_ui.CircularLoader, null)), /*#__PURE__*/_react.default.createElement(_style.default, {
-        id: _OrgUnitDimension.default.__hash
-      }, _OrgUnitDimension.default));
-    });
-
-    this.state = defaultState;
-    this.userOrgUnitIds = _d2UiOrgUnitDialog.userOrgUnits.map(ou => ou.id);
-    this.loadOrgUnitTree(props.d2, props.displayNameProperty);
-    this.loadOrgUnitGroups(props.d2, props.displayNameProperty);
-    this.loadOrgUnitLevels(props.d2);
-  }
-
-  componentDidUpdate(prevProps) {
-    const previousId = prevProps.current ? prevProps.current.id : null;
-    const currentId = this.props.current ? this.props.current.id : null; // remount org units selector component to ensure
-    // only selected org units are expanded
-
-    if (previousId !== currentId) {
-      this.hideOrgUnitsTree();
-      setTimeout(this.showOrgUnitsTree, 0);
+      summary = _index.default.t('Selected: {{commaSeparatedListOfOrganisationUnits}}', {
+        keySeparator: '>',
+        nsSeparator: '|',
+        commaSeparatedListOfOrganisationUnits: (0, _list.formatList)(parts)
+      });
+    } else {
+      summary = _index.default.t('Nothing selected');
     }
-  }
 
-}
+    return summary;
+  };
+
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "container"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "userOrgUnitsWrapper"
+  }, /*#__PURE__*/_react.default.createElement(_ui.Checkbox, {
+    label: _index.default.t('User organisation unit'),
+    checked: selected.some(item => item.id === _ouIdHelper.USER_ORG_UNIT),
+    onChange: ({
+      checked
+    }) => onSelectItems({
+      id: _ouIdHelper.USER_ORG_UNIT,
+      checked,
+      displayName: _index.default.t('User organisation unit')
+    }),
+    dense: true
+  }), /*#__PURE__*/_react.default.createElement(_ui.Checkbox, {
+    label: _index.default.t('User sub-units'),
+    checked: selected.some(item => item.id === _ouIdHelper.USER_ORG_UNIT_CHILDREN),
+    onChange: ({
+      checked
+    }) => onSelectItems({
+      id: _ouIdHelper.USER_ORG_UNIT_CHILDREN,
+      checked,
+      displayName: _index.default.t('User sub-units')
+    }),
+    dense: true
+  }), /*#__PURE__*/_react.default.createElement(_ui.Checkbox, {
+    label: _index.default.t('User sub-x2-units'),
+    checked: selected.some(item => item.id === _ouIdHelper.USER_ORG_UNIT_GRANDCHILDREN),
+    onChange: ({
+      checked
+    }) => onSelectItems({
+      id: _ouIdHelper.USER_ORG_UNIT_GRANDCHILDREN,
+      checked,
+      displayName: _index.default.t('User sub-x2-units')
+    }),
+    dense: true
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + ((0, _classnames.default)('orgUnitTreeWrapper', {
+      disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
+    }) || "")
+  }, /*#__PURE__*/_react.default.createElement(_ui.OrganisationUnitTree, {
+    roots: roots,
+    initiallyExpanded: [...(roots.length === 1 ? ["/".concat(roots[0])] : []), ...selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path.substring(0, item.path.lastIndexOf('/'))).filter(path => path)],
+    selected: selected.filter(item => !DYNAMIC_ORG_UNITS.includes(item.id) && !_ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) && !_ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => item.path),
+    onChange: onSelectItems,
+    dataTest: 'org-unit-tree'
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "selectsWrapper"
+  }, /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
+    selected: ouLevels.length ? selected.filter(item => _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id)).map(item => _ouIdHelper.ouIdHelper.removePrefix(item.id)) : [],
+    onChange: ({
+      selected
+    }) => onLevelChange(selected),
+    placeholder: _index.default.t('Select a level'),
+    loading: !ouLevels.length,
+    dense: true,
+    dataTest: 'org-unit-level-select'
+  }, ouLevels.map(level => /*#__PURE__*/_react.default.createElement(_ui.MultiSelectOption, {
+    key: level.id,
+    value: level.id,
+    label: level.displayName,
+    dataTest: "org-unit-level-select-option-".concat(level.id)
+  }))), /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
+    selected: ouGroups.length ? selected.filter(item => _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)).map(item => _ouIdHelper.ouIdHelper.removePrefix(item.id)) : [],
+    onChange: ({
+      selected
+    }) => onGroupChange(selected),
+    placeholder: _index.default.t('Select a group'),
+    loading: !ouGroups.length,
+    dense: true,
+    dataTest: 'org-unit-group-select'
+  }, ouGroups.map(group => /*#__PURE__*/_react.default.createElement(_ui.MultiSelectOption, {
+    key: group.id,
+    value: group.id,
+    label: group.displayName,
+    dataTest: "org-unit-group-select-option-".concat(group.id)
+  })))), /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "summaryWrapper"
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "summaryText"
+  }, getSummary()), /*#__PURE__*/_react.default.createElement("div", {
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "deselectButton"
+  }, /*#__PURE__*/_react.default.createElement(_ui.Button, {
+    secondary: true,
+    small: true,
+    onClick: clearSelection,
+    disabled: !selected.length
+  }, _index.default.t('Deselect all')))), /*#__PURE__*/_react.default.createElement(_style.default, {
+    id: _OrgUnitDimension.default.__hash
+  }, _OrgUnitDimension.default));
+};
 
 OrgUnitDimension.propTypes = {
-  current: _propTypes.default.object,
-  d2: _propTypes.default.object,
-  displayNameProperty: _propTypes.default.string,
-  ouItems: _propTypes.default.array,
-  onDeselect: _propTypes.default.func,
+  roots: _propTypes.default.arrayOf(_propTypes.default.string),
+  selected: _propTypes.default.arrayOf(_propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
+    name: _propTypes.default.string.isRequired,
+    path: _propTypes.default.string
+  })),
   onSelect: _propTypes.default.func
 };
 var _default = OrgUnitDimension;

package/build/cjs/components/OrgUnitDimension/styles/OrgUnitDimension.style.js

@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-const _defaultExport = [".loader.jsx-3308394077{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;min-height:100px;}"];
-_defaultExport.__hash = "3308394077";
+
+var _ui = require("@dhis2/ui");
+
+const _defaultExport = [".container.jsx-3879278432{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-3879278432{height:382px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;overflow:auto;}", ".orgUnitTreeWrapper.jsx-3879278432>*{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;}", ".disabled.jsx-3879278432{cursor:not-allowed;opacity:0.5;}", ".disabled.jsx-3879278432>*{pointer-events:none;}", ".userOrgUnitsWrapper.jsx-3879278432{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-3879278432>*{margin-right:".concat(_ui.spacers.dp48, ";}"), ".selectsWrapper.jsx-3879278432{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.jsx-3879278432>*{width:50%;}", ".summaryWrapper.jsx-3879278432{margin-top:".concat(_ui.spacers.dp8, ";}"), ".summaryText.jsx-3879278432{font-size:14px;line-height:18px;color:".concat(_ui.colors.grey700, ";}"), ".deselectButton.jsx-3879278432{display:inline-block;margin-left:".concat(_ui.spacers.dp8, ";}")];
+_defaultExport.__hash = "3879278432";
 var _default = _defaultExport;
 exports.default = _default;

package/build/cjs/components/PeriodDimension/FixedPeriodSelect.js

@@ -7,10 +7,10 @@ exports.default = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _index = _interopRequireDefault(require("../../locales/index.js"));

package/build/cjs/components/TransferOption.js

@@ -7,12 +7,12 @@ exports.TransferOption = void 0;
 
 var _style = _interopRequireDefault(require("styled-jsx/style"));
 
-var _propTypes = _interopRequireDefault(require("@dhis2/prop-types"));
-
 var _ui = require("@dhis2/ui");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _react = _interopRequireDefault(require("react"));
 
 var _TransferOption = _interopRequireDefault(require("./styles/TransferOption.style"));

package/build/cjs/index.js

@@ -114,19 +114,19 @@ Object.defineProperty(exports, "apiFetchRecommendedIds", {
 Object.defineProperty(exports, "apiFetchOrganisationUnitLevels", {
   enumerable: true,
   get: function () {
-    return _organisationUnitsDataEngine.apiFetchOrganisationUnitLevels;
+    return _organisationUnits.apiFetchOrganisationUnitLevels;
   }
 });
 Object.defineProperty(exports, "apiFetchOrganisationUnitRoots", {
   enumerable: true,
   get: function () {
-    return _organisationUnitsDataEngine.apiFetchOrganisationUnitRoots;
+    return _organisationUnits.apiFetchOrganisationUnitRoots;
   }
 });
 Object.defineProperty(exports, "apiFetchOrganisationUnit", {
   enumerable: true,
   get: function () {
-    return _organisationUnitsDataEngine.apiFetchOrganisationUnit;
+    return _organisationUnits.apiFetchOrganisationUnit;
   }
 });
 Object.defineProperty(exports, "getAxisName", {
@@ -219,6 +219,24 @@ Object.defineProperty(exports, "ouIdHelper", {
     return _ouIdHelper.ouIdHelper;
   }
 });
+Object.defineProperty(exports, "USER_ORG_UNIT", {
+  enumerable: true,
+  get: function () {
+    return _ouIdHelper.USER_ORG_UNIT;
+  }
+});
+Object.defineProperty(exports, "USER_ORG_UNIT_CHILDREN", {
+  enumerable: true,
+  get: function () {
+    return _ouIdHelper.USER_ORG_UNIT_CHILDREN;
+  }
+});
+Object.defineProperty(exports, "USER_ORG_UNIT_GRANDCHILDREN", {
+  enumerable: true,
+  get: function () {
+    return _ouIdHelper.USER_ORG_UNIT_GRANDCHILDREN;
+  }
+});
 Object.defineProperty(exports, "convertOuLevelsToUids", {
   enumerable: true,
   get: function () {
@@ -1154,7 +1172,7 @@ var _Analytics = _interopRequireDefault(require("./api/analytics/Analytics"));
 
 var _dimensions = require("./api/dimensions");
 
-var _organisationUnitsDataEngine = require("./api/organisationUnits-dataEngine");
+var _organisationUnits = require("./api/organisationUnits");
 
 var _axis = require("./modules/axis");
 

package/build/cjs/locales/en/translations.json

@@ -118,6 +118,20 @@
     "Options": "Options",
     "Hide": "Hide",
     "Update": "Update",
+    "{{count}} org units": "{{count}} org unit",
+    "{{count}} org units_plural": "{{count}} org units",
+    "{{count}} levels": "{{count}} level",
+    "{{count}} levels_plural": "{{count}} levels",
+    "{{count}} groups": "{{count}} group",
+    "{{count}} groups_plural": "{{count}} groups",
+    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "Selected: {{commaSeparatedListOfOrganisationUnits}}",
+    "Nothing selected": "Nothing selected",
+    "User organisation unit": "User organisation unit",
+    "User sub-units": "User sub-units",
+    "User sub-x2-units": "User sub-x2-units",
+    "Select a level": "Select a level",
+    "Select a group": "Select a group",
+    "Deselect all": "Deselect all",
     "Period type": "Period type",
     "Year": "Year",
     "Select year": "Select year",

package/build/cjs/modules/list.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatList = void 0;
+
+var _index = _interopRequireDefault(require("../locales/index.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const formatList = items => {
+  // Wrap Intl.ListFormat in try/catch as DHIS2 locales are not always ISO 639 compliant
+  try {
+    const formatter = new Intl.ListFormat(_index.default.language, {
+      style: 'long',
+      type: 'conjunction'
+    });
+    return formatter.format(items);
+  } catch (error) {
+    return items.join(', ');
+  }
+};
+
+exports.formatList = formatList;

package/build/cjs/modules/ouIdHelper/index.js

@@ -3,9 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ouIdHelper = void 0;
+exports.ouIdHelper = exports.USER_ORG_UNIT_GRANDCHILDREN = exports.USER_ORG_UNIT_CHILDREN = exports.USER_ORG_UNIT = void 0;
 const LEVEL_ID_PREFIX = 'LEVEL';
 const GROUP_ID_PREFIX = 'OU_GROUP';
+const USER_ORG_UNIT = 'USER_ORGUNIT';
+exports.USER_ORG_UNIT = USER_ORG_UNIT;
+const USER_ORG_UNIT_CHILDREN = 'USER_ORGUNIT_CHILDREN';
+exports.USER_ORG_UNIT_CHILDREN = USER_ORG_UNIT_CHILDREN;
+const USER_ORG_UNIT_GRANDCHILDREN = 'USER_ORGUNIT_GRANDCHILDREN';
+exports.USER_ORG_UNIT_GRANDCHILDREN = USER_ORG_UNIT_GRANDCHILDREN;
 
 const hasGroupPrefix = id => id.substr(0, GROUP_ID_PREFIX.length) === GROUP_ID_PREFIX;
 

package/build/cjs/modules/relativeItems/index.js

@@ -11,6 +11,6 @@ var _ouIdHelper = require("../ouIdHelper");
 
 var _predefinedDimensions = require("../predefinedDimensions");
 
-const hasRelativeItems = (dimension, itemIds = []) => dimension === _predefinedDimensions.DIMENSION_ID_ASSIGNED_CATEGORIES || dimension === _predefinedDimensions.DIMENSION_ID_ORGUNIT && Array.isArray(itemIds) && itemIds.some(id => _ouIdHelper.ouIdHelper.hasLevelPrefix(id) || _ouIdHelper.ouIdHelper.hasGroupPrefix(id) || ['USER_ORGUNIT', 'USER_ORGUNIT_CHILDREN', 'USER_ORGUNIT_GRAND_CHILDREN'].includes(id)) || dimension === _predefinedDimensions.DIMENSION_ID_PERIOD && Array.isArray(itemIds) && itemIds.some(id => (0, _relativePeriods.getRelativePeriodIds)().includes(id));
+const hasRelativeItems = (dimension, itemIds = []) => dimension === _predefinedDimensions.DIMENSION_ID_ASSIGNED_CATEGORIES || dimension === _predefinedDimensions.DIMENSION_ID_ORGUNIT && Array.isArray(itemIds) && itemIds.some(id => _ouIdHelper.ouIdHelper.hasLevelPrefix(id) || _ouIdHelper.ouIdHelper.hasGroupPrefix(id) || [_ouIdHelper.USER_ORG_UNIT, _ouIdHelper.USER_ORG_UNIT_CHILDREN, _ouIdHelper.USER_ORG_UNIT_GRANDCHILDREN].includes(id)) || dimension === _predefinedDimensions.DIMENSION_ID_PERIOD && Array.isArray(itemIds) && itemIds.some(id => (0, _relativePeriods.getRelativePeriodIds)().includes(id));
 
 exports.hasRelativeItems = hasRelativeItems;

package/build/cjs/visualizations/util/__tests__/getFilterText.spec.js

@@ -133,7 +133,7 @@ describe('getFilterText', () => {
         name: '02 of 2018',
         uid: '_201802_'
       };
-      expect((0, _getFilterText.default)(filters, metaData)).toEqual('Clinics, Hospital - Last 2 months');
+      expect((0, _getFilterText.default)(filters, metaData)).toEqual('Clinics, Hospital - 01 of 2018, 02 of 2018');
     });
   });
 });