From caa76c83bc5253a7ad23478c7193705d4bd12376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Wed, 9 Feb 2022 15:23:49 +0000 Subject: [PATCH 1/6] chore: bump @dhis2/ui --- package.json | 2 +- yarn.lock | 711 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 675 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index b35d9f69..525c0591 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@dhis2/app-runtime": "^3.3.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/prop-types": "^2.0.3", - "@dhis2/ui": "^7.1.1", + "@dhis2/ui": "^7.16.1", "prop-types": "^15.6.0", "react-router-dom": "^5.0.0" } diff --git a/yarn.lock b/yarn.lock index df2a886f..7c7a0714 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1320,10 +1320,10 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" - integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": + version "7.17.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941" + integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw== dependencies: regenerator-runtime "^0.13.4" @@ -1595,6 +1595,18 @@ debug "^3.1.0" lodash.once "^4.1.1" +"@dhis2-ui/alert@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-7.16.1.tgz#c879aae853450f0022f1dae7341e0223469fdd4f" + integrity sha512-V5z+GujonRAox5lNl95AigH7mJLDPWOKCWrxGiFz9oBYBnLG67pm9MVSz2lbWOo3N7AQtny2ZHpRuPga6ednlQ== + dependencies: + "@dhis2-ui/portal" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/alert@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-7.16.3.tgz#3df86bf6216ef47f8469e5f22cfd98607fdc9116" @@ -1607,6 +1619,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/box@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-7.16.1.tgz#c6978dd02bc61f63b221566aa62f9c356c4cdb1b" + integrity sha512-1zzs4GgQzNMPbS8RfIW+SyRX6LcjrmJljZaPjsI2yeDHq+iACAggQHyH+jcfNNMYsCQ0ieKIXs8pwmjDamLtNw== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/box@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-7.16.3.tgz#995b9e8315eeb082fb5f040733d62ae013f646cd" @@ -1617,6 +1639,20 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/button@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-7.16.1.tgz#c62723249f6614a95dac460bde645b03ffc3c1a8" + integrity sha512-OEXVmrQyxm1lR80W6m6gZkZeRMT9TBcBuasfgOCQ8kOi7+6INSqArCQaOq8K7dx9hFVUayEvibEu+LTtCqXFhw== + dependencies: + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/button@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-7.16.3.tgz#5139027873386563f40b4da913277b364410e052" @@ -1631,6 +1667,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/card@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-7.16.1.tgz#4ec59aa9572fac05209445cd1a0d0b7b71294095" + integrity sha512-w8iZyO+RDD2vNNugCZPh7eFexO6IRrVRTedI2a773/qCyyyLzLQqgoe0RTRxrv0eX4Di55tqa+JwjpGVyYkD0w== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/card@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-7.16.3.tgz#c9754431bdd9a3e1e09c876717653c18f03e815b" @@ -1641,6 +1687,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/center@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-7.16.1.tgz#192a5599ef8b34847c736e5d14ea5c113b17eb9f" + integrity sha512-bCdfnXBD6v+/QjYAXV/Gl4D9f6wEM1N2oQcoWQ6hm9mTOKP1ogOkASOZCYCZ3pEyHmlbjQRhehvMmGXYJuCFXw== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/center@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-7.16.3.tgz#e6b335fae51a2425499a708dc4a1954d73817c51" @@ -1651,6 +1707,18 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/checkbox@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-7.16.1.tgz#ea0bdb37c5b186d6976d3339d7efe7cde082c78c" + integrity sha512-EWFSrtySBX7U8BLuWdczOwSVibSPLVTtqsum5P5zIGvEAod5/DpT9cYxFoCS+PtRI/8myivEpjxCdbPjHkiRgw== + dependencies: + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/required" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/checkbox@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-7.16.3.tgz#2e658ddfc282c2a27e28cea33bc267fe8165ba93" @@ -1663,6 +1731,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/chip@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-7.16.1.tgz#8630677249563a558ccd54d9cc1d7f4071ee5626" + integrity sha512-VeCu7qlfP3LOwgNLUaNOTaC6Ewvp2xILLysiFN1SrIEjBJrCHbqsxGdfJV3zYpDCnwWjMSwr4OKI6QyeT+lKVA== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/chip@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-7.16.3.tgz#980db668ff52bb06ecefa2dcc5c8e88ca0f3342e" @@ -1673,6 +1751,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/cover@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-7.16.1.tgz#d4c335796bc8ac98ce46a0fa5fda7c8e4728314b" + integrity sha512-KLBUU98QcEMEEqHf8MVyR1Qur7HoyCTX5swvfDUyr7xOHbzrDJOh4bF3+pGzUxMwWdkTo2G1fObeIHGxbJjKhg== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/cover@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-7.16.3.tgz#0cffd85bc23467610df113cb070fc891b2d184b0" @@ -1683,6 +1771,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/css@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-7.16.1.tgz#eb9323886cfda8984d14523a9f37c1c40b3f9c47" + integrity sha512-ncJ4YrHXDzhWh7ikQ/0nzySiKXgYKQd3M4ueieYMaogHm2VeLg5xaYKMx9AwbUvEKnqlZlEDgkiOLm9CrhQoBA== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/css@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-7.16.3.tgz#2e44f2c1daedcdc8d56ba1b00f3614b329babd62" @@ -1693,6 +1791,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/divider@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-7.16.1.tgz#54e3879cfff7fc1fdd6c4785a82d0c251f96e115" + integrity sha512-pQ5XA+uiMpgZapB0RdTv+7IyA2hInMyp3BbAJdaIcG7h0B+WfVhWMrLAoatwXV6yyPJeY4v1FUuDW6sedfBJ1w== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/divider@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-7.16.3.tgz#a0330b7a191a2747f1fe1991cad540eb245ba674" @@ -1703,6 +1811,19 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/field@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-7.16.1.tgz#772b424aedd03669d9ee5d4dbcef9190ecd3c9f3" + integrity sha512-bIq3fI7vwbgxzUHVIw1d4oDigIaYWSlqeYuKx9MT3aYq65i4tzgPbwLx8LrEgC9njJkKXGSL8bkvNyRGZkZD/A== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/help" "7.16.1" + "@dhis2-ui/label" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/field@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-7.16.3.tgz#8be6d8d87874f7ceb3767f734045a9ae3bcce77b" @@ -1716,6 +1837,22 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/file-input@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-7.16.1.tgz#5699f25a609a08fd631e3b1988cae06d136635ec" + integrity sha512-ET5mDdK7UdBHs1YC43fx28bdiv7UG69BfKNYEYLeKo6OlCALXIpjET2ExnfJS0cCezmZkZqoem9ZThQGOttFFA== + dependencies: + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/label" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/status-icon" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/file-input@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-7.16.3.tgz#3bf1bd7b1b4298ca90d0efa1de9d9b67de36859a" @@ -1732,6 +1869,28 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/header-bar@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-7.16.1.tgz#82b60c931361c0671350c39ccafce4becea0ab56" + integrity sha512-WVrTmJRvtRJFmkGpN+M+zqj353V4lSSNDGk0l1LlHgjjJwMeV6dhRfT/2+w7SAw+shgiY86mOrkmAgKfnCwT5w== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/center" "7.16.1" + "@dhis2-ui/divider" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/logo" "7.16.1" + "@dhis2-ui/menu" "7.16.1" + "@dhis2-ui/user-avatar" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + moment "^2.29.1" + prop-types "^15.7.2" + "@dhis2-ui/header-bar@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-7.16.3.tgz#378c242934d4412f18315a1ff532dc1e84d996e3" @@ -1754,6 +1913,16 @@ moment "^2.29.1" prop-types "^15.7.2" +"@dhis2-ui/help@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-7.16.1.tgz#a8f79a70efffa5da3b40a73ebbf40441e34a95d7" + integrity sha512-Tlwrl6LPQKZKLf/xM/NHo4yd55k8JZty/+u8O9bFjeG8dkGBdH5XPL2bsHXlQ3wvzHwLxlLM1DGTBAc//KBg9w== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/help@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-7.16.3.tgz#061b7c366b655f38ae6bf67af8bb8f6d8ddd036e" @@ -1764,6 +1933,22 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/input@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-7.16.1.tgz#cbc42c6f95f3bf730bb73ab53652689ad9fead29" + integrity sha512-LfJ4WC7jXrjZNhWta61wXgSEq28mqHTaGNMNpZ332fAFf8BMeMCEsbpybZaNYoqnfvqJLCE+TaORrHUZvEY27Q== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/status-icon" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/input@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-7.16.3.tgz#8e8b2f27d18676841629beaa11800edf20a933c1" @@ -1780,6 +1965,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/intersection-detector@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-7.16.1.tgz#26a63b8ad51b1a5e70271099002e3766b6e42f8c" + integrity sha512-My5Go0bSsiPi1cLev0Ps+Goqu3IhNZDqDbXEeO4L7Yc6u1rg89qvYuVQlmIYqLpuPXoXodH7jBaGccXWuT+TLg== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/intersection-detector@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-7.16.3.tgz#e3012ced55d99b1e6c1305ae6b9c772d9161cdff" @@ -1790,6 +1985,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/label@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-7.16.1.tgz#8eac7fca722d4ac8f279bf760baef038ef6cb4a7" + integrity sha512-65z09EfVrfIu4b+lKBjw5oGklAxUTZHqsjdPlzHQjfO8MUp1Mg+pbECWUcJJQkQFZ5xsRifWve/hlS+Zx58aSQ== + dependencies: + "@dhis2-ui/required" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/label@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-7.16.3.tgz#2e3064eed920a767af90a4b6e3244f13a56ec40e" @@ -1801,6 +2007,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/layer@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-7.16.1.tgz#b770941e0b87277d07113b2ac0dcf8bb63426d46" + integrity sha512-5DEKaXlWfHq63DHHIsM0bcIo6CYlb3T3wjZWrBUxjAct0GOJKEwi9BOP9+gbauTXEjHioY1GwsBp1KzakHlsNw== + dependencies: + "@dhis2-ui/portal" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/layer@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-7.16.3.tgz#e1d39acd3747f63b08e3004adc213fccd46e1189" @@ -1812,6 +2029,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/legend@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-7.16.1.tgz#8101290365ca7e5ad12a112d7d128c8badf64f08" + integrity sha512-njOX6xhr02rw4OHeQurKLdBlfSUiEDXR9b3BRYLcDJoXDFqkecUgqaKsrELEZzSpEuQ9iN2RlH7DSLrflMXs0g== + dependencies: + "@dhis2-ui/required" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/legend@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-7.16.3.tgz#d3f105f12ec410a66c3b06ac5de03f825fb0d971" @@ -1823,6 +2051,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/loader@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-7.16.1.tgz#278d7517d3c0c0ea001e58b63ba8414a02ef9e4b" + integrity sha512-ODTZSfGS0EVRNrUENJGX7gkdi+sC82K8BCcS/++92MwZnpPUpFV7QphB4g72U4FXJEZRfjX5CbAhvW+wV4ACKg== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/loader@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-7.16.3.tgz#184d2a706d206bb8916458b16cc3a1ecdec81051" @@ -1833,6 +2071,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/logo@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-7.16.1.tgz#b08ecc3ca4131b1b524832e28c8838b5c7761e01" + integrity sha512-T+Hx91/QmT1uucadtFJ9+fqGOA9V3+WQOSJCcCbVR4UqQxe5fP3AHVMfZ2VneqxKEDZH2+cEsVzBEtRTEKlEzA== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/logo@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-7.16.3.tgz#68f34dbc0de13875e9cbf5d4b4f3020dc8eec86f" @@ -1843,6 +2091,22 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/menu@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-7.16.1.tgz#2ef3ee7eb4672a759ff4c0d957d4a6e16f4a20ed" + integrity sha512-Ltw6MC07lndEM9vNiuXccZ+79ggw1KDiPoZo4gLl4wikIZczOikL53OoF9oaLEdpPzEqa+0oQ4BiXjqD3w+oKw== + dependencies: + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/divider" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2-ui/portal" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/menu@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-7.16.3.tgz#3fa4ef6e5d751ddcb60410a2b82764df8a0175a6" @@ -1859,6 +2123,21 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/modal@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-7.16.1.tgz#9c30a9ef1482ae9607c1d138186b58ed3e2a0e36" + integrity sha512-fSx1YsPsfstuVcMalf1ubIGIrWAZt4Dv/LqDSrlklsGGXEoUacmTZwnZOFwWuPGfYehTlHhV6eXcvUHrlM4o0g== + dependencies: + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/center" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/portal" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/modal@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-7.16.3.tgz#f4e46f065e7bd1ada12d64c7a01c106dc98bc488" @@ -1874,6 +2153,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/node@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-7.16.1.tgz#ff68662ace7bd986e538f53049ad4e42dd31d082" + integrity sha512-Vy9zTf4OxYd5sRBurwBCWUi/exzyN/uGLnfna745Gyuu09ldvgu8x5eVUJbykbwSjlei0YkdY3czfutEF/hEqw== + dependencies: + "@dhis2-ui/loader" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/node@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-7.16.3.tgz#59a334aaafad0e5f55ae580ade2545d60024a6e6" @@ -1885,6 +2175,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/notice-box@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-7.16.1.tgz#a176915ba511b2dd581796491a6695e3edee0a64" + integrity sha512-G9oCF2Y/kzaW2kXv+6CkeqSYzwzHWyKItDYE8g5OV4qIq5oMmAFh2nmpsyMAezNFMbjU1taW682NSKcl9H2now== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/notice-box@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-7.16.3.tgz#07fa07ca5cbd2e75b7150c35f91b018248466f65" @@ -1896,6 +2197,19 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/organisation-unit-tree@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-7.16.1.tgz#337c39f2eee6172e6271ce112b42a6d2c3c0787c" + integrity sha512-1X6KW8BJIfxsBUjIzHBToP0LdFCwQGx3W0CJuMNFIf67SOf6K1ZE4kJGkJLD0cN+IvE4O1adPekM32lZwUFZFw== + dependencies: + "@dhis2-ui/checkbox" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/node" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/organisation-unit-tree@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-7.16.3.tgz#fb6785e6b346fe5f524ffff944854cdb4c088b96" @@ -1909,6 +2223,19 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/pagination@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-7.16.1.tgz#83e121200d85b02b4cfd528d4dd2bf8be79fb9a9" + integrity sha512-Li1oDjRnAK51N9u1/IY0jIj6KseI/x5RvIq1oMAIu+OzAQIqRetnmyGmFHPGaZUwvlOVL0HeIbtceUJDSpWrIQ== + dependencies: + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/select" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/pagination@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-7.16.3.tgz#e64ca131b8be5ed16562b3870b5f464bd27cf238" @@ -1922,6 +2249,18 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/popover@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-7.16.1.tgz#f93c0765f7230b5e187164a14105609318f1b038" + integrity sha512-M0ndb8SKuWRd8nUmzQw+TACAVZ9lwrqorC8VdD3xwLCi+gBZXzC8/U8Ofz89pbbYmNC8ER7sVJRpMPqFmIM+SQ== + dependencies: + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/popover@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-7.16.3.tgz#afbb33bad646d94efe0e46cc70fd8ef1723343ab" @@ -1934,6 +2273,19 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/popper@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-7.16.1.tgz#7c455c067e1d3526be26ffe360caf4f28a3b6b72" + integrity sha512-yzi5m+T/Ca6e/4B1ilRK9ryPxN7xAt/gVMNVahbzgaQ6Inv5DwsQSpN+FN0Hzfn3UBcVxChZX/0SjbgFp3TtmA== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@popperjs/core" "^2.10.1" + classnames "^2.3.1" + prop-types "^15.7.2" + react-popper "^2.2.5" + resize-observer-polyfill "^1.5.1" + "@dhis2-ui/popper@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-7.16.3.tgz#bb03bf179558cf245b236f0dd780fe670d7a22bf" @@ -1947,6 +2299,14 @@ react-popper "^2.2.5" resize-observer-polyfill "^1.5.1" +"@dhis2-ui/portal@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-7.16.1.tgz#1f35f01d5b7cda9faefb6a4d349c73eaf2ee79b8" + integrity sha512-4Q4jhiao0c3UtWBBkdnb8vQdJp0nKxwIZRIKxXhBnjSSXNuZSBMGNDOWLdy+gSq1Bs4O4fYDyCSobuPMBT2lVQ== + dependencies: + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/portal@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-7.16.3.tgz#9f350dd4a3f262e6d92f276638a076f7484d2f61" @@ -1955,6 +2315,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/radio@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-7.16.1.tgz#cd26ac3294b554e9ed1e6f017bf1adde33fdb00e" + integrity sha512-Du8Qoi0v0QPthXiFLDGr1OF42JvNh98o6nQVoCFR7Tzr8j/GdSeows0v+Xukg58cuX+PZ8chM3miKw1DqzxjeA== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/radio@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-7.16.3.tgz#86ff8d2dc5992cba8e639e92994f6c837c2b3de6" @@ -1965,6 +2335,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/required@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-7.16.1.tgz#4ded91d0b81f1b12cbd17c86862288e644ca356d" + integrity sha512-JW1qwUum7RZ8ZRKzCLHwmdvW4fNYT4sOIVyPsp8wqxXa91QO2UAGIZuxzV3JXUAKWNsRC/rrl4avHAnGJTcN1A== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/required@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-7.16.3.tgz#20ffa4d94773da7cbecbdeee8a3cfb3808161167" @@ -1975,6 +2355,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/segmented-control@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-7.16.1.tgz#5ebb8c934d5c446eae1ee6588b724d0dbbec078c" + integrity sha512-8s1J87RKO+eQfXH/Q2rXlKdpHLqIDJ9oOlTN5OQYH6AtIG3ZQbV3gKnRyYEakvYpcIRjOmLjMYCr/+ckG6zAUw== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/segmented-control@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-7.16.3.tgz#aabe1755abd5e7be8d9741b8fd0fe017cdee0315" @@ -1985,6 +2375,28 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/select@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-7.16.1.tgz#1961df6b4e2a1989014e2fb24fb707ba0f359d4b" + integrity sha512-wSGrQn0dUhbFvPPfsoR39xjGqYHSMsuRD0jsCOKkx8HWpf7w3ai8vCsazVPuyMgc3GEhEa2Su5XonaA3jtemlw== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/checkbox" "7.16.1" + "@dhis2-ui/chip" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2-ui/status-icon" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/select@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-7.16.3.tgz#4f70c230ab31b311b71b2d28dd6dfcb8ad9bc2d3" @@ -2007,6 +2419,21 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/selector-bar@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-7.16.1.tgz#325c8ca08eb3521021e4795b08777e2cadddc838" + integrity sha512-+9U2Qp55DOyK9SEDpRoRvzDKjRW88y2LhDPIC/J20YpkLJkmFrGiMiIFckj4vkW1f6GU7v9+MDflg2Ho27b2Zw== + dependencies: + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + "@testing-library/react" "^12.1.2" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/selector-bar@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-7.16.3.tgz#f1a4b910aeca81f4eebd49c5792c579ba9c90726" @@ -2022,6 +2449,32 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/sharing-dialog@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-7.16.1.tgz#857ee67315e65cacb03af6638d30a95f048aadc9" + integrity sha512-yy9xEfAdYF6u1nS1HIvRu0xsNMUPQfd31RT7nEnkfUY9yUZ2J+z3sh9dFrq3pHiS0P6vpgwff9H92tz0UagQQA== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/divider" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/menu" "7.16.1" + "@dhis2-ui/modal" "7.16.1" + "@dhis2-ui/notice-box" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2-ui/select" "7.16.1" + "@dhis2-ui/tab" "7.16.1" + "@dhis2-ui/tooltip" "7.16.1" + "@dhis2-ui/user-avatar" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + "@react-hook/size" "^2.1.2" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/sharing-dialog@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-7.16.3.tgz#e92f9736432576568c87e8b643eddb6b636b6d8a" @@ -2048,6 +2501,18 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/status-icon@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-7.16.1.tgz#e1401434d71bc7197e3eac51f932d68a07cce205" + integrity sha512-JQ57I72YkijP8CuFO36zoc9LKnRlwCp+FZ7X0AdB0a566GFg77UnWSMQBJwmxzlwarKh6689xjyn7sEECOi4HA== + dependencies: + "@dhis2-ui/loader" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/status-icon@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-7.16.3.tgz#d23f75ba6b45aac83810ea40ac04b17bd65ee0d7" @@ -2060,6 +2525,18 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/switch@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-7.16.1.tgz#2de9a3b32f590ede4fce027044969cb6cb898ac1" + integrity sha512-OkiL2WEpnllr9K/XBh9qiQlqH839fXEJlzuFSSvg2uZMyl/lFYq1Kg+YyjhynLSUQ6BXSasj5Es1rCkgGTok5A== + dependencies: + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/required" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/switch@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-7.16.3.tgz#a6dc9724c64e5e6f2aad89e4aa0160d46ad89041" @@ -2072,6 +2549,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/tab@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-7.16.1.tgz#33be09f6ca9a431e22bd93d6a34fe4015884f675" + integrity sha512-4kT6TDDolRcc1eNUPEarItZckXw8CK2IIij3U58OiX3bYr7tIuqLk6VjT+nf2stK85eHID4eXBGUNEb5u+4QPg== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/tab@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-7.16.3.tgz#17f7089867fc8d27b546bbe0eb1e66f3f5a20f03" @@ -2083,6 +2571,17 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/table@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-7.16.1.tgz#0143f110c1d6cf1c969d38287d2b90b731fb9fea" + integrity sha512-8srMW9JtPTZzUZEgKN020nzUnhIBLxaBIJEAmsEiL1otXaJZFXeh7tdPSYb/U9t+E6w/uh4C/oF7irll80YmOg== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/table@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-7.16.3.tgz#b3674a8e41b42a11877b8d1d1c6d634dcef12f6c" @@ -2094,6 +2593,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/tag@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-7.16.1.tgz#daab8ff299df440b76012dcc4d5a730ca7337244" + integrity sha512-tQy9orjbw/1aVhHuEZC2z9tLNCSvoFK88WYGdZqBp0rq6lJ3MbEH0p0rDNxXBwGHlkr0kokdRjOwQ+OyyvbU2g== + dependencies: + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/tag@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-7.16.3.tgz#4d9f733c0bfdbae4c95471c5dc03770b6563a353" @@ -2104,6 +2613,21 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/text-area@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-7.16.1.tgz#483352d4e1b1e2d5300a3c6ea6fa3e8857088d69" + integrity sha512-BLlo/GW8zmWkMfYRe83LhvaoFm/bMagXm7j8a4ZOiwjkV+jBM0QmBrSEhSGwgkiZuLegdIdZUNqdPbVsX7VKmw== + dependencies: + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/status-icon" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/text-area@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-7.16.3.tgz#682cf4e3588f5423f53ff603437e89cc55e2c10b" @@ -2119,6 +2643,18 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/tooltip@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-7.16.1.tgz#11012e72641a984025ba68f1a3482c4f8ab38d88" + integrity sha512-RV59JEv3QJCSVTlGoJlXoosyfqlImmWuJGdNzSpF82HSPfeq481OWYu9T+yRZoN0CoBrWyUIXbfWMZTreGFLZg== + dependencies: + "@dhis2-ui/popper" "7.16.1" + "@dhis2-ui/portal" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/tooltip@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-7.16.3.tgz#002c2072f49779ce972cd1ed8e6f4cb24bb587da" @@ -2131,6 +2667,21 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/transfer@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-7.16.1.tgz#d13ffb2307ab616dff1cdfac45db523c1b2a0d24" + integrity sha512-gBqQn8IdNz6Kc0T4exopAfQaxKXvQwV6Gkf+mSoUMmZZVl7LiN8d8gZD/OpX6z1953vSHEQZZzutCtRqDMhIeA== + dependencies: + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/intersection-detector" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/transfer@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-7.16.3.tgz#bbeca5a6924f341bf22747833101d8e88d3b9859" @@ -2146,6 +2697,16 @@ classnames "^2.3.1" prop-types "^15.7.2" +"@dhis2-ui/user-avatar@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-7.16.1.tgz#e5dff939a8a087d0989c33b383b825c5cc08495e" + integrity sha512-t1ErXfwDm1CtKPa1QuZtGhkVm4xgEMKkoY6Z27AMNcGuyydJ4RsF2VBFm64DNPLwoQgiKg/IXYv/QNXZaI8wYA== + dependencies: + "@dhis2/prop-types" "^3.0.0" + "@dhis2/ui-constants" "7.16.1" + classnames "^2.3.1" + prop-types "^15.7.2" + "@dhis2-ui/user-avatar@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-7.16.3.tgz#0f67ef8824b9c81b8971078970bd33f9433c6e7a" @@ -2368,6 +2929,13 @@ workbox-routing "^6.1.5" workbox-strategies "^6.1.5" +"@dhis2/ui-constants@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-7.16.1.tgz#8c13e8979a2f74fa7c06864aa6ee3f9d44272697" + integrity sha512-aQIpSEeCSdtqy6RsKm0Td2RBL/G4mUBrGB5yJbaqnxUosJRdLsXIeQUTl4nEkFLsqQBXEDQHGhWhH5EyxIcJ1w== + dependencies: + prop-types "^15.7.2" + "@dhis2/ui-constants@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-7.16.3.tgz#5aefadf8ec6f057bb16fef3c77ea357d4ecf7780" @@ -2375,6 +2943,26 @@ dependencies: prop-types "^15.7.2" +"@dhis2/ui-forms@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-7.16.1.tgz#7ca3e0dc45e1a443e04574d2ea5849d87b85551c" + integrity sha512-T6HfG96wcVlvMZ7OIS9c7zUViZZiHCGJr6E3z2kv2DauNjOACb3PpBp8fFHMzYKI1PLcsxd9lW1N+j3xLJBraQ== + dependencies: + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/checkbox" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/file-input" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/radio" "7.16.1" + "@dhis2-ui/select" "7.16.1" + "@dhis2-ui/switch" "7.16.1" + "@dhis2-ui/text-area" "7.16.1" + "@dhis2/prop-types" "^3.0.0-beta.1" + classnames "^2.3.1" + final-form "^4.20.2" + prop-types "^15.7.2" + react-final-form "^6.5.3" + "@dhis2/ui-forms@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-7.16.3.tgz#a72bbd635ca7faa1432dadd676981e1d8ab27160" @@ -2395,12 +2983,71 @@ prop-types "^15.7.2" react-final-form "^6.5.3" +"@dhis2/ui-icons@7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-7.16.1.tgz#4fde5ae3a70e3e1582c28246d8261fc9ae45b898" + integrity sha512-d1l1uoOsMXme7IifxAxElIAq0CXyw9n62JQk3iiLJtsFuBmRN0la0YnJZoD6HBUubMxrdCsCycZU/tgOothQ0w== + "@dhis2/ui-icons@7.16.3": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-7.16.3.tgz#86ecd617688f9d9d63de3b29ca5d8a236aa03190" integrity sha512-G+/a74qCAxV04aVFOxCbP9s0sEMXUPGGMZn2kLRnrRsLNcSy6/d6h2EoCa1ASs0nOXvacl1mOHyfv2QXMEy7RA== -"@dhis2/ui@^7.1.1", "@dhis2/ui@^7.2.0": +"@dhis2/ui@^7.16.1": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-7.16.1.tgz#3cea3a1f6f637456c7bd32dfdb0e3080dca81f06" + integrity sha512-Kb+V+sCwua74K6KKnDRbRuodPfUCzXshvXyYWivRHAXxzppJuoNty5mmZSawx6DFIM7Bay93YJ4b7aTcqeqqWg== + dependencies: + "@dhis2-ui/alert" "7.16.1" + "@dhis2-ui/box" "7.16.1" + "@dhis2-ui/button" "7.16.1" + "@dhis2-ui/card" "7.16.1" + "@dhis2-ui/center" "7.16.1" + "@dhis2-ui/checkbox" "7.16.1" + "@dhis2-ui/chip" "7.16.1" + "@dhis2-ui/cover" "7.16.1" + "@dhis2-ui/css" "7.16.1" + "@dhis2-ui/divider" "7.16.1" + "@dhis2-ui/field" "7.16.1" + "@dhis2-ui/file-input" "7.16.1" + "@dhis2-ui/header-bar" "7.16.1" + "@dhis2-ui/help" "7.16.1" + "@dhis2-ui/input" "7.16.1" + "@dhis2-ui/intersection-detector" "7.16.1" + "@dhis2-ui/label" "7.16.1" + "@dhis2-ui/layer" "7.16.1" + "@dhis2-ui/legend" "7.16.1" + "@dhis2-ui/loader" "7.16.1" + "@dhis2-ui/logo" "7.16.1" + "@dhis2-ui/menu" "7.16.1" + "@dhis2-ui/modal" "7.16.1" + "@dhis2-ui/node" "7.16.1" + "@dhis2-ui/notice-box" "7.16.1" + "@dhis2-ui/organisation-unit-tree" "7.16.1" + "@dhis2-ui/pagination" "7.16.1" + "@dhis2-ui/popover" "7.16.1" + "@dhis2-ui/popper" "7.16.1" + "@dhis2-ui/portal" "7.16.1" + "@dhis2-ui/radio" "7.16.1" + "@dhis2-ui/required" "7.16.1" + "@dhis2-ui/segmented-control" "7.16.1" + "@dhis2-ui/select" "7.16.1" + "@dhis2-ui/selector-bar" "7.16.1" + "@dhis2-ui/sharing-dialog" "7.16.1" + "@dhis2-ui/switch" "7.16.1" + "@dhis2-ui/tab" "7.16.1" + "@dhis2-ui/table" "7.16.1" + "@dhis2-ui/tag" "7.16.1" + "@dhis2-ui/text-area" "7.16.1" + "@dhis2-ui/tooltip" "7.16.1" + "@dhis2-ui/transfer" "7.16.1" + "@dhis2-ui/user-avatar" "7.16.1" + "@dhis2/ui-constants" "7.16.1" + "@dhis2/ui-forms" "7.16.1" + "@dhis2/ui-icons" "7.16.1" + prop-types "^15.7.2" + +"@dhis2/ui@^7.2.0": version "7.16.3" resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-7.16.3.tgz#f4557ad78e0a4f7b3615b62454eece3d289a0113" integrity sha512-jcdLApboK1cAsK1Euz6l3gxdmsiz7Kjm4nmYgofka7Qv5fEwrAC9M/CE2G+K7w8Q7PEv4pOyP2DatbnlVTymZg== @@ -3258,13 +3905,12 @@ react-error-boundary "^3.1.0" "@testing-library/react@^12.1.2": - version "12.1.3" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.3.tgz#ef26c5f122661ea9b6f672b23dc6b328cadbbf26" - integrity sha512-oCULRXWRrBtC9m6G/WohPo1GLcLesH7T4fuKzRAKn1CWVu9BzXtqLXDDTA6KhFNNtRwLtfSMr20HFl+Qrdrvmg== + version "12.1.2" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.2.tgz#f1bc9a45943461fa2a598bb4597df1ae044cfc76" + integrity sha512-ihQiEOklNyHIpo2Y8FREkyD1QAea054U0MVbwH1m8N9TxeFz+KoJ9LkqoKqJlzx2JDm56DVwaJ1r36JYxZM05g== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.0.0" - "@types/react-dom" "*" "@tootallnate/once@1": version "1.1.2" @@ -3439,10 +4085,10 @@ resolved "https://registry.yarnpkg.com/@types/raf-schd/-/raf-schd-4.0.1.tgz#1f9e03736f277fe9c7b82102bf18570a6ee19f82" integrity sha512-Ha+EnKHFIh9EKW0/XZJPUd3EGDFisEvauaBd4VVCRPKeOqUxNEc9TodiY2Zhk33XCgzJucoFEcaoNcBAPHTQ2A== -"@types/react-dom@*", "@types/react-dom@>=16.9.0": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809" - integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ== +"@types/react-dom@>=16.9.0": + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.8.tgz#3180de6d79bf53762001ad854e3ce49f36dd71fc" + integrity sha512-0ohAiJAx1DAUEcY9UopnfwCE9sSMDGnY/oXjWMax6g3RpzmTt2GMyMVAXcbn0mo8XAff0SbQJl2/SBU+hjSZ1A== dependencies: "@types/react" "*" @@ -7069,9 +7715,9 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-accessibility-api@^0.5.4, dom-accessibility-api@^0.5.9: - version "0.5.13" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.13.tgz#102ee5f25eacce09bdf1cfa5a298f86da473be4b" - integrity sha512-R305kwb5CcMDIpSHUnLyIAp7SrSPBx6F0VfQFB3M75xVMHhXJJIdePYgbPPh1o57vCHNu5QztokWUPsLjWzFqw== + version "0.5.11" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.11.tgz#79d5846c4f90eba3e617d9031e921de9324f84ed" + integrity sha512-7X6GvzjYf4yTdRKuCVScV+aA9Fvh5r8WzWrXBH9w82ZWB/eYDMGCnazoC/YAqAzUJWHzLOnZqr46K3iEyUhUvw== dom-converter@^0.2: version "0.2.0" @@ -8259,9 +8905,9 @@ fill-range@^7.0.1: to-regex-range "^5.0.1" final-form@^4.20.2: - version "4.20.2" - resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.2.tgz#c820b37d7ebb73d71169480256a36c7e6e6c9155" - integrity sha512-5i0IxqwjjPG1nUNCjWhqPCvQJJ2R+QwTwaAnjPmFnLbyjIHWuBPU8u+Ps4G3TcX2Sjno+O5xCZJzYcMJEzzfCQ== + version "4.20.6" + resolved "https://registry.yarnpkg.com/final-form/-/final-form-4.20.6.tgz#da42f3741db068c0c875e18950a2c4a9a148c63e" + integrity sha512-fCdwIj49KOaFfDRlXB57Eo+GghIMZQWrA9TakQI3C9uQxHwaFHXqZSNRlUdfnQmNNeySwGOaGPZCvjy58hyv4w== dependencies: "@babel/runtime" "^7.10.0" @@ -13810,16 +14456,7 @@ prompts@2.4.0, prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -prop-types@^15.8.1: +prop-types@^15, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -14083,13 +14720,13 @@ react-fast-compare@^3.0.1: integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== react-final-form@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.3.tgz#b60955837fe9d777456ae9d9c48e3e2f21547d29" - integrity sha512-FCs6GC0AMWJl2p6YX7kM+a0AvuSLAZUgbVNtRBskOs4g984t/It0qGtx51O+9vgqnqk6JyoxmIzxKMq+7ch/vg== + version "6.5.8" + resolved "https://registry.yarnpkg.com/react-final-form/-/react-final-form-6.5.8.tgz#08b17bc6d4124300a9f2ea1f6b2e608150d3bab0" + integrity sha512-j8Rmr5zAaMliNbh+CPnY734exHfk7MjQ8I6ZcykcChmPDFPV2aF40PFAcmQ/KreA10AI8ew0tff6q0gVqwFaGA== dependencies: - "@babel/runtime" "^7.12.1" + "@babel/runtime" "^7.15.4" -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14363,9 +15000,9 @@ regenerator-runtime@^0.12.0: integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg== regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.14.2: version "0.14.5" From 0be4e8fe8a18bfb114df0ebba3d43c72bd1e512d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Wed, 9 Feb 2022 15:51:17 +0000 Subject: [PATCH 2/6] fix: bump @dhis2/prop-types --- package.json | 1 - src/pages/home/HomeCard/HomeCard.js | 2 +- yarn.lock | 9 +-------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 525c0591..2a702b24 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ "dependencies": { "@dhis2/app-runtime": "^3.3.0", "@dhis2/d2-i18n": "^1.1.0", - "@dhis2/prop-types": "^2.0.3", "@dhis2/ui": "^7.16.1", "prop-types": "^15.6.0", "react-router-dom": "^5.0.0" diff --git a/src/pages/home/HomeCard/HomeCard.js b/src/pages/home/HomeCard/HomeCard.js index b0ee4803..62180586 100644 --- a/src/pages/home/HomeCard/HomeCard.js +++ b/src/pages/home/HomeCard/HomeCard.js @@ -1,5 +1,5 @@ import { Card } from '@dhis2/ui' -import { PropTypes } from 'prop-types' +import PropTypes from 'prop-types' import React from 'react' import { Link } from 'react-router-dom' import styles from './HomeCard.module.css' diff --git a/yarn.lock b/yarn.lock index 7c7a0714..30fde802 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2906,13 +2906,6 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/prop-types@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-2.0.3.tgz#7ed8235851c73d059edc1731c913090a626e7ec6" - integrity sha512-z9gzgHYRTcPay8+wcNVFgSB9LVw8mCYLz6ZEbP5Yyi8xmvExIx/Mzulbo71vFgREixyca5toiyBYgDzja5SFwg== - dependencies: - prop-types "^15" - "@dhis2/prop-types@^3.0.0", "@dhis2/prop-types@^3.0.0-beta.1": version "3.0.0" resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.0.0.tgz#a17dd1b8475ab7e4e66c736624ac83fd372876af" @@ -14456,7 +14449,7 @@ prompts@2.4.0, prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== From d6d051006d9563584e5d32644dd5ae12eae68dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Fri, 11 Feb 2022 12:40:03 +0000 Subject: [PATCH 3/6] refactor(analytics): extract analytics loading logic --- src/pages/data-integrity/use-data-integrity.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/data-integrity/use-data-integrity.js b/src/pages/data-integrity/use-data-integrity.js index 44a46169..bccda064 100644 --- a/src/pages/data-integrity/use-data-integrity.js +++ b/src/pages/data-integrity/use-data-integrity.js @@ -23,7 +23,7 @@ export const useDataIntegrity = () => { return data }, }) - const [startDataIntegrityCheck, { loading, error, data }] = useDataMutation( + const [startDataIntegrityCheck, { loading, error }] = useDataMutation( startDataIntegrityCheckMutation, { onComplete: (data) => { @@ -32,11 +32,11 @@ export const useDataIntegrity = () => { }, } ) - const isPolling = data && (!poll.data || poll.data?.size === 0) + const isPolling = !poll.data || poll.data?.size === 0 return { startDataIntegrityCheck, - loading: loading || isPolling, + loading: loading || poll.polling, error: error || poll.error, issues: !isPolling && poll.data, } From 90a5d2bf786870748832d643fe80bd7365026868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9di-R=C3=A9mi=20Hashim?= Date: Wed, 2 Mar 2022 11:30:08 +0000 Subject: [PATCH 4/6] wip --- d2.config.js | 2 + i18n/en.pot | 105 +--------------- src/pages/data-integrity/DataIntegrity.js | 96 ++++++++++++--- .../data-integrity/DataIntegrity.module.css | 3 + src/pages/data-integrity/Issues/IssueCard.js | 97 --------------- .../Issues/IssueCard.module.css | 40 ------- src/pages/data-integrity/Issues/Issues.js | 112 ------------------ .../data-integrity/Issues/Issues.module.css | 3 - src/pages/data-integrity/Section.js | 103 ++++++++++++++++ src/pages/data-integrity/Section.module.css | 10 ++ src/pages/data-integrity/Severity.js | 47 ++++++++ src/pages/data-integrity/SeverityPropType.js | 10 ++ .../data-integrity/use-data-integrity.js | 43 ------- 13 files changed, 257 insertions(+), 414 deletions(-) create mode 100644 src/pages/data-integrity/DataIntegrity.module.css delete mode 100644 src/pages/data-integrity/Issues/IssueCard.js delete mode 100644 src/pages/data-integrity/Issues/IssueCard.module.css delete mode 100644 src/pages/data-integrity/Issues/Issues.js delete mode 100644 src/pages/data-integrity/Issues/Issues.module.css create mode 100644 src/pages/data-integrity/Section.js create mode 100644 src/pages/data-integrity/Section.module.css create mode 100644 src/pages/data-integrity/Severity.js create mode 100644 src/pages/data-integrity/SeverityPropType.js delete mode 100644 src/pages/data-integrity/use-data-integrity.js diff --git a/d2.config.js b/d2.config.js index 1b29a636..487f8d87 100644 --- a/d2.config.js +++ b/d2.config.js @@ -4,6 +4,8 @@ const config = { title: 'Data Administration', coreApp: true, + minDHIS2Version: '2.38', + entryPoints: { app: './src/App.js', }, diff --git a/i18n/en.pot b/i18n/en.pot index d54258c4..26e15c74 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -408,114 +408,15 @@ msgstr "Batch Deletion" msgid "No lock exceptions to show." msgstr "No lock exceptions to show." +msgid "Failed to load available data integrity checks" +msgstr "Failed to load available data integrity checks" + msgid "Checking data integrity..." msgstr "Checking data integrity..." msgid "Run integrity checks" msgstr "Run integrity checks" -msgid "{{issueTitle}} ({{issueElementsCount}})" -msgstr "{{issueTitle}} ({{issueElementsCount}})" - -msgid "Data elements without data set" -msgstr "Data elements without data set" - -msgid "Data elements without groups" -msgstr "Data elements without groups" - -msgid "Data elements violating exclusive group sets" -msgstr "Data elements violating exclusive group sets" - -msgid "Data elements assigned to data sets with different period types" -msgstr "Data elements assigned to data sets with different period types" - -msgid "Data sets not assigned to organisation units" -msgstr "Data sets not assigned to organisation units" - -msgid "Indicators with identical formulas" -msgstr "Indicators with identical formulas" - -msgid "Indicators without groups" -msgstr "Indicators without groups" - -msgid "Invalid indicator numerators" -msgstr "Invalid indicator numerators" - -msgid "Invalid indicator denominators" -msgstr "Invalid indicator denominators" - -msgid "Indicators violating exclusive group sets" -msgstr "Indicators violating exclusive group sets" - -msgid "Organisation units with cyclic references" -msgstr "Organisation units with cyclic references" - -msgid "Orphaned organisation units" -msgstr "Orphaned organisation units" - -msgid "Organisation units without groups" -msgstr "Organisation units without groups" - -msgid "Organisation units violating exclusive group sets" -msgstr "Organisation units violating exclusive group sets" - -msgid "Organisation unit groups without group sets" -msgstr "Organisation unit groups without group sets" - -msgid "Validation rules without groups" -msgstr "Validation rules without groups" - -msgid "Invalid validation rule left side expressions" -msgstr "Invalid validation rule left side expressions" - -msgid "Invalid validation rule right side expressions" -msgstr "Invalid validation rule right side expressions" - -msgid "Invalid program indicator expressions" -msgstr "Invalid program indicator expressions" - -msgid "Invalid program indicator filters" -msgstr "Invalid program indicator filters" - -msgid "There are data elements in the form, but not in the form or sections" -msgstr "There are data elements in the form, but not in the form or sections" - -msgid "Invalid category combinations" -msgstr "Invalid category combinations" - -msgid "Duplicate periods" -msgstr "Duplicate periods" - -msgid "Program rules with no condition" -msgstr "Program rules with no condition" - -msgid "Program rules with no action" -msgstr "Program rules with no action" - -msgid "Program rules with no priority" -msgstr "Program rules with no priority" - -msgid "Program rule variables with no data element" -msgstr "Program rule variables with no data element" - -msgid "Program rule variables with no attribute" -msgstr "Program rule variables with no attribute" - -msgid "Program rule actions with no data object" -msgstr "Program rule actions with no data object" - -msgid "Program rule actions with no notification" -msgstr "Program rule actions with no notification" - -msgid "Program rule actions with no section id" -msgstr "Program rule actions with no section id" - -msgid "Program rule actions with no stage id" -msgstr "Program rule actions with no stage id" - -msgid "Program indicators with no expression" -msgstr "Program indicators with no expression" - msgid "Indicators" msgstr "Indicators" diff --git a/src/pages/data-integrity/DataIntegrity.js b/src/pages/data-integrity/DataIntegrity.js index 7862513b..e3c282c5 100644 --- a/src/pages/data-integrity/DataIntegrity.js +++ b/src/pages/data-integrity/DataIntegrity.js @@ -1,26 +1,78 @@ +import { useDataQuery } from '@dhis2/app-runtime' import i18n from '@dhis2/d2-i18n' -import { Button, NoticeBox } from '@dhis2/ui' +import { CenteredContent, CircularLoader, Button, NoticeBox } from '@dhis2/ui' import PropTypes from 'prop-types' -import React from 'react' +import React, { useState } from 'react' import PageHeader from '../../components/PageHeader/PageHeader.js' import { i18nKeys } from '../../i18n-keys.js' -import Issues from './Issues/Issues.js' -import { useDataIntegrity } from './use-data-integrity.js' +import styles from './DataIntegrity.module.css' +import Section from './Section.js' -const DataIntegrity = ({ sectionKey }) => { - const { startDataIntegrityCheck, loading, error, issues } = - useDataIntegrity() +const query = { + checks: { + resource: 'dataIntegrity', + }, +} + +const groupChecks = (checks) => + checks.reduce((groupedChecks, check) => { + if (!(check.section in groupedChecks)) { + groupedChecks[check.section] = [] + } + groupedChecks[check.section].push(check) + return groupedChecks + }, {}) + +const DataIntegrity = () => { + const { loading, error, data } = useDataQuery(query) + const [selectedChecks, setSelectedChecks] = useState(new Set()) + // XXX + const [submitting, setSubmitting] = useState(false) + + const startDataIntegrityCheck = () => { + setSubmitting(true) + } + + if (loading) { + return ( + + + + ) + } + + if (error) { + return ( + + {error.message} + + ) + } + + const groupedChecks = groupChecks(data.checks) return ( <> - - {error && {error.message}} - {issues && } - @@ -28,8 +80,18 @@ const DataIntegrity = ({ sectionKey }) => { ) } -DataIntegrity.propTypes = { +const DataIntegrityPage = ({ sectionKey }) => ( + <> + + + +) + +DataIntegrityPage.propTypes = { sectionKey: PropTypes.string.isRequired, } -export default DataIntegrity +export default DataIntegrityPage diff --git a/src/pages/data-integrity/DataIntegrity.module.css b/src/pages/data-integrity/DataIntegrity.module.css new file mode 100644 index 00000000..05af34ab --- /dev/null +++ b/src/pages/data-integrity/DataIntegrity.module.css @@ -0,0 +1,3 @@ +.noticeBox { + max-width: 400px; +} diff --git a/src/pages/data-integrity/Issues/IssueCard.js b/src/pages/data-integrity/Issues/IssueCard.js deleted file mode 100644 index b7351f69..00000000 --- a/src/pages/data-integrity/Issues/IssueCard.js +++ /dev/null @@ -1,97 +0,0 @@ -import i18n from '@dhis2/d2-i18n' -import { Card } from '@dhis2/ui' -import PropTypes from 'prop-types' -import React from 'react' -import styles from './IssueCard.module.css' - -const Content = ({ content }) => { - const renderValue = (value) => - Array.isArray(value) ? value.join(', ') : value - - if (Array.isArray(content)) { - return content.map((element) => ( -

