@dhis2-ui/organisation-unit-tree 8.2.0 → 8.2.1

package/build/cjs/organisation-unit-tree/use-root-org-data/use-root-org-unit.test.js

@@ -13,7 +13,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 describe('OrganisationUnitTree - useRootOrgData', () => {
   // @TODO: Figure out why this is necessary at all...
   const origError = console.error;
-  jest.spyOn(console, 'error').mockImplementation((...args) => {
+  jest.spyOn(console, 'error').mockImplementation(function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const [err] = args;
 
     if (!err.toString().match(/^Warning: An update to/)) {
@@ -23,7 +27,11 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
 
   const origWarn = console.warn;
   const dynamicQueryWarningMsg = "The query should be static, don't create it within the render loop!";
-  jest.spyOn(console, 'warn').mockImplementation((...args) => {
+  jest.spyOn(console, 'warn').mockImplementation(function () {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+
     const [err] = args;
 
     if (!err.toString().match(dynamicQueryWarningMsg)) {
@@ -44,11 +52,14 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
     })
   };
 
-  const wrapper = ({
-    children
-  }) => /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
-    data: dataProviderData
-  }, children);
+  const wrapper = _ref => {
+    let {
+      children
+    } = _ref;
+    return /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
+      data: dataProviderData
+    }, children);
+  };
 
   it('should respond with `loading: false`, `error: null` and `data: null` initially', () => {
     const {
@@ -84,15 +95,18 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
     }));
   });
   it('should provide the error', async () => {
-    const errorWrapper = ({
-      children
-    }) => /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
-      data: {
-        organisationUnits: async () => {
-          throw new Error('Error message');
+    const errorWrapper = _ref2 => {
+      let {
+        children
+      } = _ref2;
+      return /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
+        data: {
+          organisationUnits: async () => {
+            throw new Error('Error message');
+          }
         }
-      }
-    }, children);
+      }, children);
+    };
 
     const {
       result,
@@ -148,11 +162,14 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
       })
     };
 
-    const wrapperWithoutDisplayName = ({
-      children
-    }) => /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
-      data: dataProviderDataWithoutDisplayName
-    }, children);
+    const wrapperWithoutDisplayName = _ref3 => {
+      let {
+        children
+      } = _ref3;
+      return /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
+        data: dataProviderDataWithoutDisplayName
+      }, children);
+    };
 
     const {
       result,

package/build/cjs/organisation-unit-tree.stories.js

@@ -30,28 +30,28 @@ Object.defineProperty(exports, "Collapsed", {
     return _collapsed.Collapsed;
   }
 });
