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

package/build/cjs/organisation-unit-tree/use-root-org-data/patch-missing-display-name.js

@@ -17,8 +17,7 @@ exports.patchMissingDisplayName = void 0;
  */
 const patchMissingDisplayName = nodes => {
   const nodeEntries = Object.entries(nodes);
-  const nodesWithDisplayName = nodeEntries.map(_ref => {
-    let [id, node] = _ref;
+  const nodesWithDisplayName = nodeEntries.map(([id, node]) => {
     const displayName = node.displayName || '';
     return [id, {
       ...node,

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

@@ -12,15 +12,12 @@ const createRootQuery = (ids, displayProperty) => ids.reduce((query, id) => ({
   [id]: {
     id,
     resource: `organisationUnits`,
-    params: _ref => {
-      let {
-        isUserDataViewFallback
-      } = _ref;
-      return {
-        isUserDataViewFallback,
-        fields: [displayProperty === 'displayName' ? 'displayName' : `${displayProperty}~rename(displayName)`, 'path', 'id']
-      };
-    }
+    params: ({
+      isUserDataViewFallback
+    }) => ({
+      isUserDataViewFallback,
+      fields: [displayProperty === 'displayName' ? 'displayName' : `${displayProperty}~rename(displayName)`, 'path', 'id']
+    })
   }
 }), {});
 
@@ -33,11 +30,10 @@ const createRootQuery = (ids, displayProperty) => ids.reduce((query, id) => ({
  * @returns {Object}
  */
 exports.createRootQuery = createRootQuery;
-const useRootOrgData = function (ids) {
-  let {
-    isUserDataViewFallback,
-    displayProperty = 'displayName'
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+const useRootOrgData = (ids, {
+  isUserDataViewFallback,
+  displayProperty = 'displayName'
+} = {}) => {
   const query = (0, _react.useMemo)(() => createRootQuery(ids, displayProperty), [ids, displayProperty]);
   const variables = {
     isUserDataViewFallback

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

@@ -8,10 +8,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 describe('OrganisationUnitTree - useRootOrgData', () => {
   // @TODO: Figure out why this is necessary at all...
   const origError = console.error;
-  jest.spyOn(console, 'error').mockImplementation(function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+  jest.spyOn(console, 'error').mockImplementation((...args) => {
     const [err] = args;
     if (!err.toString().match(/^Warning: An update to/)) {
       origError(...args);
@@ -21,10 +18,7 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
   // @TODO: This is kind of necessary; no idea if we can get rid of this
   const origWarn = console.warn;
   const dynamicQueryWarningMsg = "The query should be static, don't create it within the render loop!";
-  jest.spyOn(console, 'warn').mockImplementation(function () {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
-    }
+  jest.spyOn(console, 'warn').mockImplementation((...args) => {
     const [err] = args;
     if (!err.toString().match(dynamicQueryWarningMsg)) {
       origWarn(...args);
@@ -43,14 +37,11 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
       };
     })
   };
-  const wrapper = _ref => {
-    let {
-      children
-    } = _ref;
-    return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
-      data: dataProviderData
-    }, children);
-  };
+  const wrapper = ({
+    children
+  }) => /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+    data: dataProviderData
+  }, children);
   it('should respond with `loading: false`, `error: null` and `data: null` initially', () => {
     const {
       result
@@ -70,32 +61,30 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
     } = (0, _react.renderHook)(() => (0, _useRootOrgData.useRootOrgData)(['A0000000000']), {
       wrapper
     });
-    await (0, _react.waitFor)(() => {});
-    expect(result.current).toEqual(expect.objectContaining({
-      loading: false,
-      error: null,
-      data: {
-        A0000000000: {
-          id: 'A0000000000',
-          path: '/A0000000000',
-          displayName: 'Org Unit 1'
+    await (0, _react.waitFor)(() => {
+      expect(result.current).toEqual(expect.objectContaining({
+        loading: false,
+        error: null,
+        data: {
+          A0000000000: {
+            id: 'A0000000000',
+            path: '/A0000000000',
+            displayName: 'Org Unit 1'
+          }
         }
-      }
-    }));
+      }));
+    });
   });
   it('should provide the error', async () => {
-    const errorWrapper = _ref2 => {
-      let {
-        children
-      } = _ref2;
-      return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
-        data: {
-          organisationUnits: async () => {
-            throw new Error('Error message');
-          }
+    const errorWrapper = ({
+      children
+    }) => /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+      data: {
+        organisationUnits: async () => {
+          throw new Error('Error message');
         }
-      }, children);
-    };
+      }
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useRootOrgData.useRootOrgData)(['A0000000000']), {
@@ -145,14 +134,11 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
         };
       })
     };
-    const wrapperWithoutDisplayName = _ref3 => {
-      let {
-        children
-      } = _ref3;
-      return /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
-        data: dataProviderDataWithoutDisplayName
-      }, children);
-    };
+    const wrapperWithoutDisplayName = ({
+      children
+    }) => /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
+      data: dataProviderDataWithoutDisplayName
+    }, children);
     const {
       result
     } = (0, _react.renderHook)(() => (0, _useRootOrgData.useRootOrgData)(['A0000000000']), {

package/build/es/__e2e__/children_as_child_nodes.js

@@ -7,14 +7,11 @@ export default {
 };
 export const ClosedWithChildren = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    selected,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    selected: selected
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  selected,
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange,
+  selected: selected
+})));

package/build/es/__e2e__/common.js

@@ -7,11 +7,10 @@ export { getOrganisationUnitData } from './get-organisation-unit-data.js';
 export { namespace } from './namespace.js';
 export const delayResponse = (delay, response) => () => new Promise(resolve => setTimeout(() => resolve(response), delay));
 export const dataProviderData = {
-  organisationUnits: (_, _ref) => {
-    let {
-      id,
-      params = {}
-    } = _ref;
+  organisationUnits: (_, {
+    id,
+    params = {}
+  }) => {
     console.log('id, params', id, params);
     const data = getOrganisationUnitData(id, params);
     if (!data) {
@@ -20,18 +19,16 @@ export const dataProviderData = {
     return Promise.resolve(data);
   }
 };
-export const StatefulMultiSelectionWrapper = _ref2 => {
-  let {
-    children,
-    onSelectionChange = () => null
-  } = _ref2;
+export const StatefulMultiSelectionWrapper = ({
+  children,
+  onSelectionChange = () => null
+}) => {
   const [selected, setSelected] = useState([]);
   return children({
     selected,
-    onChange: _ref3 => {
-      let {
-        selected: newSelected
-      } = _ref3;
+    onChange: ({
+      selected: newSelected
+    }) => {
       setSelected(newSelected);
       onSelectionChange(newSelected);
     }
@@ -44,16 +41,13 @@ StatefulMultiSelectionWrapper.propTypes = {
 export const createDecoratorStatefulMultiSelection = args => {
   return Story => /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, {
     onSelectionChange: args === null || args === void 0 ? void 0 : args.onSelectionChange
-  }, _ref4 => {
-    let {
-      selected,
-      onChange
-    } = _ref4;
-    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) || dataProviderData;

package/build/es/__e2e__/controlled_expanded.js

@@ -7,18 +7,16 @@ window.orgUnitPathToExpand = '/A0000000000/A0000000001';
 export const Controlled = () => {
   const initiallyExpanded = getAllExpandedOrgUnitPaths(window.initiallyExpandedPaths);
   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/__e2e__/displaying_loading_error.js

@@ -3,10 +3,7 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData } from './common.js';
 const dataProviderDataWithError = {
-  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/__e2e__/expanded.js

@@ -2,40 +2,31 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { createDecoratorCustomDataProvider, createDecoratorStatefulMultiSelection } from './common.js';
 const decorators = [createDecoratorStatefulMultiSelection(), createDecoratorCustomDataProvider()];
-export const NoInitiallyExpandedPaths = (_, _ref) => {
-  let {
-    onChange,
-    selected
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    selected: selected,
-    onChange: onChange
-  });
-};
+export const NoInitiallyExpandedPaths = (_, {
+  onChange,
+  selected
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  selected: selected,
+  onChange: onChange
+});
 NoInitiallyExpandedPaths.decorators = decorators;
-export const InitiallyExpandedPaths = (_, _ref2) => {
-  let {
-    onChange,
-    selected
-  } = _ref2;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    selected: selected,
-    onChange: onChange,
-    initiallyExpanded: ['/A0000000000']
-  });
-};
+export const InitiallyExpandedPaths = (_, {
+  onChange,
+  selected
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  selected: selected,
+  onChange: onChange,
+  initiallyExpanded: ['/A0000000000']
+});
 InitiallyExpandedPaths.decorators = decorators;
-export const WithRootMainAndRootSubOrgUnit = (_, _ref3) => {
-  let {
-    onChange,
-    selected
-  } = _ref3;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: ['A0000000000', 'A0000000001'],
-    selected: selected,
-    onChange: onChange
-  });
-};
+export const WithRootMainAndRootSubOrgUnit = (_, {
+  onChange,
+  selected
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: ['A0000000000', 'A0000000001'],
+  selected: selected,
+  onChange: onChange
+});
 WithRootMainAndRootSubOrgUnit.decorators = decorators;

package/build/es/__e2e__/force_reload.js

@@ -3,10 +3,7 @@ import React, { useState } from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, delayResponse, namespace } from './common.js';
 const afterReloadData = {
-  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;
@@ -27,23 +24,20 @@ const ForceReloading_ = () => {
     disabled: forceReload,
     "data-test": "reload-all",
     onClick: () => setForceReload(true)
-  }, "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);
-        }
+  }, "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);
       }
-    });
-  }));
+    }
+  })));
 };
 export default {
   title: namespace

package/build/es/__e2e__/get-organisation-unit-data.js

@@ -1,33 +1,29 @@
-const createResponse = _ref => {
-  let {
-    fields,
-    id,
-    path,
-    displayName,
+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({

package/build/es/__e2e__/highlight.js

@@ -7,13 +7,10 @@ export default {
 };
 export const RootHighlighted = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    highlighted: ['/A0000000000']
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange,
+  highlighted: ['/A0000000000']
+})));

package/build/es/__e2e__/loading_state.js

@@ -3,10 +3,7 @@ import React from 'react';
 import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData, delayResponse } 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;