{renderValue(element)}

- )) - } else { - return Object.entries(content).map(([element, value]) => ( -
-

{element}

-

{renderValue(value)}

-
- )) - } -} - -Content.propTypes = { - content: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), -} - -const Title = ({ title, type }) => ( -

- {title} -

-) - -Title.propTypes = { - title: PropTypes.string.isRequired, - type: PropTypes.string.isRequired, -} - -const countElements = (content) => { - const sum = (arr) => - arr.reduce((acc, element) => { - return acc + countElements(element) - }, 0) - - if (Array.isArray(content)) { - return sum(content) - } else if (typeof content === 'object') { - return sum(Object.values(content)) - } else { - return 1 - } -} - -const IssueCard = ({ title, content }) => { - const elementsCount = countElements(content) - - return ( - - {elementsCount > 0 ? ( -
- - - </summary> - <div className={styles.cardText}> - <Content content={content} /> - </div> - </details> - ) : ( - <Title title={title} type="valid" /> - )} - </Card> - ) -} - -IssueCard.propTypes = { - title: PropTypes.string.isRequired, - content: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), -} - -IssueCard.defaultProps = { - content: [], -} - -export default IssueCard diff --git a/src/pages/data-integrity/Issues/IssueCard.module.css b/src/pages/data-integrity/Issues/IssueCard.module.css deleted file mode 100644 index a1f027b7..00000000 --- a/src/pages/data-integrity/Issues/IssueCard.module.css +++ /dev/null @@ -1,40 +0,0 @@ -.card { - padding: var(--spacers-dp12); - margin-bottom: var(--spacers-dp12); -} - -.cardText { - font-size: 14px; -} - -.card h3 { - font-size: 14px; - font-weight: 500; - margin: 0; -} - -.card p { - margin-top: 0; - margin-bottom: 5px; -} - -.title { - display: inline; - font-weight: 500; - font-size: 16px; - margin: 0; -} - -.validTitle { - composes: title; - color: var(--colors-green600); -} - -.invalidTitle { - composes: title; - color: var(--colors-red600); -} - -details[open] .cardHeader { - margin-bottom: var(--spacers-dp12); -} diff --git a/src/pages/data-integrity/Issues/Issues.js b/src/pages/data-integrity/Issues/Issues.js deleted file mode 100644 index d534cb79..00000000 --- a/src/pages/data-integrity/Issues/Issues.js +++ /dev/null @@ -1,112 +0,0 @@ -import i18n from '@dhis2/d2-i18n' -import PropTypes from 'prop-types' -import React from 'react' -import IssueCard from './IssueCard.js' -import styles from './Issues.module.css' - -const controls = { - dataElementsWithoutDataSet: i18n.t('Data elements without data set'), - dataElementsWithoutGroups: i18n.t('Data elements without groups'), - dataElementsViolatingExclusiveGroupSets: i18n.t( - 'Data elements violating exclusive group sets' - ), - dataElementsAssignedToDataSetsWithDifferentPeriodTypes: i18n.t( - 'Data elements assigned to data sets with different period types' - ), - dataSetsNotAssignedToOrganisationUnits: i18n.t( - 'Data sets not assigned to organisation units' - ), - indicatorsWithIdenticalFormulas: i18n.t( - 'Indicators with identical formulas' - ), - indicatorsWithoutGroups: i18n.t('Indicators without groups'), - invalidIndicatorNumerators: i18n.t('Invalid indicator numerators'), - invalidIndicatorDenominators: i18n.t('Invalid indicator denominators'), - indicatorsViolatingExclusiveGroupSets: i18n.t( - 'Indicators violating exclusive group sets' - ), - organisationUnitsWithCyclicReferences: i18n.t( - 'Organisation units with cyclic references' - ), - orphanedOrganisationUnits: i18n.t('Orphaned organisation units'), - organisationUnitsWithoutGroups: i18n.t('Organisation units without groups'), - organisationUnitsViolatingExclusiveGroupSets: i18n.t( - 'Organisation units violating exclusive group sets' - ), - organisationUnitGroupsWithoutGroupSets: i18n.t( - 'Organisation unit groups without group sets' - ), - validationRulesWithoutGroups: i18n.t('Validation rules without groups'), - invalidValidationRuleLeftSideExpressions: i18n.t( - 'Invalid validation rule left side expressions' - ), - invalidValidationRuleRightSideExpressions: i18n.t( - 'Invalid validation rule right side expressions' - ), - invalidProgramIndicatorExpressions: i18n.t( - 'Invalid program indicator expressions' - ), - invalidProgramIndicatorFilters: i18n.t('Invalid program indicator filters'), - dataElementsInDataSetNotInForm: i18n.t( - 'There are data elements in the form, but not in the form or sections' - ), - invalidCategoryCombos: i18n.t('Invalid category combinations'), - duplicatePeriods: i18n.t('Duplicate periods'), - programRulesWithNoCondition: i18n.t('Program rules with no condition'), - programRulesWithNoAction: i18n.t('Program rules with no action'), - programRulesWithNoPriority: i18n.t('Program rules with no priority'), - programRuleVariablesWithNoDataElement: i18n.t( - 'Program rule variables with no data element' - ), - programRuleVariablesWithNoAttribute: i18n.t( - 'Program rule variables with no attribute' - ), - programRuleActionsWithNoDataObject: i18n.t( - 'Program rule actions with no data object' - ), - programRuleActionsWithNoNotification: i18n.t( - 'Program rule actions with no notification' - ), - programRuleActionsWithNoSectionId: i18n.t( - 'Program rule actions with no section id' - ), - programRuleActionsWithNoStageId: i18n.t( - 'Program rule actions with no stage id' - ), - programIndicatorsWithNoExpression: i18n.t( - 'Program indicators with no expression' - ), -} - -const Issues = ({ issues }) => { - const errorElementskeys = Object.keys(issues) - - return ( - <div className={styles.issues}> - {errorElementskeys.map((element) => { - const label = controls[element] - if (!label) { - return null - } - return ( - <IssueCard - key={element} - title={label} - content={issues[element]} - /> - ) - })} - {Object.keys(controls) - .filter((element) => !errorElementskeys.includes(element)) - .map((element) => ( - <IssueCard key={element} title={controls[element]} /> - ))} - </div> - ) -} - -Issues.propTypes = { - issues: PropTypes.object.isRequired, -} - -export default Issues diff --git a/src/pages/data-integrity/Issues/Issues.module.css b/src/pages/data-integrity/Issues/Issues.module.css deleted file mode 100644 index 96dbb605..00000000 --- a/src/pages/data-integrity/Issues/Issues.module.css +++ /dev/null @@ -1,3 +0,0 @@ -.issues { - margin-bottom: var(--spacers-dp16); -} diff --git a/src/pages/data-integrity/Section.js b/src/pages/data-integrity/Section.js new file mode 100644 index 00000000..f89e4f94 --- /dev/null +++ b/src/pages/data-integrity/Section.js @@ -0,0 +1,103 @@ +import i18n from '@dhis2/d2-i18n' +import { + Checkbox, + DataTable, + DataTableHead, + DataTableBody, + DataTableRow, + DataTableColumnHeader, + DataTableCell, +} from '@dhis2/ui' +import PropTypes from 'prop-types' +import React from 'react' +import styles from './Section.module.css' +import Severity from './Severity' +import SeverityPropType from './SeverityPropType' + +const Section = ({ name, checks, selectedChecks, setSelectedChecks }) => { + const allSelected = checks.every(check => selectedChecks.has(check.name)) + const handleToggle = ({ value: checkName }) => { + const newSelectedChecks = new Set(selectedChecks) + if (selectedChecks.has(checkName)) { + newSelectedChecks.delete(checkName) + } else { + newSelectedChecks.add(checkName) + } + setSelectedChecks(newSelectedChecks) + } + const handleToggleAll = () => { + const newSelectedChecks = new Set(selectedChecks) + if (allSelected) { + for (const check of checks) { + newSelectedChecks.delete(check.name) + } + } else { + for (const check of checks) { + newSelectedChecks.add(check.name) + } + } + setSelectedChecks(newSelectedChecks) + } + + return ( + <section key={name} className={styles.section}> + <h2 className={styles.sectionName}>{name}</h2> + <DataTable> + <DataTableHead> + <DataTableRow> + <DataTableColumnHeader width="48px"> + <Checkbox + onChange={handleToggleAll} + checked={allSelected} + /> + </DataTableColumnHeader> + <DataTableColumnHeader> + {i18n.t('Check')} + </DataTableColumnHeader> + <DataTableColumnHeader> + {i18n.t('Description')} + </DataTableColumnHeader> + <DataTableColumnHeader> + {i18n.t('Severity')} + </DataTableColumnHeader> + </DataTableRow> + </DataTableHead> + <DataTableBody> + {checks.map(({ name, description, severity }) => ( + <DataTableRow key={name}> + <DataTableCell width="48px"> + <Checkbox + onChange={handleToggle} + value={name} + /> + </DataTableCell> + <DataTableCell> + {/* TODO: use name as i18n key */} + {name} + </DataTableCell> + <DataTableCell>{description}</DataTableCell> + <DataTableCell> + <Severity severity={severity} /> + </DataTableCell> + </DataTableRow> + ))} + </DataTableBody> + </DataTable> + </section> + ) +} + +Section.propTypes = { + checks: PropTypes.arrayOf( + PropTypes.shape({ + name: PropTypes.string.isRequired, + severity: SeverityPropType.isRequired, + description: PropTypes.string, + }).isRequired + ).isRequired, + name: PropTypes.string.isRequired, + selectedChecks: PropTypes.instanceOf(Set).isRequired, + setSelectedChecks: PropTypes.func.isRequired, +} + +export default Section diff --git a/src/pages/data-integrity/Section.module.css b/src/pages/data-integrity/Section.module.css new file mode 100644 index 00000000..5de75c93 --- /dev/null +++ b/src/pages/data-integrity/Section.module.css @@ -0,0 +1,10 @@ +.section { + margin-bottom: var(--spacers-dp16); +} + +.sectionName { + font-weight: 500; + font-size: 18px; + margin-top: 0; + margin-bottom: var(--spacers-dp8); +} diff --git a/src/pages/data-integrity/Severity.js b/src/pages/data-integrity/Severity.js new file mode 100644 index 00000000..e50456dd --- /dev/null +++ b/src/pages/data-integrity/Severity.js @@ -0,0 +1,47 @@ +import i18n from '@dhis2/d2-i18n' +import { Tag, Tooltip } from '@dhis2/ui' +import React from 'react' +import SeverityPropType from './SeverityPropType' + +const severities = { + INFO: { + displayName: i18n.t('Information'), + description: i18n.t('For information only'), + }, + WARNING: { + displayName: i18n.t('Warning'), + description: i18n.t('May be a problem, but not necessarily an error'), + }, + SEVERE: { + displayName: i18n.t('Severe'), + description: i18n.t( + 'An error which should be fixed, but which may not necessarily lead to the system not functioning' + ), + }, + CRITICAL: { + displayName: i18n.t('Critical'), + description: i18n.t( + 'An error which must be fixed, and which may lead to end-user error or system crashes' + ), + }, +} + +const Severity = ({ severity }) => { + const { displayName, description } = severities[severity] + + return ( + <Tooltip + content={description} + neutral={severity === 'INFO'} + negative={severity === 'CRITICAL' || severity === 'SEVERE'} + > + <Tag>{displayName}</Tag> + </Tooltip> + ) +} + +Severity.propTypes = { + severity: SeverityPropType.isRequired, +} + +export default Severity diff --git a/src/pages/data-integrity/SeverityPropType.js b/src/pages/data-integrity/SeverityPropType.js new file mode 100644 index 00000000..ffa144d8 --- /dev/null +++ b/src/pages/data-integrity/SeverityPropType.js @@ -0,0 +1,10 @@ +import PropTypes from 'prop-types' + +const SeverityPropType = PropTypes.oneOf([ + 'INFO', + 'WARNING', + 'SEVERE', + 'CRITICAL', +]) + +export default SeverityPropType diff --git a/src/pages/data-integrity/use-data-integrity.js b/src/pages/data-integrity/use-data-integrity.js deleted file mode 100644 index bccda064..00000000 --- a/src/pages/data-integrity/use-data-integrity.js +++ /dev/null @@ -1,43 +0,0 @@ -import { useDataMutation } from '@dhis2/app-runtime' -import { usePoll } from '../../hooks/use-poll.js' - -const startDataIntegrityCheckMutation = { - resource: 'dataIntegrity', - type: 'create', -} - -const pollQuery = { - resource: 'system/taskSummaries/DATA_INTEGRITY', - id: ({ jobId }) => jobId, -} - -export const useDataIntegrity = () => { - const poll = usePoll({ - query: pollQuery, - interval: 3000, - checkDone: (data) => { - // On 2.37 and 2.38, an empty HTTP response is sent instead of `null` - if (data instanceof Blob && data.size === 0) { - return false - } - return data - }, - }) - const [startDataIntegrityCheck, { loading, error }] = useDataMutation( - startDataIntegrityCheckMutation, - { - onComplete: (data) => { - const { id: jobId } = data.response - poll.start({ jobId }) - }, - } - ) - const isPolling = !poll.data || poll.data?.size === 0 - - return { - startDataIntegrityCheck, - loading: loading || poll.polling, - error: error || poll.error, - issues: !isPolling && poll.data, - } -} From eb67ecd564f708bfb4f3980e9c8fb6960d8b3891 Mon Sep 17 00:00:00 2001 From: Hendrik de Graaf <hendrik@dhis2.org> Date: Tue, 10 Jan 2023 11:50:43 +0100 Subject: [PATCH 5/6] chore: update pot file --- i18n/en.pot | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index 26e15c74..e7b57b88 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2022-03-02T11:44:10.658Z\n" -"PO-Revision-Date: 2022-03-02T11:44:10.658Z\n" +"POT-Creation-Date: 2023-01-09T13:31:16.632Z\n" +"PO-Revision-Date: 2023-01-09T13:31:16.632Z\n" msgid "Open user guide" msgstr "Open user guide" @@ -417,6 +417,47 @@ msgstr "Checking data integrity..." msgid "Run integrity checks" msgstr "Run integrity checks" +msgid "Check" +msgstr "Check" + +msgid "Description" +msgstr "Description" + +msgid "Severity" +msgstr "Severity" + +msgid "Information" +msgstr "Information" + +msgid "For information only" +msgstr "For information only" + +msgid "Warning" +msgstr "Warning" + +msgid "May be a problem, but not necessarily an error" +msgstr "May be a problem, but not necessarily an error" + +msgid "Severe" +msgstr "Severe" + +msgid "" +"An error which should be fixed, but which may not necessarily lead to the " +"system not functioning" +msgstr "" +"An error which should be fixed, but which may not necessarily lead to the " +"system not functioning" + +msgid "Critical" +msgstr "Critical" + +msgid "" +"An error which must be fixed, and which may lead to end-user error or " +"system crashes" +msgstr "" +"An error which must be fixed, and which may lead to end-user error or " +"system crashes" + msgid "Indicators" msgstr "Indicators" From db7bbcc6c958471778980112c2f75c61f76e55a2 Mon Sep 17 00:00:00 2001 From: Hendrik de Graaf <hendrik@dhis2.org> Date: Tue, 10 Jan 2023 14:31:56 +0100 Subject: [PATCH 6/6] chore: format files --- src/pages/data-integrity/Section.js | 6 +++--- src/pages/data-integrity/Severity.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/data-integrity/Section.js b/src/pages/data-integrity/Section.js index f89e4f94..c952cf50 100644 --- a/src/pages/data-integrity/Section.js +++ b/src/pages/data-integrity/Section.js @@ -11,11 +11,11 @@ import { import PropTypes from 'prop-types' import React from 'react' import styles from './Section.module.css' -import Severity from './Severity' -import SeverityPropType from './SeverityPropType' +import Severity from './Severity.js' +import SeverityPropType from './SeverityPropType.js' const Section = ({ name, checks, selectedChecks, setSelectedChecks }) => { - const allSelected = checks.every(check => selectedChecks.has(check.name)) + const allSelected = checks.every((check) => selectedChecks.has(check.name)) const handleToggle = ({ value: checkName }) => { const newSelectedChecks = new Set(selectedChecks) if (selectedChecks.has(checkName)) { diff --git a/src/pages/data-integrity/Severity.js b/src/pages/data-integrity/Severity.js index e50456dd..008311f6 100644 --- a/src/pages/data-integrity/Severity.js +++ b/src/pages/data-integrity/Severity.js @@ -1,7 +1,7 @@ import i18n from '@dhis2/d2-i18n' import { Tag, Tooltip } from '@dhis2/ui' import React from 'react' -import SeverityPropType from './SeverityPropType' +import SeverityPropType from './SeverityPropType.js' const severities = { INFO: {