-Object.defineProperty(exports, "Expanded", {
+Object.defineProperty(exports, "CustomExpandedImperativeOpen", {
   enumerable: true,
   get: function () {
-    return _expanded.Expanded;
+    return _customExpandedImperativeOpen.CustomExpandedImperativeOpen;
   }
 });
-Object.defineProperty(exports, "CustomExpandedImperativeOpen", {
+Object.defineProperty(exports, "CustomNodeLabel", {
   enumerable: true,
   get: function () {
-    return _customExpandedImperativeOpen.CustomExpandedImperativeOpen;
+    return _customNodeLabel.CustomNodeLabel;
   }
 });
-Object.defineProperty(exports, "MultipleRoots", {
+Object.defineProperty(exports, "Expanded", {
   enumerable: true,
   get: function () {
-    return _multipleRoots.MultipleRoots;
+    return _expanded.Expanded;
   }
 });
-Object.defineProperty(exports, "CustomNodeLabel", {
+Object.defineProperty(exports, "Filtered", {
   enumerable: true,
   get: function () {
-    return _customNodeLabel.CustomNodeLabel;
+    return _filtered.Filtered;
   }
 });
 Object.defineProperty(exports, "FilteredRoot", {
@@ -60,52 +60,52 @@ Object.defineProperty(exports, "FilteredRoot", {
     return _filteredRoot.FilteredRoot;
   }
 });
-Object.defineProperty(exports, "Filtered", {
+Object.defineProperty(exports, "ForceReloadAll", {
   enumerable: true,
   get: function () {
-    return _filtered.Filtered;
+    return _forceReloadAll.ForceReloadAll;
   }
 });
-Object.defineProperty(exports, "SelectedMultiple", {
+Object.defineProperty(exports, "ForceReloadOneUnit", {
   enumerable: true,
   get: function () {
-    return _selectedMultiple.SelectedMultiple;
+    return _forceReloadOneUnit.ForceReloadOneUnit;
   }
 });
-Object.defineProperty(exports, "Indeterminate", {
+Object.defineProperty(exports, "Highlighted", {
   enumerable: true,
   get: function () {
-    return _indeterminate.Indeterminate;
+    return _highlighted.Highlighted;
   }
 });
-Object.defineProperty(exports, "SingleSelection", {
+Object.defineProperty(exports, "Indeterminate", {
   enumerable: true,
   get: function () {
-    return _singleSelection.SingleSelection;
+    return _indeterminate.Indeterminate;
   }
 });
-Object.defineProperty(exports, "NoSelection", {
+Object.defineProperty(exports, "Loading", {
   enumerable: true,
   get: function () {
-    return _noSelection.NoSelection;
+    return _loading.Loading;
   }
 });
-Object.defineProperty(exports, "Highlighted", {
+Object.defineProperty(exports, "LoadingErrorGrandchild", {
   enumerable: true,
   get: function () {
-    return _highlighted.Highlighted;
+    return _loadingErrorGrandchild.LoadingErrorGrandchild;
   }
 });
-Object.defineProperty(exports, "ForceReloadAll", {
+Object.defineProperty(exports, "MultipleRoots", {
   enumerable: true,
   get: function () {
-    return _forceReloadAll.ForceReloadAll;
+    return _multipleRoots.MultipleRoots;
   }
 });
-Object.defineProperty(exports, "ForceReloadOneUnit", {
+Object.defineProperty(exports, "NoSelection", {
   enumerable: true,
   get: function () {
-    return _forceReloadOneUnit.ForceReloadOneUnit;
+    return _noSelection.NoSelection;
   }
 });
 Object.defineProperty(exports, "ReplaceRoots", {
@@ -114,10 +114,10 @@ Object.defineProperty(exports, "ReplaceRoots", {
     return _replaceRoots.ReplaceRoots;
   }
 });
-Object.defineProperty(exports, "Loading", {
+Object.defineProperty(exports, "RootError", {
   enumerable: true,
   get: function () {
-    return _loading.Loading;
+    return _rootError.RootError;
   }
 });
 Object.defineProperty(exports, "RootLoading", {
@@ -126,16 +126,16 @@ Object.defineProperty(exports, "RootLoading", {
     return _rootLoading.RootLoading;
   }
 });
-Object.defineProperty(exports, "RootError", {
+Object.defineProperty(exports, "SelectedMultiple", {
   enumerable: true,
   get: function () {
-    return _rootError.RootError;
+    return _selectedMultiple.SelectedMultiple;
   }
 });
-Object.defineProperty(exports, "LoadingErrorGrandchild", {
+Object.defineProperty(exports, "SingleSelection", {
   enumerable: true,
   get: function () {
-    return _loadingErrorGrandchild.LoadingErrorGrandchild;
+    return _singleSelection.SingleSelection;
   }
 });
 exports.default = void 0;
@@ -203,34 +203,9 @@ Object.keys(_developmentStories).forEach(function (key) {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const subtitle = 'Display, manipulate and select organization units displayed in a hierarchical tree';
-const description = `
-This is a complex, controlled component. It needs access to an App Runtime data provider to fetch org unit data.
-
-Several props require arrays of org. unit paths (referred to as \`orgUnitPathPropType[]\` in the table below). Take a look at the \`initiallyExpanded\` and \`filter\` props in the example to see an example of the paths format.
-
-Example:
-
-\`\`\`js
-import { OrganisationUnitTree } from '@dhis2/ui'
-
-const orgUnitTree = (
-    <OrganisationUnitTree
-        name="Root org unit"
-        roots="A0000000000"
-        onChange={onChange}
-        onExpand={onExpand}
-        onCollapse={onCollapse}
-        onChildrenLoaded={onChildrenLoaded}
-        // Notice the format of the org unit paths
-        initiallyExpanded={['/A0000000000/A0000000001']}
-        filter={['/A0000000000/A0000000001/A0000000003']}
-    />
-)
-\`\`\`
-
-`;
+const description = "\nThis is a complex, controlled component. It needs access to an App Runtime data provider to fetch org unit data.\n\nSeveral props require arrays of org. unit paths (referred to as `orgUnitPathPropType[]` in the table below). Take a look at the `initiallyExpanded` and `filter` props in the example to see an example of the paths format.\n\nExample:\n\n```js\nimport { OrganisationUnitTree } from '@dhis2/ui'\n\nconst orgUnitTree = (\n    <OrganisationUnitTree\n        name=\"Root org unit\"\n        roots=\"A0000000000\"\n        onChange={onChange}\n        onExpand={onExpand}\n        onCollapse={onCollapse}\n        onChildrenLoaded={onChildrenLoaded}\n        // Notice the format of the org unit paths\n        initiallyExpanded={['/A0000000000/A0000000001']}\n        filter={['/A0000000000/A0000000001/A0000000003']}\n    />\n)\n```\n\n";
 var _default = {
-  title: 'Forms/Organisation Unit Tree',
+  title: 'Organisation Unit Tree',
   component: _index.OrganisationUnitTree,
   decorators: [fn => /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
     data: _shared.customData

package/build/cjs/prop-types.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.orgUnitIdPropType = exports.orgUnitPathPropType = void 0;
+exports.orgUnitPathPropType = exports.orgUnitIdPropType = void 0;
 
 /* eslint-disable max-params */
 const UNIT_ID_PATTERN = '[a-zA-Z][a-zA-Z0-9]{10}';
-const orgUnitIdRegExp = new RegExp(`^${UNIT_ID_PATTERN}$`);
-const orgUnitPathRegExp = new RegExp(`(/${UNIT_ID_PATTERN})+`);
+const orgUnitIdRegExp = new RegExp("^".concat(UNIT_ID_PATTERN, "$"));
+const orgUnitPathRegExp = new RegExp("(/".concat(UNIT_ID_PATTERN, ")+"));
 
 const orgUnitPathPropType = (propValue, key, compName, location, propFullName) => {
   if (!orgUnitPathRegExp.test(propValue[key])) {
-    return new Error(`Invalid org unit path \`${propValue[key]}\` supplied to \`${compName}.${propFullName}\``);
+    return new Error("Invalid org unit path `".concat(propValue[key], "` supplied to `").concat(compName, ".").concat(propFullName, "`"));
   }
 };
 
@@ -20,7 +20,7 @@ exports.orgUnitPathPropType = orgUnitPathPropType;
 
 const orgUnitIdPropType = (propValue, key, compName, location, propFullName) => {
   if (!orgUnitIdRegExp.test(propValue[key])) {
-    return new Error(`Invalid org unit id \`${propValue[key]}\` supplied to \`${compName}.${propFullName}\``);
+    return new Error("Invalid org unit id `".concat(propValue[key], "` supplied to `").concat(compName, ".").concat(propFullName, "`"));
   }
 };
 

package/build/es/__e2e__/children_as_child_nodes.stories.e2e.js

@@ -5,11 +5,14 @@ import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, namespace } from './common.js';
 storiesOf(namespace, module).add('Closed with children', () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
-  selected,
-  onChange
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: "A0000000000",
-  onChange: onChange,
-  selected: selected
-}))));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
+  let {
+    selected,
+    onChange
+  } = _ref;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: "A0000000000",
+    onChange: onChange,
+    selected: selected
+  });
+})));

package/build/es/__e2e__/common.js

@@ -5,32 +5,36 @@ import React, { useState } from 'react';
 export const namespace = 'OrganisationUnitTree';
 export const delayResponse = (delay, response) => () => new Promise(resolve => setTimeout(() => resolve(response), delay));
 
-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]') ? {
+const createResponse = _ref => {
+  let {
+    fields,
+    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, {
-  fields
-}) => {
+export const getOrganisationUnitData = (id, _ref2) => {
+  let {
+    fields
+  } = _ref2;
   let data;
 
   if (id === 'A0000000000') {
@@ -133,10 +137,11 @@ export const getOrganisationUnitData = (id, {
   return data;
 };
 export const dataProviderData = {
-  organisationUnits: (_, {
-    id,
-    params = {}
-  }) => {
+  organisationUnits: (_, _ref3) => {
+    let {
+      id,
+      params = {}
+    } = _ref3;
     console.log('id, params', id, params);
     const data = getOrganisationUnitData(id, params);
 
@@ -147,16 +152,18 @@ export const dataProviderData = {
     return Promise.resolve(data);
   }
 };
-export const StatefulMultiSelectionWrapper = ({
-  children,
-  onSelectionChange = () => null
-}) => {
+export const StatefulMultiSelectionWrapper = _ref4 => {
+  let {
+    children,
+    onSelectionChange = () => null
+  } = _ref4;
   const [selected, setSelected] = useState([]);
   return children({
     selected,
-    onChange: ({
-      selected: newSelected
-    }) => {
+    onChange: _ref5 => {
+      let {
+        selected: newSelected
+      } = _ref5;
       setSelected(newSelected);
       onSelectionChange(newSelected);
     }
@@ -169,13 +176,16 @@ StatefulMultiSelectionWrapper.propTypes = {
 export const createDecoratorStatefulMultiSelection = args => {
   return Story => /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, {
     onSelectionChange: args === null || args === void 0 ? void 0 : args.onSelectionChange
-  }, ({
-    selected,
-    onChange
-  }) => /*#__PURE__*/React.createElement(Story, {
-    selected: selected,
-    onChange: onChange
-  }));
+  }, _ref6 => {
+    let {
+      selected,
+      onChange
+    } = _ref6;
+    return /*#__PURE__*/React.createElement(Story, {
+      selected: selected,
+      onChange: onChange
+    });
+  });
 };
 export const createDecoratorCustomDataProvider = args => {
   const data = (args === null || args === void 0 ? void 0 : args.data) || dataProviderData;

package/build/es/__e2e__/controlled_expanded.stories.e2e.js

@@ -12,17 +12,20 @@ export const Controlled = () => {
   const initiallyExpanded = getAllExpandedOrgUnitPaths(window.initiallyExpandedPaths);
   const [expanded, setExpanded] = useState(initiallyExpanded);
 
-  const handleExpand = ({
-    path
-  }) => {
+  const handleExpand = _ref => {
+    let {
+      path
+    } = _ref;
+
     if (!expanded.includes(path)) {
       setExpanded([...expanded, path]);
     }
   };
 
-  const handleCollapse = ({
-    path
-  }) => {
+  const handleCollapse = _ref2 => {
+    let {
+      path
+    } = _ref2;
     const pathIndex = expanded.indexOf(path);
 
     if (pathIndex !== -1) {

package/build/es/__e2e__/displaying_loading_error.stories.e2e.js

@@ -4,7 +4,11 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, namespace } from './common.js';
 const dataProviderDataWithError = {
-  organisationUnits: (...args) => {
+  organisationUnits: function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const [, {
       id
     }] = args;

package/build/es/__e2e__/expanded.stories.e2e.js

@@ -5,28 +5,37 @@ export default {
   title: 'OrganisationUnitTree/expanded',
   decorators: [createDecoratorStatefulMultiSelection(), createDecoratorCustomDataProvider()]
 };
-export const NoInitiallyExpandedPaths = (_, {
-  onChange,
-  selected
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: "A0000000000",
-  selected: selected,
-  onChange: onChange
-});
-export const InitiallyExpandedPaths = (_, {
-  onChange,
-  selected
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: "A0000000000",
-  selected: selected,
-  onChange: onChange,
-  initiallyExpanded: ['/A0000000000']
-});
-export const WithRootMainAndRootSubOrgUnit = (_, {
-  onChange,
-  selected
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: ['A0000000000', 'A0000000001'],
-  selected: selected,
-  onChange: onChange
-});
+export const NoInitiallyExpandedPaths = (_, _ref) => {
+  let {
+    onChange,
+    selected
+  } = _ref;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: "A0000000000",
+    selected: selected,
+    onChange: onChange
+  });
+};
+export const InitiallyExpandedPaths = (_, _ref2) => {
+  let {
+    onChange,
+    selected
+  } = _ref2;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: "A0000000000",
+    selected: selected,
+    onChange: onChange,
+    initiallyExpanded: ['/A0000000000']
+  });
+};
+export const WithRootMainAndRootSubOrgUnit = (_, _ref3) => {
+  let {
+    onChange,
+    selected
+  } = _ref3;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: ['A0000000000', 'A0000000001'],
+    selected: selected,
+    onChange: onChange
+  });
+};

package/build/es/__e2e__/force_reload.stories.e2e.js

@@ -4,7 +4,11 @@ import React, { useState } from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, delayResponse, namespace } from './common.js';
 const afterReloadData = {
-  organisationUnits: (...args) => {
+  organisationUnits: function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const [, {
       id
     }] = args;
@@ -29,20 +33,23 @@ const ForceReloading = () => {
     disabled: forceReload,
     "data-test": "reload-all",
     onClick: () => setForceReload(true)
-  }, "Force reload tree"), /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
-    selected,
-    onChange
-  }) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    selected: selected,
-    forceReload: forceReload,
-    onChildrenLoaded: data => {
-      if (data.A0000000000) {
-        setForceReload(false);
+  }, "Force reload tree"), /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
+    let {
+      selected,
+      onChange
+    } = _ref;
+    return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+      roots: "A0000000000",
+      onChange: onChange,
+      selected: selected,
+      forceReload: forceReload,
+      onChildrenLoaded: data => {
+        if (data.A0000000000) {
+          setForceReload(false);
+        }
       }
-    }
-  })));
+    });
+  }));
 };
 
 storiesOf(namespace, module).add('Force reloading', () => /*#__PURE__*/React.createElement(ForceReloading, null));

package/build/es/__e2e__/highlight.stories.e2e.js

@@ -5,10 +5,13 @@ import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, namespace } from './common.js';
 storiesOf(namespace, module).add('Root highlighted', () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
-  onChange
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: "A0000000000",
-  onChange: onChange,
-  highlighted: ['/A0000000000']
-}))));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
+  let {
+    onChange
+  } = _ref;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: "A0000000000",
+    onChange: onChange,
+    highlighted: ['/A0000000000']
+  });
+})));

package/build/es/__e2e__/loading_state.stories.e2e.js

@@ -4,7 +4,11 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, delayResponse, namespace } from './common.js';
 const data = {
-  organisationUnits: (...args) => {
+  organisationUnits: function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const [, {
       id
     }] = args;
@@ -22,9 +26,12 @@ const data = {
 };
 storiesOf(namespace, module).add('A0000000001 loading', () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: data
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
-  onChange
-}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-  roots: "A0000000000",
-  onChange: onChange
-}))));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
+  let {
+    onChange
+  } = _ref;
+  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+    roots: "A0000000000",
+    onChange: onChange
+  });
+})));