@dhis2-ui/organisation-unit-tree 10.16.3-alpha.1 → 10.16.4

package/build/es/organisation-unit-tree/default-render-node-label/default-render-node-label.js

@@ -1,6 +1,3 @@
-export const defaultRenderNodeLabel = _ref => {
-  let {
-    label
-  } = _ref;
-  return label;
-};
+export const defaultRenderNodeLabel = ({
+  label
+}) => label;

package/build/es/organisation-unit-tree/organisation-unit-tree-root-error.js

@@ -1,18 +1,15 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import i18n from '../locales/index.js';
-export const OrganisationUnitTreeRootError = _ref => {
-  let {
-    dataTest = 'dhis2-uiwidgets-orgunittree-error',
-    error
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": dataTest
-  }, i18n.t('Error: {{ ERRORMESSAGE }}', {
-    ERRORMESSAGE: error,
-    nsSeparator: '>'
-  }));
-};
+export const OrganisationUnitTreeRootError = ({
+  dataTest = 'dhis2-uiwidgets-orgunittree-error',
+  error
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": dataTest
+}, i18n.t('Error: {{ ERRORMESSAGE }}', {
+  ERRORMESSAGE: error,
+  nsSeparator: '>'
+}));
 OrganisationUnitTreeRootError.propTypes = {
   error: PropTypes.string.isRequired,
   dataTest: PropTypes.string

package/build/es/organisation-unit-tree/organisation-unit-tree-root-loading.js

@@ -2,19 +2,16 @@ import _JSXStyle from "styled-jsx/style";
 import { CircularLoader } from '@dhis2-ui/loader';
 import PropTypes from 'prop-types';
 import React from 'react';
-export const OrganisationUnitTreeRootLoading = _ref => {
-  let {
-    dataTest = 'dhis2-uiwidgets-orgunittree-loading'
-  } = _ref;
-  return /*#__PURE__*/React.createElement("div", {
-    "data-test": dataTest,
-    className: "jsx-814846266"
-  }, /*#__PURE__*/React.createElement(CircularLoader, {
-    small: true
-  }), /*#__PURE__*/React.createElement(_JSXStyle, {
-    id: "814846266"
-  }, ["div.jsx-814846266{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}"]));
-};
+export const OrganisationUnitTreeRootLoading = ({
+  dataTest = 'dhis2-uiwidgets-orgunittree-loading'
+}) => /*#__PURE__*/React.createElement("div", {
+  "data-test": dataTest,
+  className: "jsx-814846266"
+}, /*#__PURE__*/React.createElement(CircularLoader, {
+  small: true
+}), /*#__PURE__*/React.createElement(_JSXStyle, {
+  id: "814846266"
+}, ["div.jsx-814846266{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;}"]));
 OrganisationUnitTreeRootLoading.propTypes = {
   dataTest: PropTypes.string
 };

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

@@ -13,30 +13,29 @@ import { useRootOrgData } from './use-root-org-data/index.js';
 
 // A stable object to reference
 const staticArray = [];
-const OrganisationUnitTree = _ref => {
-  let {
-    onChange,
-    roots,
-    autoExpandLoadingError,
-    dataTest = 'dhis2-uiwidgets-orgunittree',
-    disableSelection,
-    displayProperty = 'displayName',
-    forceReload,
-    highlighted = staticArray,
-    isUserDataViewFallback,
-    initiallyExpanded = staticArray,
-    filter = staticArray,
-    renderNodeLabel = defaultRenderNodeLabel,
-    selected = staticArray,
-    singleSelection,
-    suppressAlphabeticalSorting,
-    expanded: expandedControlled,
-    handleExpand: handleExpandControlled,
-    handleCollapse: handleCollapseControlled,
-    onExpand,
-    onCollapse,
-    onChildrenLoaded
-  } = _ref;
+const OrganisationUnitTree = ({
+  onChange,
+  roots,
+  autoExpandLoadingError,
+  dataTest = 'dhis2-uiwidgets-orgunittree',
+  disableSelection,
+  displayProperty = 'displayName',
+  forceReload,
+  highlighted = staticArray,
+  isUserDataViewFallback,
+  initiallyExpanded = staticArray,
+  filter = staticArray,
+  renderNodeLabel = defaultRenderNodeLabel,
+  selected = staticArray,
+  singleSelection,
+  suppressAlphabeticalSorting,
+  expanded: expandedControlled,
+  handleExpand: handleExpandControlled,
+  handleCollapse: handleCollapseControlled,
+  onExpand,
+  onCollapse,
+  onChildrenLoaded
+}) => {
   const rootIds = filterRootIds(filter, Array.isArray(roots) ? roots : [roots]);
   const reloadId = useForceReload(forceReload);
   const [prevReloadId, setPrevReloadId] = useState(reloadId);

package/build/es/organisation-unit-tree/use-expanded/create-expand-handlers.js

@@ -6,18 +6,16 @@
  * @param {Function} [args.onCollapse]
  * @returns {{ handleExpand: Function, handleCollapse: Function }}
  */
-export const createExpandHandlers = _ref => {
-  let {
-    expanded,
-    setExpanded,
-    onExpand,
-    onCollapse
-  } = _ref;
-  const handleExpand = _ref2 => {
-    let {
-      path,
-      ...rest
-    } = _ref2;
+export const createExpandHandlers = ({
+  expanded,
+  setExpanded,
+  onExpand,
+  onCollapse
+}) => {
+  const handleExpand = ({
+    path,
+    ...rest
+  }) => {
     if (!expanded.includes(path)) {
       setExpanded([...expanded, path]);
       if (onExpand) {
@@ -28,11 +26,10 @@ export const createExpandHandlers = _ref => {
       }
     }
   };
-  const handleCollapse = _ref3 => {
-    let {
-      path,
-      ...rest
-    } = _ref3;
+  const handleCollapse = ({
+    path,
+    ...rest
+  }) => {
     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/organisation-unit-tree/use-expanded/use-expanded.js

@@ -8,15 +8,14 @@ import { createExpandHandlers } from './create-expand-handlers.js';
  * @param {Function} [onCollapse]
  * @returns {{ expanded: string[], handleExpand: Function, handleCollapse: Function }}
  */
-export const useExpanded = _ref => {
-  let {
-    initiallyExpanded,
-    onExpand,
-    onCollapse,
-    expandedControlled,
-    handleExpandControlled,
-    handleCollapseControlled
-  } = _ref;
+export const useExpanded = ({
+  initiallyExpanded,
+  onExpand,
+  onCollapse,
+  expandedControlled,
+  handleExpandControlled,
+  handleCollapseControlled
+}) => {
   const isControlled = !!expandedControlled;
   const allInitiallyExpandedPaths = isControlled ? [] : getAllExpandedPaths(initiallyExpanded);
   const [expanded, setExpanded] = useState(allInitiallyExpandedPaths);

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

@@ -11,8 +11,7 @@
  */
 export 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/es/organisation-unit-tree/use-root-org-data/use-root-org-data.js

@@ -6,15 +6,12 @@ export 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']
+    })
   }
 }), {});
 
@@ -26,11 +23,10 @@ export const createRootQuery = (ids, displayProperty) => ids.reduce((query, id)
  * @param {'displayName'|'displayShortName'} [options.displayProperty]
  * @returns {Object}
  */
-export const useRootOrgData = function (ids) {
-  let {
-    isUserDataViewFallback,
-    displayProperty = 'displayName'
-  } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+export const useRootOrgData = (ids, {
+  isUserDataViewFallback,
+  displayProperty = 'displayName'
+} = {}) => {
   const query = useMemo(() => createRootQuery(ids, displayProperty), [ids, displayProperty]);
   const variables = {
     isUserDataViewFallback

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

@@ -5,10 +5,7 @@ import { useRootOrgData } from './use-root-org-data.js';
 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);
@@ -18,10 +15,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);
@@ -40,14 +34,11 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
       };
     })
   };
-  const wrapper = _ref => {
-    let {
-      children
-    } = _ref;
-    return /*#__PURE__*/React.createElement(CustomDataProvider, {
-      data: dataProviderData
-    }, children);
-  };
+  const wrapper = ({
+    children
+  }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+    data: dataProviderData
+  }, children);
   it('should respond with `loading: false`, `error: null` and `data: null` initially', () => {
     const {
       result
@@ -67,32 +58,30 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
     } = renderHook(() => useRootOrgData(['A0000000000']), {
       wrapper
     });
-    await waitFor(() => {});
-    expect(result.current).toEqual(expect.objectContaining({
-      loading: false,
-      error: null,
-      data: {
-        A0000000000: {
-          id: 'A0000000000',
-          path: '/A0000000000',
-          displayName: 'Org Unit 1'
+    await 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__*/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(() => useRootOrgData(['A0000000000']), {
@@ -142,14 +131,11 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
         };
       })
     };
-    const wrapperWithoutDisplayName = _ref3 => {
-      let {
-        children
-      } = _ref3;
-      return /*#__PURE__*/React.createElement(CustomDataProvider, {
-        data: dataProviderDataWithoutDisplayName
-      }, children);
-    };
+    const wrapperWithoutDisplayName = ({
+      children
+    }) => /*#__PURE__*/React.createElement(CustomDataProvider, {
+      data: dataProviderDataWithoutDisplayName
+    }, children);
     const {
       result
     } = renderHook(() => useRootOrgData(['A0000000000']), {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/organisation-unit-tree",
-    "version": "10.16.3-alpha.1",
+    "version": "10.16.4",
     "description": "UI OrganisationUnitTree",
     "repository": {
         "type": "git",
@@ -35,11 +35,11 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "10.16.3-alpha.1",
-        "@dhis2-ui/checkbox": "10.16.3-alpha.1",
-        "@dhis2-ui/loader": "10.16.3-alpha.1",
-        "@dhis2-ui/node": "10.16.3-alpha.1",
-        "@dhis2/ui-constants": "10.16.3-alpha.1",
+        "@dhis2-ui/button": "10.16.4",
+        "@dhis2-ui/checkbox": "10.16.4",
+        "@dhis2-ui/loader": "10.16.4",
+        "@dhis2-ui/node": "10.16.4",
+        "@dhis2/ui-constants": "10.16.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

package/src/locales/index.js

@@ -28,23 +28,62 @@ 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/src/organisation-unit-tree/use-root-org-data/use-root-org-unit.test.js

@@ -67,21 +67,21 @@ describe('OrganisationUnitTree - useRootOrgData', () => {
             wrapper,
         })
 
-        await waitFor(() => {})
-
-        expect(result.current).toEqual(
-            expect.objectContaining({
-                loading: false,
-                error: null,
-                data: {
-                    A0000000000: {
-                        id: 'A0000000000',
-                        path: '/A0000000000',
-                        displayName: 'Org Unit 1',
+        await 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 () => {