@@ -21,12 +18,9 @@ const data = {
 };
 export const A0000000001Loading = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: data
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange
+})));

package/build/es/__e2e__/multi_selection.js

@@ -7,14 +7,11 @@ export const MultipleSelection = () => /*#__PURE__*/React.createElement(CustomDa
   data: dataProviderData
 }, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, {
   onSelectionChange: newSelection => window.selection = newSelection
-}, _ref => {
-  let {
-    selected,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    selected: selected
-  });
-}));
+}, ({
+  selected,
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange,
+  selected: selected
+})));

package/build/es/__e2e__/no_selection.js

@@ -4,26 +4,20 @@ import { OrganisationUnitTree } from '../index.js';
 import { StatefulMultiSelectionWrapper, dataProviderData } from './common.js';
 export const NoSelectionClosed = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    disableSelection: true,
-    roots: "A0000000000",
-    onChange: onChange
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  disableSelection: true,
+  roots: "A0000000000",
+  onChange: onChange
+})));
 export const NoSelectionRootOpened = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref2 => {
-  let {
-    onChange
-  } = _ref2;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    disableSelection: true,
-    roots: "A0000000000",
-    onChange: onChange,
-    initiallyExpanded: ['/A0000000000']
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  disableSelection: true,
+  roots: "A0000000000",
+  onChange: onChange,
+  initiallyExpanded: ['/A0000000000']
+})));

package/build/es/__e2e__/path_based_filtering.js

@@ -8,27 +8,21 @@ for (let i = 0; i < 7; ++i) {
 }
 export const FilteredBy3LevelPath = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref => {
-  let {
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    initiallyExpanded: ['/A0000000000', '/A0000000000/A0000000001', '/A0000000000/A0000000002'],
-    filter: ['/A0000000000/A0000000001/A0000000003']
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange,
+  initiallyExpanded: ['/A0000000000', '/A0000000000/A0000000001', '/A0000000000/A0000000002'],
+  filter: ['/A0000000000/A0000000001/A0000000003']
+})));
 export const FilteredBy3LevelPathAnd2LevelPath = () => /*#__PURE__*/React.createElement(CustomDataProvider, {
   data: dataProviderData
-}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, _ref2 => {
-  let {
-    onChange
-  } = _ref2;
-  return /*#__PURE__*/React.createElement(OrganisationUnitTree, {
-    roots: "A0000000000",
-    onChange: onChange,
-    initiallyExpanded: ['/A0000000000', '/A0000000000/A0000000001', '/A0000000000/A0000000002'],
-    filter: ['/A0000000000/A0000000001/A0000000003', '/A0000000000/A0000000002']
-  });
-}));
+}, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
+  onChange
+}) => /*#__PURE__*/React.createElement(OrganisationUnitTree, {
+  roots: "A0000000000",
+  onChange: onChange,
+  initiallyExpanded: ['/A0000000000', '/A0000000000/A0000000001', '/A0000000000/A0000000002'],
+  filter: ['/A0000000000/A0000000001/A0000000003', '/A0000000000/A0000000002']
+})));