@dhis2-ui/organisation-unit-tree 7.4.1 → 7.4.2

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.
@@ -175,9 +175,13 @@ const createDecoratorStatefulMultiSelection = args => {
175
175
  exports.createDecoratorStatefulMultiSelection = createDecoratorStatefulMultiSelection;
176
176
 
177
177
  const createDecoratorCustomDataProvider = args => {
178
- return fn => /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
179
- data: (args === null || args === void 0 ? void 0 : args.data) || dataProviderData
180
- }, fn());
178
+ const data = (args === null || args === void 0 ? void 0 : args.data) || dataProviderData;
179
+ return fn => {
180
+ window.dataProviderData = data;
181
+ return /*#__PURE__*/_react.default.createElement(_appRuntime.CustomDataProvider, {
182
+ data: data
183
+ }, fn());
184
+ };
181
185
  };
182
186
 
183
187
  exports.createDecoratorCustomDataProvider = createDecoratorCustomDataProvider;
@@ -12,7 +12,6 @@ var _common = require("./common.js");
12
12
 
13
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
14
 
15
- window.dataProviderData = _common.dataProviderData;
16
15
  window.allUnits = [];
17
16
 
18
17
  for (let i = 0; i < 7; ++i) {
@@ -12,7 +12,7 @@ var _common = require("./common.js");
12
12
 
13
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
14
14
 
15
- window.dataProviderData = {
15
+ const customizedDataProviderData = {
16
16
  organisationUnits: (...args) => {
17
17
  const [, {
18
18
  id
@@ -39,7 +39,7 @@ window.onCollapse = window.Cypress && window.Cypress.cy.stub();
39
39
  window.onExpand = window.Cypress && window.Cypress.cy.stub();
40
40
  window.onChildrenLoaded = window.Cypress && window.Cypress.cy.stub();
41
41
  (0, _react.storiesOf)(_common.namespace, module).add('Events', () => /*#__PURE__*/_react2.default.createElement(_appRuntime.CustomDataProvider, {
42
- data: window.dataProviderData
42
+ data: customizedDataProviderData
43
43
  }, /*#__PURE__*/_react2.default.createElement(_common.StatefulMultiSelectionWrapper, null, ({
44
44
  selected,
45
45
  onChange
@@ -100,10 +100,6 @@ const expectStubPayloadToEqual = (stub, prop, expected) => {
100
100
  const {
101
101
  args
102
102
  } = calls[calls.length - 1];
103
- win.dataProviderData.organisationUnits('get', {
104
- id: 'A0000000001'
105
- }).then(response => {
106
- expect(args[0]).to.deep.eql(response);
107
- });
103
+ expect(args[0].id).to.equal('A0000000001');
108
104
  });
109
105
  });
@@ -144,7 +144,11 @@ export const createDecoratorStatefulMultiSelection = args => {
144
144
  }, fn);
145
145
  };
146
146
  export const createDecoratorCustomDataProvider = args => {
147
- return fn => /*#__PURE__*/React.createElement(CustomDataProvider, {
148
- data: (args === null || args === void 0 ? void 0 : args.data) || dataProviderData
149
- }, fn());
147
+ const data = (args === null || args === void 0 ? void 0 : args.data) || dataProviderData;
148
+ return fn => {
149
+ window.dataProviderData = data;
150
+ return /*#__PURE__*/React.createElement(CustomDataProvider, {
151
+ data: data
152
+ }, fn());
153
+ };
150
154
  };
@@ -3,7 +3,6 @@ import { storiesOf } from '@storybook/react';
3
3
  import React from 'react';
4
4
  import { OrganisationUnitTree } from '../index.js';
5
5
  import { StatefulMultiSelectionWrapper, dataProviderData, namespace } from './common.js';
6
- window.dataProviderData = dataProviderData;
7
6
  window.allUnits = [];
8
7
 
9
8
  for (let i = 0; i < 7; ++i) {
@@ -3,7 +3,7 @@ import { storiesOf } from '@storybook/react';
3
3
  import React from 'react';
4
4
  import { OrganisationUnitTree } from '../index.js';
5
5
  import { StatefulMultiSelectionWrapper, dataProviderData, namespace } from './common.js';
6
- window.dataProviderData = {
6
+ const customizedDataProviderData = {
7
7
  organisationUnits: (...args) => {
8
8
  const [, {
9
9
  id
@@ -30,7 +30,7 @@ window.onCollapse = window.Cypress && window.Cypress.cy.stub();
30
30
  window.onExpand = window.Cypress && window.Cypress.cy.stub();
31
31
  window.onChildrenLoaded = window.Cypress && window.Cypress.cy.stub();
32
32
  storiesOf(namespace, module).add('Events', () => /*#__PURE__*/React.createElement(CustomDataProvider, {
33
- data: window.dataProviderData
33
+ data: customizedDataProviderData
34
34
  }, /*#__PURE__*/React.createElement(StatefulMultiSelectionWrapper, null, ({
35
35
  selected,
36
36
  onChange
@@ -98,10 +98,6 @@ Then("the payload contains the loaded children's data", () => {
98
98
  const {
99
99
  args
100
100
  } = calls[calls.length - 1];
101
- win.dataProviderData.organisationUnits('get', {
102
- id: 'A0000000001'
103
- }).then(response => {
104
- expect(args[0]).to.deep.eql(response);
105
- });
101
+ expect(args[0].id).to.equal('A0000000001');
106
102
  });
107
103
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dhis2-ui/organisation-unit-tree",
3
- "version": "7.4.1",
3
+ "version": "7.4.2",
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.4.1",
38
- "@dhis2-ui/loader": "7.4.1",
39
- "@dhis2-ui/node": "7.4.1",
40
- "@dhis2/ui-constants": "7.4.1",
37
+ "@dhis2-ui/checkbox": "7.4.2",
38
+ "@dhis2-ui/loader": "7.4.2",
39
+ "@dhis2-ui/node": "7.4.2",
40
+ "@dhis2/ui-constants": "7.4.2",
41
41
  "classnames": "^2.3.1",
42
42
  "prop-types": "^15.7.2"
43
43
  },