@dhis2-ui/organisation-unit-tree 7.12.0 → 7.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,6 +9,18 @@ Object.defineProperty(exports, "OrganisationUnitTree", {
9
9
  return _index.OrganisationUnitTree;
10
10
  }
11
11
  });
12
+ Object.defineProperty(exports, "OrganisationUnitTreeRootError", {
13
+ enumerable: true,
14
+ get: function () {
15
+ return _index.RootError;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "OrganisationUnitTreeRootLoading", {
19
+ enumerable: true,
20
+ get: function () {
21
+ return _index.RootLoading;
22
+ }
23
+ });
12
24
  Object.defineProperty(exports, "getAllExpandedOrgUnitPaths", {
13
25
  enumerable: true,
14
26
  get: function () {
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "Could not load children": "Kunne ikke laste underordnede enheter",
3
- "Error: {{ ERRORMESSAGE }}": ""
3
+ "Error: {{ ERRORMESSAGE }}": "Feil: {{ ERRORMESSAGE }}"
4
4
  }
@@ -9,5 +9,21 @@ Object.defineProperty(exports, "OrganisationUnitTree", {
9
9
  return _organisationUnitTree.OrganisationUnitTree;
10
10
  }
11
11
  });
12
+ Object.defineProperty(exports, "RootError", {
13
+ enumerable: true,
14
+ get: function () {
15
+ return _rootError.RootError;
16
+ }
17
+ });
18
+ Object.defineProperty(exports, "RootLoading", {
19
+ enumerable: true,
20
+ get: function () {
21
+ return _rootLoading.RootLoading;
22
+ }
23
+ });
24
+
25
+ var _organisationUnitTree = require("./organisation-unit-tree.js");
26
+
27
+ var _rootError = require("./root-error.js");
12
28
 
13
- var _organisationUnitTree = require("./organisation-unit-tree.js");
29
+ var _rootLoading = require("./root-loading.js");
@@ -92,11 +92,8 @@ const OrganisationUnitTree = ({
92
92
  }, [reloadId, prevReloadId, refetch]);
93
93
  return /*#__PURE__*/_react.default.createElement("div", {
94
94
  "data-test": dataTest
95
- }, error && /*#__PURE__*/_react.default.createElement(_rootError.RootError, {
96
- error: error,
97
- dataTest: dataTest
98
- }), loading && /*#__PURE__*/_react.default.createElement(_rootLoading.RootLoading, {
99
- dataTest: dataTest
95
+ }, loading && /*#__PURE__*/_react.default.createElement(_rootLoading.RootLoading, null), error && /*#__PURE__*/_react.default.createElement(_rootError.RootError, {
96
+ error: error
100
97
  }), !error && !loading && rootIds.map(rootId => {
101
98
  const rootNode = data[rootId];
102
99
  return /*#__PURE__*/_react.default.createElement(_index.OrganisationUnitNode, {
@@ -17,14 +17,17 @@ const RootError = ({
17
17
  dataTest,
18
18
  error
19
19
  }) => /*#__PURE__*/_react.default.createElement("div", {
20
- "data-test": `${dataTest}-loading`
20
+ "data-test": dataTest
21
21
  }, _index.default.t('Error: {{ ERRORMESSAGE }}', {
22
22
  ERRORMESSAGE: error,
23
23
  nsSeparator: '>'
24
24
  }));
25
25
 
26
26
  exports.RootError = RootError;
27
+ RootError.defaultProps = {
28
+ dataTest: 'dhis2-uiwidgets-orgunittree-error'
29
+ };
27
30
  RootError.propTypes = {
28
- dataTest: _propTypes.default.string.isRequired,
29
- error: _propTypes.default.string.isRequired
31
+ error: _propTypes.default.string.isRequired,
32
+ dataTest: _propTypes.default.string
30
33
  };
@@ -18,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
18
18
  const RootLoading = ({
19
19
  dataTest
20
20
  }) => /*#__PURE__*/_react.default.createElement("div", {
21
- "data-test": `${dataTest}-loading`,
21
+ "data-test": dataTest,
22
22
  className: "jsx-814846266"
23
23
  }, /*#__PURE__*/_react.default.createElement(_loader.CircularLoader, {
24
24
  small: true
@@ -27,6 +27,9 @@ const RootLoading = ({
27
27
  }, ["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;}"]));
28
28
 
29
29
  exports.RootLoading = RootLoading;
30
+ RootLoading.defaultProps = {
31
+ dataTest: 'dhis2-uiwidgets-orgunittree-loading'
32
+ };
30
33
  RootLoading.propTypes = {
31
- dataTest: _propTypes.default.string.isRequired
34
+ dataTest: _propTypes.default.string
32
35
  };
package/build/es/index.js CHANGED
@@ -1,2 +1,2 @@
1
- export { OrganisationUnitTree } from './organisation-unit-tree/index.js';
1
+ export { OrganisationUnitTree, RootError as OrganisationUnitTreeRootError, RootLoading as OrganisationUnitTreeRootLoading } from './organisation-unit-tree/index.js';
2
2
  export { getAllExpandedPaths as getAllExpandedOrgUnitPaths } from './get-all-expanded-paths/index.js';
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "Could not load children": "Kunne ikke laste underordnede enheter",
3
- "Error: {{ ERRORMESSAGE }}": ""
3
+ "Error: {{ ERRORMESSAGE }}": "Feil: {{ ERRORMESSAGE }}"
4
4
  }
@@ -1 +1,3 @@
1
- export { OrganisationUnitTree } from './organisation-unit-tree.js';
1
+ export { OrganisationUnitTree } from './organisation-unit-tree.js';
2
+ export { RootError } from './root-error.js';
3
+ export { RootLoading } from './root-loading.js';
@@ -68,11 +68,8 @@ const OrganisationUnitTree = ({
68
68
  }, [reloadId, prevReloadId, refetch]);
69
69
  return /*#__PURE__*/React.createElement("div", {
70
70
  "data-test": dataTest
71
- }, error && /*#__PURE__*/React.createElement(RootError, {
72
- error: error,
73
- dataTest: dataTest
74
- }), loading && /*#__PURE__*/React.createElement(RootLoading, {
75
- dataTest: dataTest
71
+ }, loading && /*#__PURE__*/React.createElement(RootLoading, null), error && /*#__PURE__*/React.createElement(RootError, {
72
+ error: error
76
73
  }), !error && !loading && rootIds.map(rootId => {
77
74
  const rootNode = data[rootId];
78
75
  return /*#__PURE__*/React.createElement(OrganisationUnitNode, {
@@ -5,12 +5,15 @@ export const RootError = ({
5
5
  dataTest,
6
6
  error
7
7
  }) => /*#__PURE__*/React.createElement("div", {
8
- "data-test": `${dataTest}-loading`
8
+ "data-test": dataTest
9
9
  }, i18n.t('Error: {{ ERRORMESSAGE }}', {
10
10
  ERRORMESSAGE: error,
11
11
  nsSeparator: '>'
12
12
  }));
13
+ RootError.defaultProps = {
14
+ dataTest: 'dhis2-uiwidgets-orgunittree-error'
15
+ };
13
16
  RootError.propTypes = {
14
- dataTest: PropTypes.string.isRequired,
15
- error: PropTypes.string.isRequired
17
+ error: PropTypes.string.isRequired,
18
+ dataTest: PropTypes.string
16
19
  };
@@ -5,13 +5,16 @@ import React from 'react';
5
5
  export const RootLoading = ({
6
6
  dataTest
7
7
  }) => /*#__PURE__*/React.createElement("div", {
8
- "data-test": `${dataTest}-loading`,
8
+ "data-test": dataTest,
9
9
  className: "jsx-814846266"
10
10
  }, /*#__PURE__*/React.createElement(CircularLoader, {
11
11
  small: true
12
12
  }), /*#__PURE__*/React.createElement(_JSXStyle, {
13
13
  id: "814846266"
14
14
  }, ["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;}"]));
15
+ RootLoading.defaultProps = {
16
+ dataTest: 'dhis2-uiwidgets-orgunittree-loading'
17
+ };
15
18
  RootLoading.propTypes = {
16
- dataTest: PropTypes.string.isRequired
19
+ dataTest: PropTypes.string
17
20
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2-ui/organisation-unit-tree",
3
- "version": "7.12.0",
3
+ "version": "7.14.0",
4
4
  "description": "UI OrganisationUnitTree",
5
5
  "repository": {
6
6
  "type": "git",
@@ -34,10 +34,10 @@
34
34
  },
35
35
  "dependencies": {
36
36
  "@dhis2/prop-types": "^3.0.0-beta.1",
37
- "@dhis2-ui/checkbox": "7.12.0",
38
- "@dhis2-ui/loader": "7.12.0",
39
- "@dhis2-ui/node": "7.12.0",
40
- "@dhis2/ui-constants": "7.12.0",
37
+ "@dhis2-ui/checkbox": "7.14.0",
38
+ "@dhis2-ui/loader": "7.14.0",
39
+ "@dhis2-ui/node": "7.14.0",
40
+ "@dhis2/ui-constants": "7.14.0",
41
41
  "classnames": "^2.3.1",
42
42
  "prop-types": "^15.7.2"
43
43
  },