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

package/build/es/organisation-unit-node/label/iconized-checkbox.js

@@ -3,19 +3,18 @@ import { Checkbox } from '@dhis2-ui/checkbox';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Icon } from './icon.js';
-export const IconizedCheckbox = _ref => {
-  let {
-    checked,
-    dataTest,
-    hasChildren,
-    indeterminate,
-    children,
-    loading,
-    name,
-    open,
-    value,
-    onChange
-  } = _ref;
+export const IconizedCheckbox = ({
+  checked,
+  dataTest,
+  hasChildren,
+  indeterminate,
+  children,
+  loading,
+  name,
+  open,
+  value,
+  onChange
+}) => {
   const icon = /*#__PURE__*/React.createElement(Icon, {
     loading: loading,
     open: open,

package/build/es/organisation-unit-node/label/label-container.js

@@ -10,22 +10,19 @@ import React from 'react';
  * @param {React.Component|React.Component[]} props.children
  * @returns {React.Component}
  */
-export const LabelContainer = _ref => {
-  let {
-    highlighted,
-    children
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    className: _JSXStyle.dynamic([["1387769986", [colors.teal200]]]) + " " + (cx({
-      highlighted
-    }) || "")
-  }, /*#__PURE__*/React.createElement("span", {
-    className: _JSXStyle.dynamic([["1387769986", [colors.teal200]]])
-  }, children), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "1387769986",
-    dynamic: [colors.teal200]
-  }, ["div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}", "span.__jsx-style-dynamic-selector{display:block;}", `.highlighted.__jsx-style-dynamic-selector{background:${colors.teal200};padding-inline-end:4px;}`]));
-};
+export const LabelContainer = ({
+  highlighted,
+  children
+}) => /*#__PURE__*/React.createElement("div", {
+  className: _JSXStyle.dynamic([["1387769986", [colors.teal200]]]) + " " + (cx({
+    highlighted
+  }) || "")
+}, /*#__PURE__*/React.createElement("span", {
+  className: _JSXStyle.dynamic([["1387769986", [colors.teal200]]])
+}, children), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "1387769986",
+  dynamic: [colors.teal200]
+}, ["div.__jsx-style-dynamic-selector{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}", "span.__jsx-style-dynamic-selector{display:block;}", `.highlighted.__jsx-style-dynamic-selector{background:${colors.teal200};padding-inline-end:4px;}`]));
 LabelContainer.propTypes = {
   children: PropTypes.node,
   highlighted: PropTypes.bool

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

@@ -5,13 +5,12 @@ import { DisabledSelectionLabel } from './disabled-selection-label.js';
 import { IconizedCheckbox } from './iconized-checkbox.js';
 import { LabelContainer } from './label-container.js';
 import { SingleSelectionLabel } from './single-selection-label.js';
-const createNewSelected = _ref => {
-  let {
-    selected,
-    path,
-    checked,
-    singleSelection
-  } = _ref;
+const createNewSelected = ({
+  selected,
+  path,
+  checked,
+  singleSelection
+}) => {
   const pathIndex = selected.indexOf(path);
   if (checked && pathIndex !== -1) {
     return selected;
@@ -35,29 +34,27 @@ const createNewSelected = _ref => {
   const nextSlice = selected.slice(pathIndex + 1);
   return [...prevSlice, ...nextSlice];
 };
-const Label = _ref2 => {
-  let {
-    checked,
-    children,
-    dataTest,
-    disableSelection,
-    fullPath,
-    hasChildren,
-    hasSelectedDescendants,
-    highlighted,
-    loading,
-    node,
-    onChange,
-    onToggleOpen,
-    open,
-    rootId,
-    selected,
-    singleSelection
-  } = _ref2;
-  const onClick = (_ref3, event) => {
-    let {
-      checked
-    } = _ref3;
+const Label = ({
+  checked,
+  children,
+  dataTest,
+  disableSelection,
+  fullPath,
+  hasChildren,
+  hasSelectedDescendants,
+  highlighted,
+  loading,
+  node,
+  onChange,
+  onToggleOpen,
+  open,
+  rootId,
+  selected,
+  singleSelection
+}) => {
+  const onClick = ({
+    checked
+  }, event) => {
     const newSelected = createNewSelected({
       path: fullPath,
       selected,

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

@@ -12,29 +12,26 @@ import React from 'react';
  * @param {Function} [props.onChange]
  * @returns {React.Component}
  */
-export const SingleSelectionLabel = _ref => {
-  let {
+export const SingleSelectionLabel = ({
+  checked,
+  children,
+  onChange,
+  loading
+}) => /*#__PURE__*/React.createElement("span", {
+  onClick: event => {
+    const payload = {
+      checked: !checked
+    };
+    onChange(payload, event);
+  },
+  className: _JSXStyle.dynamic([["321503310", [colors.grey900, colors.teal700]]]) + " " + (cx({
     checked,
-    children,
-    onChange,
     loading
-  } = _ref;
-  return /*#__PURE__*/React.createElement("span", {
-    onClick: event => {
-      const payload = {
-        checked: !checked
-      };
-      onChange(payload, event);
-    },
-    className: _JSXStyle.dynamic([["321503310", [colors.grey900, colors.teal700]]]) + " " + (cx({
-      checked,
-      loading
-    }) || "")
-  }, children, /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "321503310",
-    dynamic: [colors.grey900, colors.teal700]
-  }, [`span.__jsx-style-dynamic-selector{background:transparent;border-radius:3px;color:${colors.grey900};cursor:pointer;display:inline-block;font-size:14px;line-height:24px;padding:0 5px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;white-space:nowrap;}`, `.checked.__jsx-style-dynamic-selector{background:${colors.teal700};color:white;}`, ".loading.__jsx-style-dynamic-selector{cursor:auto;}"]));
-};
+  }) || "")
+}, children, /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "321503310",
+  dynamic: [colors.grey900, colors.teal700]
+}, [`span.__jsx-style-dynamic-selector{background:transparent;border-radius:3px;color:${colors.grey900};cursor:pointer;display:inline-block;font-size:14px;line-height:24px;padding:0 5px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;white-space:nowrap;}`, `.checked.__jsx-style-dynamic-selector{background:${colors.teal700};color:white;}`, ".loading.__jsx-style-dynamic-selector{cursor:auto;}"]));
 SingleSelectionLabel.propTypes = {
   children: PropTypes.any.isRequired,
   checked: PropTypes.bool,

package/build/es/organisation-unit-node/organisation-unit-node-children.js

@@ -5,12 +5,11 @@ import i18n from '../locales/index.js';
 import { orgUnitPathPropType } from '../prop-types.js';
 import { LoadingSpinner } from './loading-spinner.js';
 import { useOrgChildren } from './use-org-children.js';
-const getFilteredChildren = _ref => {
-  let {
-    orgChildren,
-    filter,
-    node
-  } = _ref;
+const getFilteredChildren = ({
+  orgChildren,
+  filter,
+  node
+}) => {
   if (!(filter !== null && filter !== void 0 && filter.length)) {
     return orgChildren;
   }
@@ -18,29 +17,28 @@ const getFilteredChildren = _ref => {
     return isPathIncluded(filter, `${node.path}/${child.id}`);
   });
 };
-export const OrganisationUnitNodeChildren = _ref2 => {
-  let {
-    node,
-    autoExpandLoadingError,
-    dataTest,
-    disableSelection,
-    displayProperty,
-    expanded,
-    filter,
-    highlighted,
-    isUserDataViewFallback,
-    onChange,
-    onChildrenLoaded,
-    onCollapse,
-    onExpand,
-    parentPath,
-    renderNodeLabel,
-    rootId,
-    selected,
-    singleSelection,
-    suppressAlphabeticalSorting,
-    OrganisationUnitNode
-  } = _ref2;
+export const OrganisationUnitNodeChildren = ({
+  node,
+  autoExpandLoadingError,
+  dataTest,
+  disableSelection,
+  displayProperty,
+  expanded,
+  filter,
+  highlighted,
+  isUserDataViewFallback,
+  onChange,
+  onChildrenLoaded,
+  onCollapse,
+  onExpand,
+  parentPath,
+  renderNodeLabel,
+  rootId,
+  selected,
+  singleSelection,
+  suppressAlphabeticalSorting,
+  OrganisationUnitNode
+}) => {
   const orgChildren = useOrgChildren({
     node,
     isUserDataViewFallback,

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

@@ -11,29 +11,28 @@ import { LoadingSpinner } from './loading-spinner.js';
 import { OrganisationUnitNodeChildren } from './organisation-unit-node-children.js';
 import { useOpenState } from './use-open-state.js';
 import { useOrgData } from './use-org-data/index.js';
-export const OrganisationUnitNode = _ref => {
-  let {
-    autoExpandLoadingError,
-    dataTest,
-    disableSelection,
-    displayName,
-    displayProperty,
-    expanded,
-    highlighted,
-    id,
-    isUserDataViewFallback,
-    path,
-    renderNodeLabel,
-    rootId,
-    selected,
-    singleSelection,
-    filter,
-    suppressAlphabeticalSorting,
-    onChange,
-    onChildrenLoaded,
-    onCollapse,
-    onExpand
-  } = _ref;
+export const OrganisationUnitNode = ({
+  autoExpandLoadingError,
+  dataTest,
+  disableSelection,
+  displayName,
+  displayProperty,
+  expanded,
+  highlighted,
+  id,
+  isUserDataViewFallback,
+  path,
+  renderNodeLabel,
+  rootId,
+  selected,
+  singleSelection,
+  filter,
+  suppressAlphabeticalSorting,
+  onChange,
+  onChildrenLoaded,
+  onCollapse,
+  onExpand
+}) => {
   const orgData = useOrgData(id, {
     isUserDataViewFallback,
     displayName

package/build/es/organisation-unit-node/use-open-state.js

@@ -10,15 +10,14 @@ import { useEffect, useState } from 'react';
  * @param {Function} [args.onCollapse]
  * @returns {Object}
  */
-export const useOpenState = _ref => {
-  let {
-    path,
-    expanded,
-    onExpand,
-    onCollapse,
-    errorMessage,
-    autoExpandLoadingError
-  } = _ref;
+export const useOpenState = ({
+  path,
+  expanded,
+  onExpand,
+  onCollapse,
+  errorMessage,
+  autoExpandLoadingError
+}) => {
   const autoExpand = autoExpandLoadingError && !!errorMessage;
   const [openedOnceDueToError, setOpenedOnce] = useState(!!errorMessage);
   useEffect(() => {

package/build/es/organisation-unit-node/use-org-children.js

@@ -4,20 +4,14 @@ import { sortNodeChildrenAlphabetically } from '../helpers/index.js';
 const ORG_DATA_QUERY = {
   orgUnit: {
     resource: `organisationUnits`,
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        displayProperty
-      } = _ref2;
-      return {
-        fields: displayProperty === 'displayName' ? 'children[id,path,displayName]' : `children[id,path,${displayProperty}~rename(displayName)]`
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      displayProperty
+    }) => ({
+      fields: displayProperty === 'displayName' ? 'children[id,path,displayName]' : `children[id,path,${displayProperty}~rename(displayName)]`
+    })
   }
 };
 
@@ -29,13 +23,12 @@ const ORG_DATA_QUERY = {
  * @param {'displayName'|'displayShortName'} [options.displayProperty]
  * @returns {Object}
  */
-export const useOrgChildren = _ref3 => {
-  let {
-    node,
-    suppressAlphabeticalSorting,
-    onComplete,
-    displayProperty = 'displayName'
-  } = _ref3;
+export const useOrgChildren = ({
+  node,
+  suppressAlphabeticalSorting,
+  onComplete,
+  displayProperty = 'displayName'
+}) => {
   const onCompleteCalledRef = useRef(false);
   const {
     called,

package/build/es/organisation-unit-node/use-org-children.test.js

@@ -4,10 +4,9 @@ import React from 'react';
 import { useOrgChildren } from './use-org-children.js';
 describe('OrganisationUnitTree - useOrgChildren', () => {
   const dataProviderData = {
-    organisationUnits: jest.fn((type, _ref) => {
-      let {
-        id
-      } = _ref;
+    organisationUnits: jest.fn((type, {
+      id
+    }) => {
       if (id === 'A0000000000') {
         return {
           children: [{
@@ -21,14 +20,11 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
       return Promise.reject(`No org unit with id "${id}"`);
     })
   };
-  const wrapper = _ref2 => {
-    let {
-      children
-    } = _ref2;
-    return /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: dataProviderData
-    }, children);
-  };
+  const wrapper = ({
+    children
+  }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+    data: dataProviderData
+  }, children);
   const node = {
     id: 'A0000000000',
     path: '/A0000000000',
@@ -78,18 +74,15 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
     });
   });
   it('should provide the error', async () => {
-    const errorWrapper = _ref3 => {
-      let {
-        children
-      } = _ref3;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: {
-          organisationUnits: async () => {
-            throw new Error('Error message');
-          }
+    const errorWrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: {
+        organisationUnits: async () => {
+          throw new Error('Error message');
         }
-      }, children);
-    };
+      }
+    }, children);
     const {
       result
     } = renderHook(() => useOrgChildren({
@@ -131,10 +124,9 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
   });
   it("should sort the node's children alphabetically by default", async () => {
     const dataProviderDataWithUnsortedChildren = {
-      organisationUnits: jest.fn((type, _ref4) => {
-        let {
-          id
-        } = _ref4;
+      organisationUnits: jest.fn((type, {
+        id
+      }) => {
         if (id === 'A0000000000') {
           return {
             children: [{
@@ -153,14 +145,11 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
         return Promise.reject(`No org unit with id "${id}"`);
       })
     };
-    const wrapperWithUnsortedChildren = _ref5 => {
-      let {
-        children
-      } = _ref5;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: dataProviderDataWithUnsortedChildren
-      }, children);
-    };
+    const wrapperWithUnsortedChildren = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: dataProviderDataWithUnsortedChildren
+    }, children);
     const {
       result
     } = renderHook(() => useOrgChildren({
@@ -192,10 +181,9 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
   });
   it(`should not sort the node's children alphabetically when "suppressAlphabeticalSorting" is true`, async () => {
     const dataProviderDataWithUnsortedChildren = {
-      organisationUnits: jest.fn((type, _ref6) => {
-        let {
-          id
-        } = _ref6;
+      organisationUnits: jest.fn((type, {
+        id
+      }) => {
         if (id === 'A0000000000') {
           return {
             children: [{
@@ -214,14 +202,11 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
         return Promise.reject(`No org unit with id "${id}"`);
       })
     };
-    const wrapperWithUnsortedChildren = _ref7 => {
-      let {
-        children
-      } = _ref7;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: dataProviderDataWithUnsortedChildren
-      }, children);
-    };
+    const wrapperWithUnsortedChildren = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: dataProviderDataWithUnsortedChildren
+    }, children);
     const options = {
       node: {
         ...node,
@@ -255,10 +240,9 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
   });
   it(`should not sort the node's children alphabetically when "suppressAlphabeticalSorting" is true`, async () => {
     const dataProviderDataWithUnsortedChildren = {
-      organisationUnits: jest.fn((type, _ref8) => {
-        let {
-          id
-        } = _ref8;
+      organisationUnits: jest.fn((type, {
+        id
+      }) => {
         if (id === 'A0000000000') {
           return {
             children: [{
@@ -277,14 +261,11 @@ describe('OrganisationUnitTree - useOrgChildren', () => {
         return Promise.reject(`No org unit with id "${id}"`);
       })
     };
-    const wrapperWithUnsortedChildren = _ref9 => {
-      let {
-        children
-      } = _ref9;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: dataProviderDataWithUnsortedChildren
-      }, children);
-    };
+    const wrapperWithUnsortedChildren = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: dataProviderDataWithUnsortedChildren
+    }, children);
     const options = {
       node: {
         ...node,

package/build/es/organisation-unit-node/use-org-data/use-org-data.js

@@ -2,21 +2,15 @@ import { useDataQuery } from '@dhis2/app-runtime';
 const ORG_DATA_QUERY = {
   orgUnit: {
     resource: `organisationUnits`,
-    id: _ref => {
-      let {
-        id
-      } = _ref;
-      return id;
-    },
-    params: _ref2 => {
-      let {
-        isUserDataViewFallback
-      } = _ref2;
-      return {
-        isUserDataViewFallback,
-        fields: ['path', 'children::size']
-      };
-    }
+    id: ({
+      id
+    }) => id,
+    params: ({
+      isUserDataViewFallback
+    }) => ({
+      isUserDataViewFallback,
+      fields: ['path', 'children::size']
+    })
   }
 };
 
@@ -27,11 +21,10 @@ const ORG_DATA_QUERY = {
  * @param {bool} options.isUserDataViewFallback
  * @returns {Object}
  */
-export const useOrgData = (id, _ref3) => {
-  let {
-    displayName,
-    isUserDataViewFallback
-  } = _ref3;
+export const useOrgData = (id, {
+  displayName,
+  isUserDataViewFallback
+}) => {
   if (!displayName) {
     throw new Error('"displayName" is required');
   }

package/build/es/organisation-unit-node/use-org-data/use-org-data.test.js

@@ -5,10 +5,7 @@ import { useOrgData } from './use-org-data.js';
 describe('OrganisationUnitTree - useOrgData', () => {
   // @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);
@@ -18,10 +15,9 @@ describe('OrganisationUnitTree - useOrgData', () => {
     console.error.mockRestore();
   });
   const dataProviderData = {
-    organisationUnits: jest.fn((type, _ref) => {
-      let {
-        id
-      } = _ref;
+    organisationUnits: jest.fn((type, {
+      id
+    }) => {
       if (id === 'A0000000000') {
         return {
           id: 'A0000000000',
@@ -32,14 +28,11 @@ describe('OrganisationUnitTree - useOrgData', () => {
       return Promise.reject(`No org unit with id "${id}"`);
     })
   };
-  const wrapper = _ref2 => {
-    let {
-      children
-    } = _ref2;
-    return /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: dataProviderData
-    }, children);
-  };
+  const wrapper = ({
+    children
+  }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+    data: dataProviderData
+  }, children);
   it('should respond with `loading: true`, `error: null` and `data: { displayName, id }` initially', () => {
     const {
       result
@@ -78,18 +71,15 @@ describe('OrganisationUnitTree - useOrgData', () => {
     });
   });
   it('should provide the error', async () => {
-    const errorWrapper = _ref3 => {
-      let {
-        children
-      } = _ref3;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: {
-          organisationUnits: async () => {
-            throw new Error('Error message');
-          }
+    const errorWrapper = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: {
+        organisationUnits: async () => {
+          throw new Error('Error message');
         }
-      }, children);
-    };
+      }
+    }, children);
     const {
       result
     } = renderHook(() => useOrgData('A0000000000', {