@dhis2-ui/organisation-unit-tree 10.16.3 → 10.16.5

package/build/es/__e2e__/single_selection.js

@@ -3,10 +3,7 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData } from './common.js';
 const data = {
-  organisationUnits: function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+  organisationUnits: (...args) => {
     const [, {
       id
     }] = args;
@@ -28,15 +25,12 @@ const data = {
 };
 export const SingleSelection = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: data
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    selected,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    singleSelection: true,
-    roots: ['A0000000000', 'A0000000001'],
-    onChange: onChange,
-    selected: selected
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  selected,
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  singleSelection: true,
+  roots: ['A0000000000', 'A0000000001'],
+  onChange: onChange,
+  selected: selected
+})));

package/build/es/__e2e__/sub_unit_as_root.js

@@ -1,11 +1,10 @@
 import React, { useState } from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { createDecoratorCustomDataProvider, createDecoratorStatefulMultiSelection } from './common.js';
-export const MultipleRootSubAndOneMainOrgUnit = (_, _ref) => {
-  let {
-    selected,
-    onChange
-  } = _ref;
+export const MultipleRootSubAndOneMainOrgUnit = (_, {
+  selected,
+  onChange
+}) => {
   const [filter, setFilter] = useState('');
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("input", {
     type: "input",

package/build/es/__e2e__/tree_api.js

@@ -3,10 +3,7 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData } from './common.js';
 const customizedDataProviderData = {
-  organisationUnits: function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+  organisationUnits: (...args) => {
     const [, {
       id,
       params
@@ -39,20 +36,17 @@ window.onExpand = window.Cypress && window.Cypress.cy.stub();
 window.onChildrenLoaded = window.Cypress && window.Cypress.cy.stub();
 export const Events = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: customizedDataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    selected,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    selected: selected,
-    onChange: function () {
-      onChange(...arguments);
-      window.onChange(...arguments);
-    },
-    onExpand: window.onExpand,
-    onCollapse: window.onCollapse,
-    onChildrenLoaded: window.onChildrenLoaded
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  selected,
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  selected: selected,
+  onChange: (...args) => {
+    onChange(...args);
+    window.onChange(...args);
+  },
+  onExpand: window.onExpand,
+  onCollapse: window.onCollapse,
+  onChildrenLoaded: window.onChildrenLoaded
+})));

package/build/es/__stories__/custom-expanded-imperative-open.js

@@ -6,18 +6,16 @@ export const CustomExpandedImperativeOpen = () => {
   const orgUnit2Path = '/A0000000000/A0000000001';
   const initiallyExpanded = getAllExpandedOrgUnitPaths([]);
   const [expanded, setExpanded] = useState(initiallyExpanded);
-  const handleExpand = _ref => {
-    let {
-      path
-    } = _ref;
+  const handleExpand = ({
+    path
+  }) => {
     if (!expanded.includes(path)) {
       setExpanded([...expanded, path]);
     }
   };
-  const handleCollapse = _ref2 => {
-    let {
-      path
-    } = _ref2;
+  const handleCollapse = ({
+    path
+  }) => {
     const pathIndex = expanded.indexOf(path);
     if (pathIndex !== -1) {
       const updatedExpanded = pathIndex === 0 ? expanded.slice(1) : [...expanded.slice(0, pathIndex), ...expanded.slice(pathIndex + 1)];

package/build/es/__stories__/custom-node-label.js

@@ -5,11 +5,10 @@ export const CustomNodeLabel = () => /*#__PURE__*/React.createElement(Organisati
   name: "Root org unit",
   roots: "A0000000000",
   initiallyExpanded: ['/A0000000000/A0000000001'],
-  renderNodeLabel: _ref => {
-    let {
-      label,
-      node
-    } = _ref;
+  renderNodeLabel: ({
+    label,
+    node
+  }) => {
     if (node.path !== '/A0000000000/A0000000001') {
       return label;
     }

package/build/es/__stories__/development-stories.js

@@ -2,12 +2,11 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 import { DataProvider } from '@dhis2/app-runtime';
 import React, { useState } from 'react';
 import { OrganisationUnitTree } from '../index.js';
-const DX_onChange = (selected, setSelected, singleSelection) => _ref => {
-  let {
-    id,
-    path,
-    checked
-  } = _ref;
+const DX_onChange = (selected, setSelected, singleSelection) => ({
+  id,
+  path,
+  checked
+}) => {
   console.log('onChange', {
     path,
     id,

package/build/es/__stories__/loading-error-grandchild.js

@@ -5,10 +5,7 @@ import { customData, onChange, onExpand, onCollapse, onChildrenLoaded } from './
 export const LoadingErrorGrandchild = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: {
     ...customData,
-    organisationUnits: function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    organisationUnits: (...args) => {
       const [, {
         id
       }] = args;

package/build/es/__stories__/loading.js

@@ -5,10 +5,7 @@ import { customData, onChange } from './shared.js';
 export const Loading = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: {
     ...customData,
-    organisationUnits: function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    organisationUnits: (...args) => {
       const [, {
         id
       }] = args;

package/build/es/__stories__/multiple-roots.js

@@ -1,16 +1,13 @@
 import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { createDecoratorCustomDataProvider, createDecoratorStatefulMultiSelection } from './shared.js';
-export const MultipleRoots = (_, _ref) => {
-  let {
-    onChange,
-    selected
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    selected: selected,
-    onChange: onChange,
-    roots: ['A0000000000', 'A0000000001'],
-    initiallyExpanded: ['/A0000000000/A0000000001']
-  });
-};
+export const MultipleRoots = (_, {
+  onChange,
+  selected
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  selected: selected,
+  onChange: onChange,
+  roots: ['A0000000000', 'A0000000001'],
+  initiallyExpanded: ['/A0000000000/A0000000001']
+});
 MultipleRoots.decorators = [createDecoratorStatefulMultiSelection(), createDecoratorCustomDataProvider()];

package/build/es/__stories__/root-error.js

@@ -5,10 +5,7 @@ import { customData, onChange } from './shared.js';
 export const RootError = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: {
     ...customData,
-    organisationUnits: function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    organisationUnits: (...args) => {
       const [, {
         id
       }] = args;

package/build/es/__stories__/root-loading.js

@@ -5,10 +5,7 @@ import { customData, onChange } from './shared.js';
 export const RootLoading = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: {
     ...customData,
-    organisationUnits: function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+    organisationUnits: (...args) => {
       const [, {
         id
       }] = args;

package/build/es/__stories__/shared.js

@@ -2,60 +2,36 @@ import { CustomDataProvider } from '@dhis2/app-runtime';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 export const log = true;
-export const onChange = function () {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-    args[_key] = arguments[_key];
-  }
-  return log && console.log('onChange', ...args);
-};
-export const onExpand = function () {
-  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-    args[_key2] = arguments[_key2];
-  }
-  return log && console.log('onExpand', ...args);
-};
-export const onCollapse = function () {
-  for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-    args[_key3] = arguments[_key3];
-  }
-  return log && console.log('onCollapse', ...args);
-};
-export const onChildrenLoaded = function () {
-  for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-    args[_key4] = arguments[_key4];
-  }
-  return log && console.log('onChildrenLoaded', ...args);
-};
-const createResponse = _ref => {
-  let {
-    fields,
-    id,
-    path,
-    displayName,
+export const onChange = (...args) => log && console.log('onChange', ...args);
+export const onExpand = (...args) => log && console.log('onExpand', ...args);
+export const onCollapse = (...args) => log && console.log('onCollapse', ...args);
+export const onChildrenLoaded = (...args) => log && console.log('onChildrenLoaded', ...args);
+const createResponse = ({
+  fields,
+  id,
+  path,
+  displayName,
+  children
+}) => ({
+  ...(fields.includes('id') ? {
+    id
+  } : {}),
+  ...(fields.includes('path') ? {
+    path
+  } : {}),
+  ...(fields.includes('displayName') ? {
+    displayName
+  } : {}),
+  ...(fields.includes('children::size') ? {
+    children: children.length
+  } : {}),
+  ...(fields.includes('children[id,path,displayName]') ? {
     children
-  } = _ref;
-  return {
-    ...(fields.includes('id') ? {
-      id
-    } : {}),
-    ...(fields.includes('path') ? {
-      path
-    } : {}),
-    ...(fields.includes('displayName') ? {
-      displayName
-    } : {}),
-    ...(fields.includes('children::size') ? {
-      children: children.length
-    } : {}),
-    ...(fields.includes('children[id,path,displayName]') ? {
-      children
-    } : {})
-  };
-};
-export const getOrganisationUnitData = (id, _ref2) => {
-  let {
-    fields
-  } = _ref2;
+  } : {})
+});
+export const getOrganisationUnitData = (id, {
+  fields
+}) => {
   let data;
   if (id === 'A0000000000') {
     data = createResponse({
@@ -157,11 +133,10 @@ export const getOrganisationUnitData = (id, _ref2) => {
   return data;
 };
 export const customData = {
-  organisationUnits: (_, _ref3) => {
-    let {
-      id,
-      params = {}
-    } = _ref3;
+  organisationUnits: (_, {
+    id,
+    params = {}
+  }) => {
     const data = getOrganisationUnitData(id, params);
     if (!data) {
       return Promise.reject(new Error('404 - Org unit not found'));
@@ -169,18 +144,14 @@ export const customData = {
     return Promise.resolve(data);
   }
 };
-export const StatefulMultiSelectionWrapper = _ref4 => {
-  let {
-    children,
-    onSelectionChange = () => null
-  } = _ref4;
+export const StatefulMultiSelectionWrapper = ({
+  children,
+  onSelectionChange = () => null
+}) => {
   const [selected, setSelected] = useState([]);
   return children({
     selected,
-    onChange: function () {
-      for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-        args[_key5] = arguments[_key5];
-      }
+    onChange: (...args) => {
       onChange(...args);
       const [{
         selected: newSelected
@@ -197,16 +168,13 @@ StatefulMultiSelectionWrapper.propTypes = {
 export const createDecoratorStatefulMultiSelection = args => {
   return Story => /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, {
     onSelectionChange: args === null || args === void 0 ? void 0 : args.onSelectionChange
-  }, _ref5 => {
-    let {
-      selected,
-      onChange
-    } = _ref5;
-    return /*#__PURE__*/React.createElement(Story, {
-      selected: selected,
-      onChange: onChange
-    });
-  });
+  }, ({
+    selected,
+    onChange
+  }) => /*#__PURE__*/React.createElement(Story, {
+    selected: selected,
+    onChange: onChange
+  }));
 };
 export const createDecoratorCustomDataProvider = args => {
   const data = (args === null || args === void 0 ? void 0 : args.data) || customData;

package/build/es/features/controlled_expanded/index.js

@@ -56,12 +56,9 @@ Then('the path should close', () => {
       const curData = getOrganisationUnitData(cur, {
         fields: ['children[id,path,displayName]']
       });
-      const childrenIds = curData.children.map(_ref => {
-        let {
-          id
-        } = _ref;
-        return id;
-      });
+      const childrenIds = curData.children.map(({
+        id
+      }) => id);
       return [...acc, ...childrenIds];
     }, []);
     expectOrgUnitsToNotBeDisplayed(hiddenChildrenIds);

package/build/es/locales/index.js

@@ -26,22 +26,44 @@ import viTranslations from './vi/translations.json';
 import zhTranslations from './zh/translations.json';
 import zh_CNTranslations from './zh_CN/translations.json';
 const namespace = 'default';
-i18n.addResources('ar', namespace, arTranslations);
-i18n.addResources('cs', namespace, csTranslations);
-i18n.addResources('en', namespace, enTranslations);
-i18n.addResources('es', namespace, esTranslations);
-i18n.addResources('es_419', namespace, es_419Translations);
-i18n.addResources('fr', namespace, frTranslations);
-i18n.addResources('lo', namespace, loTranslations);
-i18n.addResources('nb', namespace, nbTranslations);
-i18n.addResources('nl', namespace, nlTranslations);
-i18n.addResources('pt', namespace, ptTranslations);
-i18n.addResources('ru', namespace, ruTranslations);
-i18n.addResources('uk', namespace, ukTranslations);
-i18n.addResources('uz_Latn', namespace, uz_LatnTranslations);
-i18n.addResources('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations);
-i18n.addResources('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations);
-i18n.addResources('vi', namespace, viTranslations);
-i18n.addResources('zh', namespace, zhTranslations);
-i18n.addResources('zh_CN', namespace, zh_CNTranslations);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es_419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('es-419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('uz_Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz-Cyrl-UZ', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn-UZ', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh_CN', namespace, zh_CNTranslations, true, false);
+i18n.addResourceBundle('zh-CN', namespace, zh_CNTranslations, true, false);
 export default i18n;

package/build/es/organisation-unit-node/error-message.js

@@ -2,19 +2,16 @@ import _JSXStyle from "styled-jsx/style";
 import { colors, spacers, theme } from '@dhis2/ui-constants';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const ErrorMessage = _ref => {
-  let {
-    children,
-    dataTest
-  } = _ref;
-  return /*#__PURE__*/React.createElement("span", {
-    "data-test": `${dataTest}-error`,
-    className: _JSXStyle.dynamic([["3198585030", [colors.grey800, spacers.dp4, theme.error]]])
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3198585030",
-    dynamic: [colors.grey800, spacers.dp4, theme.error]
-  }, [`span.__jsx-style-dynamic-selector{font-size:14px;color:${colors.grey800};margin:${spacers.dp4};color:${theme.error};}`]));
-};
+export const ErrorMessage = ({
+  children,
+  dataTest
+}) => /*#__PURE__*/React.createElement("span", {
+  "data-test": `${dataTest}-error`,
+  className: _JSXStyle.dynamic([["3198585030", [colors.grey800, spacers.dp4, theme.error]]])
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "3198585030",
+  dynamic: [colors.grey800, spacers.dp4, theme.error]
+}, [`span.__jsx-style-dynamic-selector{font-size:14px;color:${colors.grey800};margin:${spacers.dp4};color:${theme.error};}`]));
 ErrorMessage.propTypes = {
   children: PropTypes.any.isRequired,
   dataTest: PropTypes.string.isRequired

package/build/es/organisation-unit-node/label/disabled-selection-label.js

@@ -9,18 +9,15 @@ import { SingleSelectionLabel } from './single-selection-label.js';
  * @param {bool} [props.loading]
  * @returns {React.Component}
  */
-export const DisabledSelectionLabel = _ref => {
-  let {
-    children,
-    loading,
-    onToggleOpen
-  } = _ref;
-  return /*#__PURE__*/React.createElement(SingleSelectionLabel, {
-    checked: false,
-    loading: loading,
-    onChange: onToggleOpen
-  }, children);
-};
+export const DisabledSelectionLabel = ({
+  children,
+  loading,
+  onToggleOpen
+}) => /*#__PURE__*/React.createElement(SingleSelectionLabel, {
+  checked: false,
+  loading: loading,
+  onChange: onToggleOpen
+}, children);
 DisabledSelectionLabel.propTypes = {
   children: PropTypes.any.isRequired,
   onToggleOpen: PropTypes.func.isRequired,

package/build/es/organisation-unit-node/label/icon-empty.js

@@ -1,28 +1,25 @@
 import _JSXStyle from "styled-jsx/style";
 import PropTypes from 'prop-types';
 import React from 'react';
-export const IconEmpty = _ref => {
-  let {
-    dataTest
-  } = _ref;
-  return /*#__PURE__*/React.createElement("svg", {
-    height: "18px",
-    version: "1.1",
-    viewBox: "0 0 18 18",
-    width: "18px",
-    "data-test": `${dataTest}-iconempty`,
-    className: "jsx-3201893673"
-  }, /*#__PURE__*/React.createElement("g", {
-    fill: "none",
-    fillRule: "evenodd",
-    id: "icon/empty",
-    stroke: "none",
-    strokeWidth: "1",
-    className: "jsx-3201893673"
-  }), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "3201893673"
-  }, ["svg.jsx-3201893673{display:block;margin:3px 0;}"]));
-};
+export const IconEmpty = ({
+  dataTest
+}) => /*#__PURE__*/React.createElement("svg", {
+  height: "18px",
+  version: "1.1",
+  viewBox: "0 0 18 18",
+  width: "18px",
+  "data-test": `${dataTest}-iconempty`,
+  className: "jsx-3201893673"
+}, /*#__PURE__*/React.createElement("g", {
+  fill: "none",
+  fillRule: "evenodd",
+  id: "icon/empty",
+  stroke: "none",
+  strokeWidth: "1",
+  className: "jsx-3201893673"
+}), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "3201893673"
+}, ["svg.jsx-3201893673{display:block;margin:3px 0;}"]));
 IconEmpty.propTypes = {
   dataTest: PropTypes.string.isRequired
 };