From 31dd6113a386d2ca532b5e295858ea0e875bfd72 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Mon, 7 Oct 2019 14:36:26 +0200 Subject: [PATCH] feat: add support for multi root ou in filters (#345) Fix DHIS2-7446 DHIS2-7679. --- package.json | 4 ++-- yarn.lock | 65 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 9f0418a38..63a423544 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^2.4.3", + "@dhis2/analytics": "^2.4.4", "@dhis2/d2-i18n": "^1.0.4", "@dhis2/d2-ui-core": "^6.0.1", "@dhis2/d2-ui-interpretations": "^6.0.1", @@ -13,7 +13,7 @@ "@dhis2/d2-ui-rich-text": "^6.0.1", "@dhis2/d2-ui-sharing-dialog": "^6.0.1", "@dhis2/d2-ui-translation-dialog": "^6.0.1", - "@dhis2/data-visualizer-plugin": "^33.1.4", + "@dhis2/data-visualizer-plugin": "^33.1.5", "@dhis2/ui": "1.0.0-beta.15", "@dhis2/ui-core": "2.5.1", "@material-ui/core": "^3.9.2", diff --git a/yarn.lock b/yarn.lock index 43546549f..d7cc584dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1041,14 +1041,14 @@ react-beautiful-dnd "^10.1.1" styled-jsx "^3.2.1" -"@dhis2/analytics@^2.4.3": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.4.3.tgz#d9822530f29c2efa735f50154894a6620b589254" - integrity sha512-4kGAAKfxqYg+ZcN+VGPYRbVYyDttPStNtJMUUYALOIATzboKzhCmKuAW1EEQBmM8ETPFwUnaRhNAPUElTjD7BA== +"@dhis2/analytics@^2.4.4": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.4.4.tgz#f0839a61c1919d6a4d0b482d2f02aa27d984707d" + integrity sha512-QePnnMBygpJHlihdidrKOl/KQWcwpsGqzVqPYPFb0azWbVQd5L/wz1q0S17tRvf3aN7hqelmklZ6/tNEiiOoRg== dependencies: "@dhis2/d2-i18n" "^1.0.4" - "@dhis2/d2-ui-org-unit-dialog" "^6.1.0" - "@dhis2/d2-ui-period-selector-dialog" "^6.2.0" + "@dhis2/d2-ui-org-unit-dialog" "^6.3.0" + "@dhis2/d2-ui-period-selector-dialog" "^6.3.0" "@dhis2/ui-core" "^3.4.0" "@material-ui/core" "^3.9.3" "@material-ui/icons" "^3.0.2" @@ -1118,6 +1118,16 @@ lodash "^4.17.10" material-ui "^0.20.0" +"@dhis2/d2-ui-core@6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-6.3.0.tgz#ec0ef63978a34d5b2330303c426bf7d59e0836fc" + integrity sha512-ZFthluJBkmbi1F0vNaIvx2Zbjioapo+Ewn1vNqb2MsUadTHOlPcrWQjDz3JCB0qce2ZW2avZ+spasEOytPNsFA== + dependencies: + babel-runtime "^6.26.0" + d2 "~31.7" + lodash "^4.17.10" + material-ui "^0.20.0" + "@dhis2/d2-ui-interpretations@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-interpretations/-/d2-ui-interpretations-6.0.1.tgz#bcfa9efda51c90879b32209272808057d342d6f0" @@ -1159,6 +1169,17 @@ "@material-ui/icons" "^3.0.1" prop-types "^15.5.10" +"@dhis2/d2-ui-org-unit-dialog@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-dialog/-/d2-ui-org-unit-dialog-6.3.0.tgz#6f12b73fab2ce0448b92267a19aa6a1e9c363c70" + integrity sha512-wgjs1Av9cQzpCThug8uVu5uc61dwcLpfiWcK7Vr046rsw4iH+iMaCk5FE5nIC06LZWsLkENzVEdxo6DYskuq6w== + dependencies: + "@dhis2/d2-i18n" "^1.0.3" + "@dhis2/d2-ui-org-unit-tree" "6.3.0" + "@material-ui/core" "^3.3.1" + "@material-ui/icons" "^3.0.1" + prop-types "^15.5.10" + "@dhis2/d2-ui-org-unit-tree@6.1.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-6.1.0.tgz#6604cf93c9d11395e157bdee8ca44133e36673df" @@ -1169,6 +1190,16 @@ babel-runtime "^6.26.0" prop-types "^15.5.10" +"@dhis2/d2-ui-org-unit-tree@6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-org-unit-tree/-/d2-ui-org-unit-tree-6.3.0.tgz#5c80074a38987f853383aa12f10ecd11127332ef" + integrity sha512-KzO+ZnyN6vQjogFnK4ZWW/fcha40D0g+Vjc6IVS5U1kBiHdpmqngo+6K6DqCaHRkl/7oUyOUkEvrzbWdnkodVA== + dependencies: + "@dhis2/d2-ui-core" "6.3.0" + "@material-ui/core" "^3.3.1" + babel-runtime "^6.26.0" + prop-types "^15.5.10" + "@dhis2/d2-ui-period-selector-dialog@^6.2.0": version "6.2.1" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-period-selector-dialog/-/d2-ui-period-selector-dialog-6.2.1.tgz#e2345e1a7a3095c18fba9a893bbac6042cd037a7" @@ -1181,6 +1212,18 @@ babel-runtime "^6.26.0" prop-types "^15.6.0" +"@dhis2/d2-ui-period-selector-dialog@^6.3.0": + version "6.3.0" + resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-period-selector-dialog/-/d2-ui-period-selector-dialog-6.3.0.tgz#56bba56d8a7e914364e94e3d025dda8f03a3622f" + integrity sha512-JOofPyx+h45PsVi/0Ubf4xQurBwnnq+wTSOtibKfWSvxNgrNUug08F8+LYxoP/+IUogmkzuFD0uQs9pW3pYa0g== + dependencies: + "@dhis2/analytics" "^2.1.0" + "@dhis2/d2-i18n" "^1.0.4" + "@material-ui/core" "^3.3.1" + "@material-ui/icons" "^3.0.1" + babel-runtime "^6.26.0" + prop-types "^15.6.0" + "@dhis2/d2-ui-rich-text@6.0.1", "@dhis2/d2-ui-rich-text@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-6.0.1.tgz#6a57dbbc6586161cd64eda9b4f24a8de67c92dea" @@ -1232,12 +1275,12 @@ react-select "^2.0.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@^33.1.4": - version "33.1.4" - resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-33.1.4.tgz#1924751cb37d9ca47e8cbdf39b6cc7f3444e6ee7" - integrity sha512-Qj0CY4Afdwq9SLNvR6Bx9rB+98ZTwGCCN1i5wRWA/VYtHqOF0Fg3pIqVjYIVj+6pe9atHEbEyVz+N/EjTMHGjw== +"@dhis2/data-visualizer-plugin@^33.1.5": + version "33.1.5" + resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-33.1.5.tgz#dcb7e7285c6c651bf11d048f137a37cf42c00123" + integrity sha512-JVxU5uF49byu3X40XzX3hzFgTtAmMrJ3LW8F4all+8zwYBrjnB+jaM3ZIvUz7boALiCioDYoh2DniEIXgAWs3g== dependencies: - "@dhis2/analytics" "^2.4.3" + "@dhis2/analytics" "^2.4.4" "@material-ui/core" "^3.1.2" lodash-es "^4.17.11" react "^16.6.0"