@dhis2-ui/organisation-unit-tree 7.12.2 → 7.13.0

package/build/cjs/index.js

@@ -9,6 +9,18 @@ Object.defineProperty(exports, "OrganisationUnitTree", {
     return _index.OrganisationUnitTree;
   }
 });
+Object.defineProperty(exports, "OrganisationUnitTreeRootError", {
+  enumerable: true,
+  get: function () {
+    return _index.RootError;
+  }
+});
+Object.defineProperty(exports, "OrganisationUnitTreeRootLoading", {
+  enumerable: true,
+  get: function () {
+    return _index.RootLoading;
+  }
+});
 Object.defineProperty(exports, "getAllExpandedOrgUnitPaths", {
   enumerable: true,
   get: function () {

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

@@ -9,5 +9,21 @@ Object.defineProperty(exports, "OrganisationUnitTree", {
     return _organisationUnitTree.OrganisationUnitTree;
   }
 });
+Object.defineProperty(exports, "RootError", {
+  enumerable: true,
+  get: function () {
+    return _rootError.RootError;
+  }
+});
+Object.defineProperty(exports, "RootLoading", {
+  enumerable: true,
+  get: function () {
+    return _rootLoading.RootLoading;
+  }
+});
+
+var _organisationUnitTree = require("./organisation-unit-tree.js");
+
+var _rootError = require("./root-error.js");
 
-var _organisationUnitTree = require("./organisation-unit-tree.js");
+var _rootLoading = require("./root-loading.js");

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

@@ -92,11 +92,8 @@ const OrganisationUnitTree = ({
   }, [reloadId, prevReloadId, refetch]);
   return /*#__PURE__*/_react.default.createElement("div", {
     "data-test": dataTest
-  }, error && /*#__PURE__*/_react.default.createElement(_rootError.RootError, {
-    error: error,
-    dataTest: dataTest
-  }), loading && /*#__PURE__*/_react.default.createElement(_rootLoading.RootLoading, {
-    dataTest: dataTest
+  }, loading && /*#__PURE__*/_react.default.createElement(_rootLoading.RootLoading, null), error && /*#__PURE__*/_react.default.createElement(_rootError.RootError, {
+    error: error
   }), !error && !loading && rootIds.map(rootId => {
     const rootNode = data[rootId];
     return /*#__PURE__*/_react.default.createElement(_index.OrganisationUnitNode, {

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

@@ -17,14 +17,17 @@ const RootError = ({
   dataTest,
   error
 }) => /*#__PURE__*/_react.default.createElement("div", {
-  "data-test": `${dataTest}-loading`
+  "data-test": dataTest
 }, _index.default.t('Error: {{ ERRORMESSAGE }}', {
   ERRORMESSAGE: error,
   nsSeparator: '>'
 }));
 
 exports.RootError = RootError;
+RootError.defaultProps = {
+  dataTest: 'dhis2-uiwidgets-orgunittree-error'
+};
 RootError.propTypes = {
-  dataTest: _propTypes.default.string.isRequired,
-  error: _propTypes.default.string.isRequired
+  error: _propTypes.default.string.isRequired,
+  dataTest: _propTypes.default.string
 };

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

@@ -18,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const RootLoading = ({
   dataTest
 }) => /*#__PURE__*/_react.default.createElement("div", {
-  "data-test": `${dataTest}-loading`,
+  "data-test": dataTest,
   className: "jsx-814846266"
 }, /*#__PURE__*/_react.default.createElement(_loader.CircularLoader, {
   small: true
@@ -27,6 +27,9 @@ const RootLoading = ({
 }, ["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;}"]));
 
 exports.RootLoading = RootLoading;
+RootLoading.defaultProps = {
+  dataTest: 'dhis2-uiwidgets-orgunittree-loading'
+};
 RootLoading.propTypes = {
-  dataTest: _propTypes.default.string.isRequired
+  dataTest: _propTypes.default.string
 };

package/build/es/index.js

@@ -1,2 +1,2 @@
-export { OrganisationUnitTree } from './organisation-unit-tree/index.js';
+export { OrganisationUnitTree, RootError as OrganisationUnitTreeRootError, RootLoading as OrganisationUnitTreeRootLoading } from './organisation-unit-tree/index.js';
 export { getAllExpandedPaths as getAllExpandedOrgUnitPaths } from './get-all-expanded-paths/index.js';

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

@@ -1 +1,3 @@
-export { OrganisationUnitTree } from './organisation-unit-tree.js';
+export { OrganisationUnitTree } from './organisation-unit-tree.js';
+export { RootError } from './root-error.js';
+export { RootLoading } from './root-loading.js';

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

@@ -68,11 +68,8 @@ const OrganisationUnitTree = ({
   }, [reloadId, prevReloadId, refetch]);
   return /*#__PURE__*/React.createElement("div", {
     "data-test": dataTest
-  }, error && /*#__PURE__*/React.createElement(RootError, {
-    error: error,
-    dataTest: dataTest
-  }), loading && /*#__PURE__*/React.createElement(RootLoading, {
-    dataTest: dataTest
+  }, loading && /*#__PURE__*/React.createElement(RootLoading, null), error && /*#__PURE__*/React.createElement(RootError, {
+    error: error
   }), !error && !loading && rootIds.map(rootId => {
     const rootNode = data[rootId];
     return /*#__PURE__*/React.createElement(OrganisationUnitNode, {

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

@@ -5,12 +5,15 @@ export const RootError = ({
   dataTest,
   error
 }) => /*#__PURE__*/React.createElement("div", {
-  "data-test": `${dataTest}-loading`
+  "data-test": dataTest
 }, i18n.t('Error: {{ ERRORMESSAGE }}', {
   ERRORMESSAGE: error,
   nsSeparator: '>'
 }));
+RootError.defaultProps = {
+  dataTest: 'dhis2-uiwidgets-orgunittree-error'
+};
 RootError.propTypes = {
-  dataTest: PropTypes.string.isRequired,
-  error: PropTypes.string.isRequired
+  error: PropTypes.string.isRequired,
+  dataTest: PropTypes.string
 };

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

@@ -5,13 +5,16 @@ import React from 'react';
 export const RootLoading = ({
   dataTest
 }) => /*#__PURE__*/React.createElement("div", {
-  "data-test": `${dataTest}-loading`,
+  "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;}"]));
+RootLoading.defaultProps = {
+  dataTest: 'dhis2-uiwidgets-orgunittree-loading'
+};
 RootLoading.propTypes = {
-  dataTest: PropTypes.string.isRequired
+  dataTest: PropTypes.string
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/organisation-unit-tree",
-    "version": "7.12.2",
+    "version": "7.13.0",
     "description": "UI OrganisationUnitTree",
     "repository": {
         "type": "git",
@@ -34,10 +34,10 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.0.0-beta.1",
-        "@dhis2-ui/checkbox": "7.12.2",
-        "@dhis2-ui/loader": "7.12.2",
-        "@dhis2-ui/node": "7.12.2",
-        "@dhis2/ui-constants": "7.12.2",
+        "@dhis2-ui/checkbox": "7.13.0",
+        "@dhis2-ui/loader": "7.13.0",
+        "@dhis2-ui/node": "7.13.0",
+        "@dhis2/ui-constants": "7.13.0",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },