From 87723a422da551547d0ea0c32cb624317c18a045 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Thu, 31 Aug 2023 11:02:13 +0200 Subject: [PATCH 1/2] chore(deps): upgrade several dependencies (#2686) --- package.json | 12 +- yarn.lock | 976 +++++++++++++++++++++++++-------------------------- 2 files changed, 494 insertions(+), 494 deletions(-) diff --git a/package.json b/package.json index 2a42d9dc4..1c7d50478 100644 --- a/package.json +++ b/package.json @@ -5,15 +5,15 @@ "private": true, "license": "BSD-3-Clause", "dependencies": { - "@dhis2/analytics": "^25.1.15", - "@dhis2/app-runtime": "^3.9.3", + "@dhis2/analytics": "^26.0.17", + "@dhis2/app-runtime": "^3.9.4", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.1", "@dhis2/d2-ui-core": "^7.4.3", "@dhis2/d2-ui-interpretations": "^7.4.3", "@dhis2/d2-ui-mentions-wrapper": "^7.4.3", "@dhis2/d2-ui-rich-text": "^7.4.3", - "@dhis2/ui": "^8.13.11", + "@dhis2/ui": "^8.14.0", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", "d2": "^31.10.0", @@ -50,14 +50,14 @@ "cy:capture": "cypress_dhis2_api_stub_mode=CAPTURE yarn d2-utils-cypress run --appStart 'yarn cypress:start'" }, "devDependencies": { - "@dhis2/cli-app-scripts": "^10.3.9", + "@dhis2/cli-app-scripts": "^10.3.10", "@dhis2/cli-style": "^10.5.1", "@dhis2/cli-utils-cypress": "^7.0.1", "@dhis2/cypress-commands": "^7.0.1", "@testing-library/jest-dom": "^6.1.2", - "@testing-library/react": "^12.0.0", + "@testing-library/react": "^12", "d2-manifest": "^1.0.0", - "eslint-plugin-cypress": "^2.11.3", + "eslint-plugin-cypress": "^2.14.0", "immutability-helper": "^3.1.1", "patch-package": "^7", "postinstall-postinstall": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index 1ce41abe1..b6b4e5627 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1578,592 +1578,592 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@dhis2-ui/alert@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.13.11.tgz#6f754331c04cdb4b4206fce7b928b57dacb4f2a9" - integrity sha512-/h9m4GcpY/0nYNRDqoV/4VB3mPNB27uKZvcid2rQ2pitnzDCTr+Rd5XSOppNxRw8Ur470YkTVO0+DNh8jrUxTw== +"@dhis2-ui/alert@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-8.14.0.tgz#38ea79acf0606355eace4dfe1fd1356ed2d58e67" + integrity sha512-PjPa+XascXLC/fynFeMEPfbOCktuBofPbCZPIRHvoWBR3qParT92/uRE2Ao5Wdlz2aPN4RF+4n8VAauhYCqWCw== dependencies: - "@dhis2-ui/portal" "8.13.11" + "@dhis2-ui/portal" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/box@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.13.11.tgz#f6b42e99c4e4638dd16c36594342ece5336593d6" - integrity sha512-+S+lkdUEYnbB6oe/BI87cJXMfJZJs4unGNvEAFJnqPBUMQc+0YvnI6AZUyyNMTXCXw+bA0qt2E2hrfGdGjJLaw== +"@dhis2-ui/box@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-8.14.0.tgz#b95f6885c30962c9389ef6e9a4b1c3c9d4a317da" + integrity sha512-/Nvv4hIcie1ESj3TatsZuv/nRcTFodsOdZVjxbJu6cnO5sh+Dx9L9bSyA7KlBIKP4kN0ivzi1exw7OmidLBmJA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/button@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.13.11.tgz#eea1dfb741967a26d751e3ebbe2591adef797204" - integrity sha512-2Q/W2IS0Hlkd+aehoeoTdZRgjBnEgPI7UFV698Y3VUlW7fD9SVqx3EmkfAtyLHGhkfnicZew6E00T0zyI7bVJA== +"@dhis2-ui/button@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-8.14.0.tgz#bcd21a45ac76d282d86a4a3e40c0133f2e6fd089" + integrity sha512-46ELNzA1eV14dxblYNTXN4dKRNGdnXx/+xP4lvqGrw/11SgMNMeqtf6JBxNCFKoZj3zKlcFUG2RD/FOANC/tNg== dependencies: - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/popper" "8.13.11" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/popper" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/calendar@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.13.11.tgz#63baf8a9a5ca96596a60b9cf8a14b1743af422b2" - integrity sha512-zYG1NYxFbnPPTGT16vveutccT5oeB/BIKoJxWTjMLOxj2kvlWDaiGNbUHSqcItvrVlktGrmlwbSgoK7IvBQF8g== +"@dhis2-ui/calendar@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-8.14.0.tgz#829335a22e41e3823e534853bbec73775a254d72" + integrity sha512-jEI/m7FHpjAHrqo4G3Vf4DeBTdu3yvLenWpoSwV9nioioLr2n6h0eTLNqpuR784xmEQ9YbWat1SMl0enekgHmw== dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/popper" "8.13.11" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/popper" "8.14.0" "@dhis2/multi-calendar-dates" "1.0.2" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/card@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.13.11.tgz#302cb163f5992fd7c494d6c00ee8f373976a3786" - integrity sha512-vXBBsARxgSMDqRdfhQwYC3iCPHzNSh4rI+CBMXoqELeJsLdoYQDY+jSnBO9sV8Jmoah7zHSnEutTGbfQBzus9g== +"@dhis2-ui/card@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-8.14.0.tgz#1284f93c643ba22164192ea9d70c66967b6ee3fe" + integrity sha512-PDjYFTBWu4cf43xENylluIvMpC+G913fYsUmPgpq8ToWxrsUK8ObXzOMUAivKQTvavi9CB0UhqwlkqSVLMdYXQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/center@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.13.11.tgz#19f10c200920f576894b9177ec64d5fb4ca0075b" - integrity sha512-tz4J6PMrieiy4XaerdDnsajCxg9LS6mNnODWKC5PPQcMgk9cnFp6bjpDKZynHh0cCpEyqsKDJkz4hW7fsOly9A== +"@dhis2-ui/center@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-8.14.0.tgz#6b74acb9730a3200748ef32b6878e402f9172ee0" + integrity sha512-bdL/lh5YUld5RRRJ+CW5APs5NI9kKZ63HCbN7cJ0iKzldjAP6DXLoXxFc8WVURy4i/lXTzAkLLPJDIqN1V0OOA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/checkbox@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.13.11.tgz#5a01e903989c5fc10ed6ca75b4573e2b62487387" - integrity sha512-FPXxP64NCRbzLchfe0/2YHutFuGabtMH1y2q/2Z2XJKvsxt4KnzCgT7AsaoskFcGoprq0+xV+4ikcQbKLnk3Mw== +"@dhis2-ui/checkbox@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-8.14.0.tgz#4e747df029782460ac6c74ca4ce5c369f335ca42" + integrity sha512-sZ7FWDEE29nJFjMcmE0RB6D/fT9KKgpRZ5vtUzFTVdGXDSzun0MiOqTLEK9yqitPi18tex2Gu+mcu/ohx/bO9g== dependencies: - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/required" "8.13.11" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/required" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/chip@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.13.11.tgz#3a94ae9ae4c20e06a28f93bfb68037d42d41280c" - integrity sha512-I7LfR2FwvPXG/NG2vQM9nMpINf/E8y4dl6IIu1pojPL068wye7dZJY6biIZdu+4qZ1P+8gDFgw3mLH8uWsjGag== +"@dhis2-ui/chip@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-8.14.0.tgz#5fe751772fae2453335d7dbec188ce7e8e93a7d7" + integrity sha512-vKgvKL0n2IvCFswODOxcEEocy62IYviHxzSt5zX+5k4AcZjWIgX+yJy4ixyR2nu8rtgJDSR4c5k++dnLiWWqMQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/cover@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.13.11.tgz#680f1745d795f098842922d037e4df0260f3f771" - integrity sha512-9HkQRlVLfYGcEk3CzhllAKhIMInwZnodHj6Gqc/c++4fjx4lJNsY09XnRWVfU4UBUex/jHiUb5Pl+P787g+0fA== +"@dhis2-ui/cover@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-8.14.0.tgz#4e7aabdc8a7bb8dee6221b53edfbd7e8faf3bee1" + integrity sha512-gHbqciNccPWlfdIyKleXloTZ1CCmMLmJr8sB9F2PP/u/dqdGUMMwQvhWtzadqqRYHey5Get8oEbkBkXngiAJ/A== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/css@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.13.11.tgz#f1a4d669a7d49ef5f1dfc1e648970aeecb0d3396" - integrity sha512-EQ5C5Dc4Wm1EAeVoUZxWI0U63pd8v8pciUyFtTq0x82BF0tXTK/9jjuvnImlS76Wm74MYbHQaYn6h7O1ShBjbA== +"@dhis2-ui/css@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-8.14.0.tgz#68902ea5cadbf5879ba64b0156c4b3436787493c" + integrity sha512-Y/ZZJ2v7HpG6weBOFoNp2HzqNn/HTfuNkMjhjmuqbF/4ZyoDv/Fs6cNhMQSkI4Nt0aRBUAfF4x1IWf+s2jT5YQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/divider@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.13.11.tgz#fab8c8871b89a156622baad236c9e4c39f308b66" - integrity sha512-4KnKw0MB0HGF6SGBiXHdQgIEaSiHJtGVxix3pMZ8UHMe484RmQm22Dhc7ZfaEnTXBWAr2KPC0NG/UZFK8qfbxQ== +"@dhis2-ui/divider@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-8.14.0.tgz#aab56542073bce43452f0ec09b2f0452da88ff33" + integrity sha512-RsjYuDd6XZwpchjp/J4Yo+qt3F5OJvQNX5nB11iVTJPUMr/wztPJZUQwBOTNt44gNFOLktgJEl60okRhP4P1lg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/field@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.13.11.tgz#c680010ad018910d9b6abec53cad110dbff6d8f4" - integrity sha512-49vDnMA1aYlN/3trzHPC18EIDzHH0NrrwSFQ5q8XkiOiBqLYq4kNXX4i8YYkhLkM+cABPuziOw6YhR0bWhddJg== +"@dhis2-ui/field@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-8.14.0.tgz#3ae79b901d1fda86fa0d623730cc5130685097b5" + integrity sha512-1pnWNy8T7B1zNx1BNyTNefu5fddFaF59FdmcA0jCGoNHbTnq488pTnwOxFzIew3Mme0sg7XYD7E+BkZ5fZhEAg== dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/help" "8.13.11" - "@dhis2-ui/label" "8.13.11" + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/help" "8.14.0" + "@dhis2-ui/label" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/file-input@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.13.11.tgz#f72f5d62bb46d25c2424fb9b68597f1b5671e2ac" - integrity sha512-t2Ls829VYLAvikXzZiPWXQFXg97UUXWP828acgGQYBZKF0wsIz1J9/77znOgV2iWCHTQsOzz3ca8OePT7/m/ug== +"@dhis2-ui/file-input@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-8.14.0.tgz#b9de9b24a7beab582d5a35cce6ac06ce842db7fc" + integrity sha512-LSPoODLf84Dl+hcFzgfSlP1JfBPSngiobHSOhMCZZiK6qPintuE4bY36BfZXvWJZUmSOQZvTGvrmAPLJ4YqTSg== dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/label" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/status-icon" "8.13.11" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/label" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/status-icon" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/header-bar@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.13.11.tgz#24173fe00870da9c9bf4db9c0120a80be7ef8e55" - integrity sha512-FpEcP2avPmudR2+BNbPCllOjphV0dSFTZwpcsZHZnlC1PChCiUj5ftzWymSuCbEeYpSA7gWBAIWKEPdtHMzeeQ== - dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/center" "8.13.11" - "@dhis2-ui/divider" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/logo" "8.13.11" - "@dhis2-ui/menu" "8.13.11" - "@dhis2-ui/modal" "8.13.11" - "@dhis2-ui/user-avatar" "8.13.11" +"@dhis2-ui/header-bar@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-8.14.0.tgz#90a104c89b76d87a602f1aa964b5379ea3043dbe" + integrity sha512-UeL5VSlxpMcvSg2eNVW1qJC/QwEaXqI4M89VaMNEVPSmGDEqdOdzvb2ENxgiee52dGR+y/KFKddLOqbKe+KfnA== + dependencies: + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/center" "8.14.0" + "@dhis2-ui/divider" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/logo" "8.14.0" + "@dhis2-ui/menu" "8.14.0" + "@dhis2-ui/modal" "8.14.0" + "@dhis2-ui/user-avatar" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" moment "^2.29.1" prop-types "^15.7.2" -"@dhis2-ui/help@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.13.11.tgz#1783e6ffa81574368e9b280e066eec413cb54e52" - integrity sha512-u3QMhrRXeSGHDekgs/F/I0DvZWy1355Xs/V3dn3nSr8UgOyKGhbQBeTGPtXM5DrlKBkxnq/C78nYjzyAKvDgFA== +"@dhis2-ui/help@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-8.14.0.tgz#8e77cc7521a2222d640a528b3e1c6cb3669b1af2" + integrity sha512-z5OoPNH3VvIm5xjxAaHb3eBsuo7CSgYGBUOiBgiwmXpost482Eh+5FNtKScqSxiae1/7LkndYm7nar52bRxz9g== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/input@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.13.11.tgz#7d34ff02aa4bae0260b23c9724b1607364b05873" - integrity sha512-iELgimNfKYO0ERzx+WELjL6uWT1AhI3IGSCiRo6XzDSxTS/ntbDfnfbXnXMcSitGlax0gDWE6DJ5qEflOOchaA== +"@dhis2-ui/input@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-8.14.0.tgz#f1fa8a94e32f91f41e66f3ac1f299eafdc1a1a3a" + integrity sha512-tdCARoqRAN5eE4LHv6XmzwR4Rl+eRUSQZgX4ARkCUMP4Bkxpl2S+Q9pnnvZJvHzcQkQx9lXDiJF/WPzaaOx+sQ== dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/status-icon" "8.13.11" + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/status-icon" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/intersection-detector@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.13.11.tgz#eacc3efa14ad21161454d357cce2da0a7cade85b" - integrity sha512-64Eel4Y4WDkTNiVe/ZEZfj51TtsDB7X/ribxNxYWNWN6kIKGObcf2NoPV2FdfRgAF3AWmQl78Oae8R4EgnknRQ== +"@dhis2-ui/intersection-detector@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-8.14.0.tgz#8fde840ec164f6da270f5fae5b264d90b99496b8" + integrity sha512-J4lUqjcHVZBrCpUp/DVSbr3F2pp/LnXnc48CdQ04+vgS3kEt6mUtf7s7mQMshAI57Kcv7AZciHkQNYxWooqXBA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/label@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.13.11.tgz#c7b7f6e71f63075962bac21190edcce88b9f0a51" - integrity sha512-B6ugpNqtzWhjL0DZ9XwvEa9f8C793sXoMKWE5xivrhsN6Iq/k0TgDrZhwI0iyKIavCnyzlIB3Qg22QxjWKHfDw== +"@dhis2-ui/label@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-8.14.0.tgz#8354be4b02d242869e58aef4ccb20e3cb1d73e23" + integrity sha512-5tqs7+8Fu9zk4f/cQFAogUnOAsYm1RltSRhEuajGqHd/Glgsz5dU5jPu4ixUgqv43qdIrvkCpLZdjVDJRKriTQ== dependencies: - "@dhis2-ui/required" "8.13.11" + "@dhis2-ui/required" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/layer@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.13.11.tgz#85f74c313cb8acb7b06775962e169ad2f9324fa5" - integrity sha512-j8u3s+ReKwOfSGn9Rq5wVfhuGVMWCMRa6pUrIfn8pSCbI1r1O73o3kL21G9H77qMG5gPS1QnAruJJER1Ew8n9Q== +"@dhis2-ui/layer@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-8.14.0.tgz#eb2fdf2d4cf48b03186187950f4e066e71af3f8e" + integrity sha512-Qcek91Cb7S4FV3aGc4drbBF2KISD8QeUuKUKeorGsibL/iZo+0i1Ng9hJMj6VF4fi+6cItW9n9vrwi8TZyuu4A== dependencies: - "@dhis2-ui/portal" "8.13.11" + "@dhis2-ui/portal" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/legend@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.13.11.tgz#d8f2e7c0b7611742299383074f78aa747c49d601" - integrity sha512-++BMaey6YhpYpM+Vb9RqRlmGriibzfpJT6eR1uF7LUQwqbphuhmA3fSRHqUpTgtGhuukRzfD7Rm6kZdgO4jBVw== +"@dhis2-ui/legend@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-8.14.0.tgz#171a42e671011095c8e61306f6cbdd7d867850c4" + integrity sha512-wQjdg718TZXBps1vJLMMveF/EEB9qg6pWuo4xELXjUTjVWBe7ej4BxMgMM/iLGZPef0ceFCHOj0JREd2tmgpJQ== dependencies: - "@dhis2-ui/required" "8.13.11" + "@dhis2-ui/required" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/loader@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.13.11.tgz#3d3467a071362401a84c4552ebca1fcbc16d4a6a" - integrity sha512-nK2+FQTgkXzpjhA0pHMrVCxCcHQtxlyXmrdseeLqa1N5hlOhwWUAMlcDHWhEkVZPdSbsuVEJqNEW7uFHhrS+fg== +"@dhis2-ui/loader@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-8.14.0.tgz#ecfb58523f8950d7da8bc472ceb3a379e8df1027" + integrity sha512-uF4QxUsSf7imnjxCSdLrLXtm979kBoypTxGKBg9Hl1ROQfxQX/vIyw5Mn2sE5Zi1MCyvet5kpmMxQFI3B84jzQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/logo@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.13.11.tgz#6d938ccf6498cdd635c49ee8d83697ed8e85bfb6" - integrity sha512-MU1llLOLsG4ysrHOj1a5DxfZsHCj+z3fyCox5KWZJ+73A/ke07qRqnLmEtjp/KKZ7kxDPFjZWLpkdg3JMQmnGg== +"@dhis2-ui/logo@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-8.14.0.tgz#c7488d8c8c5ccffa85cbb61f114e5444d66b4dbe" + integrity sha512-jPhHYLSN09j0yJONUjvE5ZqyU4btCmJ+OpQxZJUrVzQOj1XYq/xjqOZwaHFKPx15WAg1U+NyVDER0rS4+xnIow== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/menu@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.13.11.tgz#1de3be9ef24d60ce1bc3af2dcf454bc35bbd026d" - integrity sha512-kcWuwKzvHp/SUp+T4yEGqiaAHQ/5hBBHIiUJCIMm8zHy1qfJmYh14oAz0i1M/hHB8VAhCPr7Jf7/m3voGnAJ6g== +"@dhis2-ui/menu@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-8.14.0.tgz#633e3fa728808c21b7752d51be536853de7694fd" + integrity sha512-LAASOtWZtgs7eXRcS5Jld+6J2K/QDvA8bQDoShgsq9eKu22ucPXkS2BS2osI414u2CRKZBATodEsybnHy35gMA== dependencies: - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/divider" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/popper" "8.13.11" - "@dhis2-ui/portal" "8.13.11" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/divider" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/popper" "8.14.0" + "@dhis2-ui/portal" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/modal@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.13.11.tgz#43bf9c030d7334a778919e2a4face6783a494ffa" - integrity sha512-O/VBrnQdXNU1uRmV1Aq1aFLXSXe6zbbtq1N4DgwyHeuQxDqlXcPdA8ERXa88InysI2Al2VQ++QdLKicwVyQ0kA== +"@dhis2-ui/modal@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-8.14.0.tgz#201b05a0448bf1ea1be6c33a5feb242e51e3b20b" + integrity sha512-hQSQb1kfiNqY+BlTA0UZ6mSuxJ0BjjJ1RrYmT0/3EZlmZ3SqgblKQ3Hs3RaKwqfE6OPV6zTIBi+zJkE/c1UgKA== dependencies: - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/center" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/portal" "8.13.11" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/center" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/portal" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/node@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.13.11.tgz#4c0b769fe7b6f87b89dce1b7aac852070679566e" - integrity sha512-KTPnrBTHLk24YArNQb6bvDZBphslwGxG/gFIAZEf+IWDRZI5JEDXlbIXxFNesUQB3KOc+Bl8s6Bq+2GKNerREw== +"@dhis2-ui/node@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-8.14.0.tgz#20a1ec87419b5667a6ef0fba2d272629ba4f0dbe" + integrity sha512-4s9N2pR9WQ1VYRc4vFFVTY17bSBz6wbQR3y2ju83McZoNQdyUsMWFqVxmX7WbKg6Tlzkxs6/+liNja2rcHb4AQ== dependencies: - "@dhis2-ui/loader" "8.13.11" + "@dhis2-ui/loader" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/notice-box@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.13.11.tgz#6e1271b25afbdc9f35571e5359a4e1444cbe676b" - integrity sha512-RIDVAJ9BjTTifpWHUaDLjn1zI7V92dNuDFhOJizXyUFduc7DbZ72/GZ9RmtzJXsLbO2+9J3IoklhP8CJseZbog== +"@dhis2-ui/notice-box@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-8.14.0.tgz#f4d290c186b0e8ad0969e1e4833e1cb7e37847d5" + integrity sha512-CG9UX9ywSW9E+5/qDJq4re9Wb1Vh5r6B/LZT3hMyg3Dx3QMWd3fZOTw+/utLRTCChx6/E67DM19qgYD+kFfXTg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/organisation-unit-tree@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.13.11.tgz#82721340ed3b52583b402d0460810ca1ce67fbff" - integrity sha512-RTTrQkWnpBR2+snPkSb8OFpE47U1ij/fX6hgRmebleY1ARWbkdeTUdDH3FsDIyEnHLyHkm14ds5Y1rHNRfPAJg== +"@dhis2-ui/organisation-unit-tree@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-8.14.0.tgz#189b9b8f14d54a5ba749f337d44c8e22e1c31774" + integrity sha512-BvtrWCOqRuIXNNJe+oyFvuB2w3VMJexe3RXH4UiRrne5XddJGz2eVhDCHK3KAOkv2BnJJiXN0w51+8LAdg4Sgw== dependencies: - "@dhis2-ui/checkbox" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/node" "8.13.11" + "@dhis2-ui/checkbox" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/node" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/pagination@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.13.11.tgz#dafe48a5a9104d453741e4265ddf2367cf94a880" - integrity sha512-mDNDQxJRbCuB5pLI3Dj5qjSU/4ZQEVJhkh8NAPoWpikJmP4eob4TB1zx0iFragdYNfHO0BLaTKZVvt2HBGpMZw== +"@dhis2-ui/pagination@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-8.14.0.tgz#5d15df324a3f0f0adeefab8477d29e346e20651d" + integrity sha512-BlyY1yAI2lQFz1H8CD/tyR3SePoNO3ydhnShW34oChOqzPBIxunPUS4UPziHd6O9yuFtREKAp1HOWGuTIXoGLQ== dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/select" "8.13.11" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/select" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popover@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.13.11.tgz#3bd2b2c97574a83582c6930976fd290e40e90361" - integrity sha512-Uw4JgxVckqOsJBoyyMLKuEcLZfbZ4f8jjW0ckPdlj8fN8vZOaSt6jzWUOViXItPf5k9NaTx8zVvuV8DevC54/A== +"@dhis2-ui/popover@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-8.14.0.tgz#02d1fc80dc242887365570852e4ca203538cadc6" + integrity sha512-Db6pxOw9+P1Ps7SQ8HuCb/HhflcrRIGh/gF7m5cHh7MqqP0z/l1a5xai7NjhZe7IUPxmsWnnOvb5qY99eqKpTA== dependencies: - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/popper" "8.13.11" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/popper" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/popper@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.13.11.tgz#35c1b7efa10bd6cffd33e530931abdb1e93c2110" - integrity sha512-BpvFcpDo0W1uMSP4+FjO7TMHH/UhMhLjtStfOYrS0DaCvAg6QyVUSCMnoPru0gxy5nZTNxj5aP3vCMXgIAO4FQ== +"@dhis2-ui/popper@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-8.14.0.tgz#27ab6fb881224b70c69f857b4327e62208b7e0fe" + integrity sha512-lXoL6f6Z6A1atc/ivz2ixCOwy5EqFSeT3eP7pDhjLbsRb6gaEEiPjSSZMikNRAWnyFoyw7D2Cn7YWW+rCyk4iw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" "@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/portal@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.13.11.tgz#e1086e63fdeab2f208114e9a66accb7e2d3fafaf" - integrity sha512-d2cRvIJYuu2H+Tfc5p0Kr48JgsiKmKEud9n3Qaj31e3+cM8bVklgPInFaZOCChh4aKzwjrkzxsHc78yECIvoDw== +"@dhis2-ui/portal@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-8.14.0.tgz#4f2cfd67cd5d2c3f5905ab593d4ddf14fb823dd6" + integrity sha512-GDu1gL4UxZR7Nnz2atEinhE9rea91BH1y2FVJyfH0D596vDbBkqVrZ/PbkJ4lozT9YH2HWIdhMJHFI2fXAZEPQ== dependencies: classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/radio@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.13.11.tgz#0ee99d5e8fe993fd20b55f7e87651e4c5cb1be78" - integrity sha512-GRsF3WjGvJG7m30WNew0iz0D0ysXTLyb5bOdgRM8c3KjB7i1W8iHPXm2jiGdyCJJZ9Fp+swqcLbDGtwFVPyWIA== +"@dhis2-ui/radio@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-8.14.0.tgz#c484bc00132af186d09207fe3519e06eb674d2da" + integrity sha512-p/u/zlh3qDZF5FFrfzhaQz+/evpSdlXWONnMOq1DwO83s7M8/Rr/nnS0NO3f0Q8rHB+zix3NXZO2QwnOGbOGcw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/required@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.13.11.tgz#ac1b5a7e5054e7650dd5713b512d890877f585bf" - integrity sha512-m2I2Ja5r/hkQcH2F4SLdutq3nwIoopIuT0uUbNuIcIacSttwgZYw8Co9cFqtHog4j/lrloNeDG9Q72sM9e7/EQ== +"@dhis2-ui/required@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-8.14.0.tgz#67ec4a725d98180fd14aceb3654dfa2c141f3b79" + integrity sha512-qqr92tk0hSeClWzevMTrflPw6GqBgBNO/00yLgOTUBdBPq//mnzHjNZV8n14tSwAGxogt0ybh0oqg5rB1GXHzg== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/segmented-control@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.13.11.tgz#139430dc94f2864d816b35feeae6c061422e953e" - integrity sha512-vU1p2ptJTkrT9tIpN/ClK+2iDDuPjb+N+vCHiPSF37nUzFhMCN9knpHbEvwrHYpxHvEajaQGqwGYrgzc6CilyA== +"@dhis2-ui/segmented-control@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-8.14.0.tgz#450aad42bdd9b8d7e97dcc9137649d0afb48cff7" + integrity sha512-UG37XmkJUDlB3jjj/7EuvC8FURfxuVKN96XOaljEkRXUN4SRDUMkwqQYhKQuk0WP9ihz0ZJHwIbVMiz9KM+eLQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/select@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.13.11.tgz#b72206e9b1821e9edb2efc6a5d941e6b9f98f4bb" - integrity sha512-gW4eB00TkY8GBWrzigvlUAe0bv8jSZ/ffpdqYgkkL7V/Exdr5Jn2iSsAVhf3gvjnBCDOBJE9lbgrXoh07CsNdA== - dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/checkbox" "8.13.11" - "@dhis2-ui/chip" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/popper" "8.13.11" - "@dhis2-ui/status-icon" "8.13.11" +"@dhis2-ui/select@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-8.14.0.tgz#06f0af5436646d70c1f5a13961fbf0e16071a62f" + integrity sha512-g8HBE/QqJ3U3IwKOh9UiVlbJ/TlPmQNO+Iby8uK+dcV/5H4lXo/6dwgRQxEwnxi5XIhpnpoh5FZ4axAGs6ZrWA== + dependencies: + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/checkbox" "8.14.0" + "@dhis2-ui/chip" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/popper" "8.14.0" + "@dhis2-ui/status-icon" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/selector-bar@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.13.11.tgz#48c707e1f16a000c3aa2c16b93d8f3916b02eca9" - integrity sha512-5+K2dv8gxd+GWKa5U+v/LNjgavX9v6spu/BUlqzce5luGf0ZPorxx0PWhOj9IdRPsk+fgugzddXevUkcVYrLBw== - dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/popper" "8.13.11" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" +"@dhis2-ui/selector-bar@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-8.14.0.tgz#6fefe936008f0ff9297eab2e596b3c1bd88127c3" + integrity sha512-eU1NtQfYNA28PQAD4Plfc4Ai9rIfr2sJUW5cZ8aQB6c5JO6kIq5F+oXsaL3uLz5oWyq2SbnhBCXlei1BOW/I5Q== + dependencies: + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/popper" "8.14.0" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" "@testing-library/react" "^12.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/sharing-dialog@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.13.11.tgz#ad8d65e5ec783cf0215a8efb3b16a6e9149e48fb" - integrity sha512-0yzWa4pSZrrAEZWqvwVqAnilru/d+gz7JgiM8ljNC1jTVqGKC5SnIQoNE8awup7W7K/9eJvHEj7IXDIZO1imEQ== - dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/divider" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/menu" "8.13.11" - "@dhis2-ui/modal" "8.13.11" - "@dhis2-ui/notice-box" "8.13.11" - "@dhis2-ui/popper" "8.13.11" - "@dhis2-ui/select" "8.13.11" - "@dhis2-ui/tab" "8.13.11" - "@dhis2-ui/tooltip" "8.13.11" - "@dhis2-ui/user-avatar" "8.13.11" +"@dhis2-ui/sharing-dialog@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-8.14.0.tgz#4978f5c84be69b7b290ca28784f0eefa55deb58d" + integrity sha512-PyeWQD0rYypf7kjX/D/3K957rYiQMfRMli4Wb1Rk87KlUxV4DAl9wtliH2zQhmCoplPXMwdbfnf+hLA7yCiCKg== + dependencies: + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/divider" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/menu" "8.14.0" + "@dhis2-ui/modal" "8.14.0" + "@dhis2-ui/notice-box" "8.14.0" + "@dhis2-ui/popper" "8.14.0" + "@dhis2-ui/select" "8.14.0" + "@dhis2-ui/tab" "8.14.0" + "@dhis2-ui/tooltip" "8.14.0" + "@dhis2-ui/user-avatar" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" "@react-hook/size" "^2.1.2" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/status-icon@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.13.11.tgz#c5b877d51ccc0c4fb4c62081f98101a498ce23d3" - integrity sha512-qiV//TZAyiKQ4B+/Ac+8Ds5EX6Zyu3Q4+Ek7o/Dvw7OakY7BUR4sE6cE2Y7wj6szdZGarG1LvafFo4ljYqzP2Q== +"@dhis2-ui/status-icon@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-8.14.0.tgz#de4e2ca1eca34e9cdcd2e7cd12f1a7ec0ac48009" + integrity sha512-s/KgFzoAorBLf3XVmD3d3Zyobsbgv19UR+5dLRAKgKtV4aT3bm7UgDvJdzApl9fElmeLCv/Ic7aTS2Y6aRWseQ== dependencies: - "@dhis2-ui/loader" "8.13.11" + "@dhis2-ui/loader" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/switch@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.13.11.tgz#a804d951549161adc98480d8a58e6ecdaf5bf592" - integrity sha512-kCguGy5u+jAgyiiizCEleYyPjzEegtxSfIpaa64V2dRTjv8fFoUKcsfAstVzUQ4/MpgNtu8PZ3++nkZ+g1mjcA== +"@dhis2-ui/switch@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-8.14.0.tgz#23f1b43fe8461d7bca8e287facab445233209129" + integrity sha512-jPSrsqcSkPXRs/EnyUgr0duBQAs0a2j75vJEfULUPXGx2RQUk71WjJy+WNh4iq89En8abvGu2DvEX15wX2uXNQ== dependencies: - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/required" "8.13.11" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/required" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tab@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.13.11.tgz#44d06ed28581f4c0f78c3d7320bd0d71fc775bf7" - integrity sha512-H+omNuMu3E2MU+X6/rPvcFe/xrV3YoJjs/kAlrvOdOD4S21hCqzFzIP8wOJ6BGfCma/zcCWXVVv3cUQVMVZTtA== +"@dhis2-ui/tab@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-8.14.0.tgz#4f79e2134ce6a83aeabae0843fd3d5389e535e60" + integrity sha512-y4Aktalr4ACTpoH115ohDI9Go7KDhZZf8bR5Scr0jh4mRtYj1+or+dk/M+uALzU4uxp4GMozh2PfwT4g133PYQ== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/table@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.13.11.tgz#ea83b707e3cea8a71929360e540b8c92243b393c" - integrity sha512-d6CopZZETAC/wsTyS6Er0SgT8aM+WUj8ROtgwmYohw4T6MOgGVhzkRSII/BTupZmeieM53rVKyjW1VY4P8VObA== +"@dhis2-ui/table@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-8.14.0.tgz#bf8602a64e485439643b42e20393cfaae4cc768c" + integrity sha512-uni9xTcl/YO5zXxslzey/5mlbaUYntmQU6CYLC9Jqx5HLCCeaOJyBPAgvoSVLIzwAt6HlQ1uvp7LMbuJYRRZTA== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tag@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.13.11.tgz#cf6425e27ac316a6d1d542ca0ea9d5886c075699" - integrity sha512-tTiS0A47B152ptj3Pt+7DQAkFxJN8NbTp4dkHA4JDKCGqybX5HEnb8ygFqtfyng06OC8vFJLOj0dsDxq7eBVQA== +"@dhis2-ui/tag@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-8.14.0.tgz#a30e9eb4a19794e12b376022c9d3852d9944bc81" + integrity sha512-sD/cB/nfUNBwZjWVRm5eS46Qy9H+fnkAOeYSZdbcf6xazPzjaDGqk6SR4rVd+p3qN/i13h4cMUEsCzFCVHLnvw== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/text-area@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.13.11.tgz#7cc4241fe8e73ec90897c0cdf5663661bb02eb14" - integrity sha512-7mp3z5gXoNcJsKSJl7Y3yT3POL4gUeWK/FkvoSGEv5OhRE2H9CxncJyALzLe0Sol2/ggKOsgy1avOY5Nmj9BwQ== +"@dhis2-ui/text-area@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-8.14.0.tgz#f9a24ca838b579772aad70d32b947640f1ce36fd" + integrity sha512-YnnByLyDz5Nqiw/7pBCQgMZi7inp6x1xfZpiYOCV4P2EXzyM58Xivm1aXyKnjCQvhJ2fwqDpYQm47bXSx1FrJg== dependencies: - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/status-icon" "8.13.11" + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/status-icon" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-icons" "8.13.11" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-icons" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/tooltip@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.13.11.tgz#12ea4ebf67ecdff4990cc8de1963eb3bfe587333" - integrity sha512-0fzMeDPGpsWdgTtnD0jPKV/d4tmzG4pTJUIgQLVD6lms35lPrKeL3rfBtx3+hQqS2yVRMjTmev3PZH6kJ9dEJQ== +"@dhis2-ui/tooltip@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-8.14.0.tgz#8bc643ab290947e2c143f05cc3f1e887c102a337" + integrity sha512-K5F5y1CCVZagBagpK6Hn5xi06A1Qd/Fp5sNyyYHEyoIDD6/TMQpnZ4hMNKqwVNWUqbxj2KuMM8zE6IaZTm+ATA== dependencies: - "@dhis2-ui/popper" "8.13.11" - "@dhis2-ui/portal" "8.13.11" + "@dhis2-ui/popper" "8.14.0" + "@dhis2-ui/portal" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/transfer@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.13.11.tgz#c1f4df94d29bcbd8ac8ef939ecf0c878db4fe986" - integrity sha512-i2PidKhj7TbyGjJBqOxA8IUNRvYYSvgXBMYyInxXfle0Wd7y66j6o19UqZyoGQj47+yxKbZcTLghMbd3IHjdTw== +"@dhis2-ui/transfer@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-8.14.0.tgz#3b8f39afe9c77d88a903f334b1dbcb6be4f61a39" + integrity sha512-LjGUP1Q3jjMHryibJb8wZGUNsZ4rYROzEzho0Z9e+dtf2tTlng74DIuzYd+5RCD15Am+xqySaq/zJC0XQ9yFdA== dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/intersection-detector" "8.13.11" - "@dhis2-ui/loader" "8.13.11" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/intersection-detector" "8.14.0" + "@dhis2-ui/loader" "8.14.0" "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2-ui/user-avatar@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.13.11.tgz#8da2e4a9d8206cad612cf6eeeede1d3473621c30" - integrity sha512-NFzoOI+hZPC9mdUVhn4B/8cA7Lx31Y8RiQ8OduCP4yqApn+UAP9cLob7z+AbBEAreDQ5CmMtNup3mHtmAJJFeQ== +"@dhis2-ui/user-avatar@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-8.14.0.tgz#7fe40a33eb14391f532dca1ad0ad44fd6a32fbdb" + integrity sha512-nKXcpP4QjbI4WaI5H5KJzKg1cI9o49WAE0R5ddmHugGdCXkqeW8w5tjGT08D7wKFJc4jan4ejKn3DU5rf0GS8A== dependencies: "@dhis2/prop-types" "^3.1.2" - "@dhis2/ui-constants" "8.13.11" + "@dhis2/ui-constants" "8.14.0" classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^25.1.15": - version "25.1.15" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-25.1.15.tgz#061a761693f71503ce8b4bc58a0cb93524263a78" - integrity sha512-cVKbbG87n945sAUOTr1hUhN5Tcfc0c9TSy9YKAjPyAghFDb2ZycjfKTSA6NiXyIt5Q13VEXIrO5bZKbFCIhrrw== +"@dhis2/analytics@^26.0.17": + version "26.0.17" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.17.tgz#f6f550c266478c38872429ee422f6a890b189a82" + integrity sha512-681OmaLrAetgHL59iU9ldeaXZ7NLp5T3nWLxGQGAklUwCpmny32wJKj2aXsCQN6WYuGDvz9PgpqN+YrkAMChFQ== dependencies: - "@dhis2/d2-ui-rich-text" "^7.4.0" + "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" "@dnd-kit/core" "^6.0.7" "@dnd-kit/sortable" "^7.0.2" @@ -2173,18 +2173,18 @@ crypto-js "^4.1.1" d2-utilizr "^0.2.16" d3-color "^1.2.3" - highcharts "^10.2.0" + highcharts "^10.3.3" lodash "^4.17.21" mathjs "^9.4.2" react-beautiful-dnd "^10.1.1" resize-observer-polyfill "^1.5.1" -"@dhis2/app-adapter@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.9.tgz#f0733e72bff86661889c6fcf3a8e0ca3452f3121" - integrity sha512-T/FFxzInvNw4YKZX+SuWpge0UGqzKX5w1rC3gBK38sFFpnBGNHgV5QMKo/DZeLDceDu1yrZbkluANoEujJSv9Q== +"@dhis2/app-adapter@10.3.10": + version "10.3.10" + resolved "https://registry.yarnpkg.com/@dhis2/app-adapter/-/app-adapter-10.3.10.tgz#31e8bc93cdb3793db412707cdaf6f2d086c06d39" + integrity sha512-YjFrCq3s8+jPoycMacezM9nMd63C+Lcbzf9Lnu1zlJlHMSjVUTZ8nbWEqy1WQUR6vvWIZ+0DWGw1PPzDJNViog== dependencies: - "@dhis2/pwa" "10.3.9" + "@dhis2/pwa" "10.3.10" moment "^2.24.0" "@dhis2/app-runtime-adapter-d2@^1.1.0": @@ -2194,49 +2194,49 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.9.0", "@dhis2/app-runtime@^3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.3.tgz#6316aabf213be5ee33da36a015f85ef72bd54544" - integrity sha512-Exfp8EFa81uobEpFFKwxWi6KEioZlGhaQwIBb/dV9sxSjMEg3wO1ULdSi2VBdf9/UQKb/0YM+Ki7d9/bCsRrFw== +"@dhis2/app-runtime@^3.9.0", "@dhis2/app-runtime@^3.9.4": + version "3.9.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-3.9.4.tgz#88243dbb9a4a805be744a61cffd13a4c3d2d031d" + integrity sha512-CBwMXer5/Kcxf6MgfwPgpEaUSXbDXzwItCkH3i0nsjmkD0KIaEOZ6Y1pQL+/5RYnziZ5glYCFWsCKn0eCJrdJg== dependencies: - "@dhis2/app-service-alerts" "3.9.3" - "@dhis2/app-service-config" "3.9.3" - "@dhis2/app-service-data" "3.9.3" - "@dhis2/app-service-offline" "3.9.3" + "@dhis2/app-service-alerts" "3.9.4" + "@dhis2/app-service-config" "3.9.4" + "@dhis2/app-service-data" "3.9.4" + "@dhis2/app-service-offline" "3.9.4" -"@dhis2/app-service-alerts@3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.3.tgz#bb7d6ab98b2c2b49f2c1f84750f4015ee1e51058" - integrity sha512-Zp8J90c5Qbh9fqtDKT0QSI0jCOUst64cE0Y7rzCe7JUGUsD84FTYVHY6xPMnhDf65kQ2Amh4aiKVO45y40UjQA== +"@dhis2/app-service-alerts@3.9.4": + version "3.9.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-alerts/-/app-service-alerts-3.9.4.tgz#5aed2b191bb98bbf5eb14babb495b70f28b69aff" + integrity sha512-Oq2PZMcYyB+uXNwmifclv8oVobuKLTfN9ia7Gwa5G63c7Zjl4HldOxrM3TGDnsGYWfuGxtm8LNuzKfFX91HWmg== -"@dhis2/app-service-config@3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.9.3.tgz#f665c7858cea028866cc6ea6cea4119d000208b5" - integrity sha512-W2SPjWeCXKbr97PHz1DAHuRF/OKQ4jNUUmL3u4lAuCxnNJwQDJdV71fteevlQmT/tnl6tLeoy19Tlt0nDFP2jg== +"@dhis2/app-service-config@3.9.4": + version "3.9.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-config/-/app-service-config-3.9.4.tgz#4cab3a4ba090e53235f01c6a6913467171052d89" + integrity sha512-hiJr33zNWjUWJDx8l7tFMDfzX11euE+t6+ph2x9LnQ9KHDXFhh3GZhyQnX+8IATtlS4Fx9fjz2scQhGsg2dt0g== -"@dhis2/app-service-data@3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.9.3.tgz#46758bf3f7863972e9f7db93bb61f0262281f16d" - integrity sha512-Ogyf/ORuO/si+u7G4nVlp0eFgU8Jg3Cvol0REvAzKkL20dEQ/ysgdqAzG7QuTWrk+QdvUTrF4ClKBPgQ9bqwzw== +"@dhis2/app-service-data@3.9.4": + version "3.9.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-data/-/app-service-data-3.9.4.tgz#03cd4cc40a316670d5ae328488cc8ef2a8a9b377" + integrity sha512-3AFwBkR1H8M6b+T5N3vcRsx9iiJm5LjltXYkbA9fmxcjJ02VoHa2B3a529pp8w9qSp7mpAF4Kmr3gZPvFpBRDA== dependencies: react-query "^3.13.11" -"@dhis2/app-service-offline@3.9.3": - version "3.9.3" - resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.9.3.tgz#a4ec287e33f00768ff80dc5ceb59c674b50a80ab" - integrity sha512-CKbmy7nCvUwWsJU99Mqhwh7cctc+qib8OflkZthz+dgEIvz7a0H1k89Fgbu/4NAefWZa4+Dh46jnW6/CXeQeSg== +"@dhis2/app-service-offline@3.9.4": + version "3.9.4" + resolved "https://registry.yarnpkg.com/@dhis2/app-service-offline/-/app-service-offline-3.9.4.tgz#ba4f3a916ca9a4c714fdedac51c66daa4f2c6bd7" + integrity sha512-vtv9V3Za/ukujPpqBRGkKZTloM2Cu29J+zHziyrTKC+hVsw8p3d4dHgXvpOGLcjq3ePAvEX4aEZK9+VCHnNFRQ== dependencies: lodash "^4.17.21" -"@dhis2/app-shell@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.9.tgz#4def65cfa436047de896865b107d496afbafc643" - integrity sha512-GkKGz1FIcXL4XG7cMPob0T78EvI8ML3CJbtVDxMDx++20R8vD+gKB4jbdXA5QooWeojDA5kpPmNiVHNUJb6LUw== +"@dhis2/app-shell@10.3.10": + version "10.3.10" + resolved "https://registry.yarnpkg.com/@dhis2/app-shell/-/app-shell-10.3.10.tgz#b8511fc52a97c40f0919c8f632cfda5edd664340" + integrity sha512-14FbdP+8Q657572LBU7zxVnTxB1cxD837k9n5ir6GKeb9Obw4KzdN2tTBA2Ll76iL83WjxcdzmAEiE6jSXCjyw== dependencies: - "@dhis2/app-adapter" "10.3.9" + "@dhis2/app-adapter" "10.3.10" "@dhis2/app-runtime" "^3.9.0" "@dhis2/d2-i18n" "^1.1.1" - "@dhis2/pwa" "10.3.9" + "@dhis2/pwa" "10.3.10" "@dhis2/ui" "^8.12.3" classnames "^2.2.6" moment "^2.29.1" @@ -2249,10 +2249,10 @@ typeface-roboto "^0.0.75" typescript "^3.6.3" -"@dhis2/cli-app-scripts@^10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.9.tgz#8a971b52c08f165bcee78fb5bddfd0891ae7f7c2" - integrity sha512-toltKttbok1ORBYvXYOtaIyUUs5C7lB3SEbZuk4KnibwmtG3v/37UEgXC6y0nc0L3XDBz/HK/LrbU4/7osfvcA== +"@dhis2/cli-app-scripts@^10.3.10": + version "10.3.10" + resolved "https://registry.yarnpkg.com/@dhis2/cli-app-scripts/-/cli-app-scripts-10.3.10.tgz#864d7ef7bcd2ba7f1f494c0b0d130edfda87360a" + integrity sha512-b0lZIIbV3LaiOvx5ptBLBjg+qFZCgOLJbNBvdaGLaOJAGU2QHGffcOsZvGBWYcQ6ipn+o0O1AFpuo9FFIY7EkQ== dependencies: "@babel/core" "^7.6.2" "@babel/plugin-proposal-class-properties" "^7.8.3" @@ -2261,7 +2261,7 @@ "@babel/preset-env" "^7.14.7" "@babel/preset-react" "^7.0.0" "@babel/preset-typescript" "^7.6.0" - "@dhis2/app-shell" "10.3.9" + "@dhis2/app-shell" "10.3.10" "@dhis2/cli-helpers-engine" "^3.2.0" "@jest/core" "^27.0.6" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.4" @@ -2421,7 +2421,7 @@ lodash "^4.17.10" prop-types "^15.6.2" -"@dhis2/d2-ui-rich-text@7.4.3", "@dhis2/d2-ui-rich-text@^7.4.0", "@dhis2/d2-ui-rich-text@^7.4.3": +"@dhis2/d2-ui-rich-text@7.4.3", "@dhis2/d2-ui-rich-text@^7.4.1", "@dhis2/d2-ui-rich-text@^7.4.3": version "7.4.3" resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.4.3.tgz#a42c8e231bcc05186dd432dac86b33aed4ddc10d" integrity sha512-60k/6CO2I8f4t3jU1nAic7uWONME1rckM8RcLnelhwUG20EZWq45OnDDdSfHgOWTwVDtxFnG3wspInkG/530KA== @@ -2465,10 +2465,10 @@ resolved "https://registry.yarnpkg.com/@dhis2/prop-types/-/prop-types-3.1.2.tgz#65b8ad2da8cd2f72bc8b951049a6c9d1b97af3e9" integrity sha512-eM0jjLOWvtXWqSFp5YC4DHFpkP8Y1D2eUwGV7MBWjni+o27oesVan+oT7WHeOeLdlAd4acRJrnaaAyB4Ck1wGQ== -"@dhis2/pwa@10.3.9": - version "10.3.9" - resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.9.tgz#c119b7da18218a4ea3d18c7eb01c2aca5fc619a2" - integrity sha512-yYxOjgi1D0S6Ah5xQwZauQ3zhXuiojc9AMkP+J+bpZYQhj4hzB2dKyJ252dClO6P/7EtoSj9XJOsMx007uIUEQ== +"@dhis2/pwa@10.3.10": + version "10.3.10" + resolved "https://registry.yarnpkg.com/@dhis2/pwa/-/pwa-10.3.10.tgz#2d00f06dbc1dac060d3d4b4096c4f5b7651fbc54" + integrity sha512-MBLySNo02SIXP/aHKvTvdan2/Fx3nyBhddwi3HzZFfc2LQ7/oHLLE+SvOL8JtTAet13GEu4chYyzIe3JvTzgDw== dependencies: idb "^6.0.0" workbox-core "^6.1.5" @@ -2476,91 +2476,91 @@ workbox-routing "^6.1.5" workbox-strategies "^6.1.5" -"@dhis2/ui-constants@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.13.11.tgz#0a486c5ce7adff75633a9c7d75e5c47db9428ace" - integrity sha512-R6M++JeAnqetTBkFyly/of4KlaNq35DLjbxChOOFiWuY0ErBU83RaoUx+ZyaSM7UtWsUFfMuWDLIWef1OU9BBQ== +"@dhis2/ui-constants@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-8.14.0.tgz#658a0b50ac3bf88754d19b6be372c1db4fcc81a0" + integrity sha512-tVEQGCYpdQs2eH1uiXE0PIcTFNlLC9fqGBi95bduXLXZ8G23VPgIHgGdPPLsK8goVZYr7jIpYnN6fTNbPhu66Q== dependencies: prop-types "^15.7.2" -"@dhis2/ui-forms@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.13.11.tgz#5dab105a3e4a0ad0110633c647942ad2b08a3858" - integrity sha512-VFy0gMNWogPfWiwAnY2hBG6vvJkpx6/BVKWxzsbRNLGn+7ZZPcmU4GtGWfue9oxBrwWXtT8PU4iGcJfAj/HsqQ== - dependencies: - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/checkbox" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/file-input" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/radio" "8.13.11" - "@dhis2-ui/select" "8.13.11" - "@dhis2-ui/switch" "8.13.11" - "@dhis2-ui/text-area" "8.13.11" +"@dhis2/ui-forms@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-8.14.0.tgz#d918ef7a308d777a162c1ff4b644ffd12dc604a9" + integrity sha512-PhNeSoLSU1sQHy/G84CNi92JwpJGY1kFEJnww8o5/lMFClxbFvG978hd6kzA8CTzBNvrOzD0uY/TCL+cj1xshw== + dependencies: + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/checkbox" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/file-input" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/radio" "8.14.0" + "@dhis2-ui/select" "8.14.0" + "@dhis2-ui/switch" "8.14.0" + "@dhis2-ui/text-area" "8.14.0" "@dhis2/prop-types" "^3.1.2" classnames "^2.3.1" final-form "^4.20.2" prop-types "^15.7.2" react-final-form "^6.5.3" -"@dhis2/ui-icons@8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.13.11.tgz#7dc89bf3a84c0b452b9f2f365d039ae1338a4ed5" - integrity sha512-+wZZOB9lq1hpTj4IxoEV+vFij0Pho4T7NijEBdm6pd8+O24D8Tnkpb8fv8ZsDdkOob2X1WXM7ruswkku0kxZRg== - -"@dhis2/ui@^8.12.3", "@dhis2/ui@^8.13.11": - version "8.13.11" - resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.13.11.tgz#5702c5258676f5aba266783e4a21aaeb0c88333e" - integrity sha512-G4tfKDN/m3/VqyirViCkGgRSCQ3yFtSIrMwY8AjQesoGzBidXNEIITXdhUkpmJH9Lp/sTHFfk/G7vNVdWWLqKg== - dependencies: - "@dhis2-ui/alert" "8.13.11" - "@dhis2-ui/box" "8.13.11" - "@dhis2-ui/button" "8.13.11" - "@dhis2-ui/calendar" "8.13.11" - "@dhis2-ui/card" "8.13.11" - "@dhis2-ui/center" "8.13.11" - "@dhis2-ui/checkbox" "8.13.11" - "@dhis2-ui/chip" "8.13.11" - "@dhis2-ui/cover" "8.13.11" - "@dhis2-ui/css" "8.13.11" - "@dhis2-ui/divider" "8.13.11" - "@dhis2-ui/field" "8.13.11" - "@dhis2-ui/file-input" "8.13.11" - "@dhis2-ui/header-bar" "8.13.11" - "@dhis2-ui/help" "8.13.11" - "@dhis2-ui/input" "8.13.11" - "@dhis2-ui/intersection-detector" "8.13.11" - "@dhis2-ui/label" "8.13.11" - "@dhis2-ui/layer" "8.13.11" - "@dhis2-ui/legend" "8.13.11" - "@dhis2-ui/loader" "8.13.11" - "@dhis2-ui/logo" "8.13.11" - "@dhis2-ui/menu" "8.13.11" - "@dhis2-ui/modal" "8.13.11" - "@dhis2-ui/node" "8.13.11" - "@dhis2-ui/notice-box" "8.13.11" - "@dhis2-ui/organisation-unit-tree" "8.13.11" - "@dhis2-ui/pagination" "8.13.11" - "@dhis2-ui/popover" "8.13.11" - "@dhis2-ui/popper" "8.13.11" - "@dhis2-ui/portal" "8.13.11" - "@dhis2-ui/radio" "8.13.11" - "@dhis2-ui/required" "8.13.11" - "@dhis2-ui/segmented-control" "8.13.11" - "@dhis2-ui/select" "8.13.11" - "@dhis2-ui/selector-bar" "8.13.11" - "@dhis2-ui/sharing-dialog" "8.13.11" - "@dhis2-ui/switch" "8.13.11" - "@dhis2-ui/tab" "8.13.11" - "@dhis2-ui/table" "8.13.11" - "@dhis2-ui/tag" "8.13.11" - "@dhis2-ui/text-area" "8.13.11" - "@dhis2-ui/tooltip" "8.13.11" - "@dhis2-ui/transfer" "8.13.11" - "@dhis2-ui/user-avatar" "8.13.11" - "@dhis2/ui-constants" "8.13.11" - "@dhis2/ui-forms" "8.13.11" - "@dhis2/ui-icons" "8.13.11" +"@dhis2/ui-icons@8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-8.14.0.tgz#35182305b56790b0263b2898580989c331e57ef5" + integrity sha512-EltpyicKR7hvk+j/FrXIogxcWIEzG+D7XdOXi9xwOWot+JnXio0wWObHsuR6xyMPjwnFjk5vLRtlIn2E3jtdYw== + +"@dhis2/ui@^8.12.3", "@dhis2/ui@^8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-8.14.0.tgz#3649e67c9d160f57b2c05691f4454fcd0df1156e" + integrity sha512-ewwdGDN5TW1l591OYsIc6AMa71B58XZtolZgC4GoOk+BYNNdq7UPJEuLH6SI4VZHeF248jFq0kRObU39oT59Mg== + dependencies: + "@dhis2-ui/alert" "8.14.0" + "@dhis2-ui/box" "8.14.0" + "@dhis2-ui/button" "8.14.0" + "@dhis2-ui/calendar" "8.14.0" + "@dhis2-ui/card" "8.14.0" + "@dhis2-ui/center" "8.14.0" + "@dhis2-ui/checkbox" "8.14.0" + "@dhis2-ui/chip" "8.14.0" + "@dhis2-ui/cover" "8.14.0" + "@dhis2-ui/css" "8.14.0" + "@dhis2-ui/divider" "8.14.0" + "@dhis2-ui/field" "8.14.0" + "@dhis2-ui/file-input" "8.14.0" + "@dhis2-ui/header-bar" "8.14.0" + "@dhis2-ui/help" "8.14.0" + "@dhis2-ui/input" "8.14.0" + "@dhis2-ui/intersection-detector" "8.14.0" + "@dhis2-ui/label" "8.14.0" + "@dhis2-ui/layer" "8.14.0" + "@dhis2-ui/legend" "8.14.0" + "@dhis2-ui/loader" "8.14.0" + "@dhis2-ui/logo" "8.14.0" + "@dhis2-ui/menu" "8.14.0" + "@dhis2-ui/modal" "8.14.0" + "@dhis2-ui/node" "8.14.0" + "@dhis2-ui/notice-box" "8.14.0" + "@dhis2-ui/organisation-unit-tree" "8.14.0" + "@dhis2-ui/pagination" "8.14.0" + "@dhis2-ui/popover" "8.14.0" + "@dhis2-ui/popper" "8.14.0" + "@dhis2-ui/portal" "8.14.0" + "@dhis2-ui/radio" "8.14.0" + "@dhis2-ui/required" "8.14.0" + "@dhis2-ui/segmented-control" "8.14.0" + "@dhis2-ui/select" "8.14.0" + "@dhis2-ui/selector-bar" "8.14.0" + "@dhis2-ui/sharing-dialog" "8.14.0" + "@dhis2-ui/switch" "8.14.0" + "@dhis2-ui/tab" "8.14.0" + "@dhis2-ui/table" "8.14.0" + "@dhis2-ui/tag" "8.14.0" + "@dhis2-ui/text-area" "8.14.0" + "@dhis2-ui/tooltip" "8.14.0" + "@dhis2-ui/transfer" "8.14.0" + "@dhis2-ui/user-avatar" "8.14.0" + "@dhis2/ui-constants" "8.14.0" + "@dhis2/ui-forms" "8.14.0" + "@dhis2/ui-icons" "8.14.0" prop-types "^15.7.2" "@dnd-kit/accessibility@^3.0.0": @@ -3387,7 +3387,7 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react@^12.0.0", "@testing-library/react@^12.1.2": +"@testing-library/react@^12", "@testing-library/react@^12.1.2": version "12.1.5" resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b" integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg== @@ -7524,12 +7524,12 @@ eslint-module-utils@^2.7.3: dependencies: debug "^3.2.7" -eslint-plugin-cypress@^2.11.3: - version "2.13.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.3.tgz#5fc1afdc939aaa7daa9181f651f2f35429733ff2" - integrity sha512-nAPjZE5WopCsgJwl3vHm5iafpV+ZRO76Z9hMyRygWhmg5ODXDPd+9MaPl7kdJ2azj+sO87H3P1PRnggIrz848g== +eslint-plugin-cypress@^2.14.0: + version "2.14.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz#c65e1f592680dd25bbd00c86194ee85fecf59bd7" + integrity sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg== dependencies: - globals "^11.12.0" + globals "^13.20.0" eslint-plugin-flowtype@^8.0.3: version "8.0.3" @@ -8701,15 +8701,15 @@ global-prefix@^3.0.0: kind-of "^6.0.2" which "^1.3.1" -globals@^11.1.0, globals@^11.12.0: +globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0, globals@^13.6.0, globals@^13.9.0: - version "13.17.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4" - integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw== +globals@^13.15.0, globals@^13.20.0, globals@^13.6.0, globals@^13.9.0: + version "13.21.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" + integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== dependencies: type-fest "^0.20.2" @@ -8940,7 +8940,7 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -highcharts@^10.2.0: +highcharts@^10.3.3: version "10.3.3" resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-10.3.3.tgz#b8acca24f2d4b1f2f726540734166e59e07b35c4" integrity sha512-r7wgUPQI9tr3jFDn3XT36qsNwEIZYcfgz4mkKEA6E4nn5p86y+u1EZjazIG4TRkl5/gmGRtkBUiZW81g029RIw== From 35877e16d640b343a847a2826aabc5e07cb7ece5 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Wed, 6 Sep 2023 10:12:29 +0200 Subject: [PATCH 2/2] fix: parse the ou filter correctly for all ou types (#2691) Fixes DHIS2-14544 If path exists, then parse it. Otherwise use id, which will be the case for groups, levels and UER_ORGUNITS) --- .../common/view/add_a_FILTERTYPE_filter.js | 39 +++++-- .../integration/view/dashboard_filter.feature | 8 +- .../view/dashboard_filter/create_dashboard.js | 88 ++++++++++----- .../view/dashboard_filter/dashboard_filter.js | 17 +++ cypress/support/commands.js | 25 +++++ cypress/support/index.js | 1 + src/components/Item/AppItem/Item.js | 16 +-- .../AppItem/__tests__/getIframeSrc.spec.js | 106 ++++++++++++++++++ src/components/Item/AppItem/getIframeSrc.js | 15 +++ 9 files changed, 260 insertions(+), 55 deletions(-) create mode 100644 cypress/support/commands.js create mode 100644 src/components/Item/AppItem/__tests__/getIframeSrc.spec.js create mode 100644 src/components/Item/AppItem/getIframeSrc.js diff --git a/cypress/integration/common/view/add_a_FILTERTYPE_filter.js b/cypress/integration/common/view/add_a_FILTERTYPE_filter.js index dea5155bb..76f1c1dca 100644 --- a/cypress/integration/common/view/add_a_FILTERTYPE_filter.js +++ b/cypress/integration/common/view/add_a_FILTERTYPE_filter.js @@ -13,18 +13,35 @@ const FACILITY_TYPE = 'Clinic' When('I add a {string} filter', (dimensionType) => { cy.contains('Add filter').click() - // open the dimensions modal - cy.get(filterDimensionsPanelSel).contains(dimensionType).click() - // select an item in the modal - if (dimensionType === 'Period') { - cy.get(unselectedItemsSel).contains(PERIOD).dblclick() - } else if (dimensionType === 'Organisation unit') { - cy.get(orgUnitTreeSel, EXTENDED_TIMEOUT) - .find('[type="checkbox"]', EXTENDED_TIMEOUT) - .check(OU_ID) - } else { - cy.get(unselectedItemsSel).contains(FACILITY_TYPE).dblclick() + switch (dimensionType) { + case 'Period': + cy.get(filterDimensionsPanelSel).contains(dimensionType).click() + cy.get(unselectedItemsSel).contains(PERIOD).dblclick() + break + case 'Organisation unit': + cy.get(filterDimensionsPanelSel).contains(dimensionType).click() + cy.get(orgUnitTreeSel, EXTENDED_TIMEOUT) + .find('[type="checkbox"]', EXTENDED_TIMEOUT) + .check(OU_ID) + break + case 'Org unit group': + cy.get(filterDimensionsPanelSel) + .contains('Organisation unit') + .click() + cy.getByDataTest('org-unit-group-select').click() + cy.getByDataTest('dhis2-uicore-select-menu-menuwrapper') + .contains('District') + .click() + // close the popup + cy.getByDataTest('dhis2-uicore-select-menu-menuwrapper') + .closest('[data-test="dhis2-uicore-layer"]') + .click('topLeft') + break + + default: + cy.get(filterDimensionsPanelSel).contains(dimensionType).click() + cy.get(unselectedItemsSel).contains(FACILITY_TYPE).dblclick() } // confirm to apply the filter diff --git a/cypress/integration/view/dashboard_filter.feature b/cypress/integration/view/dashboard_filter.feature index b40594040..dba070671 100644 --- a/cypress/integration/view/dashboard_filter.feature +++ b/cypress/integration/view/dashboard_filter.feature @@ -2,7 +2,7 @@ Feature: Dashboard filter Scenario: I add a Period filter When I start a new dashboard - And I add a MAP and a CHART and save + And I add items and save Then the dashboard displays in view mode When I add a "Period" filter Then the Period filter is applied to the dashboard @@ -19,6 +19,12 @@ Feature: Dashboard filter When I add a "Facility Type" filter Then the Facility Type filter is applied to the dashboard + Scenario: I add a Org unit group filter + Given I open existing dashboard + Then the dashboard displays in view mode + When I add a "Org unit group" filter + Then the Org unit group filter is applied to the dashboard + Scenario: I can access the dimensions modal from the filter badge Given I open existing dashboard When I add a "Period" filter diff --git a/cypress/integration/view/dashboard_filter/create_dashboard.js b/cypress/integration/view/dashboard_filter/create_dashboard.js index 3b8ad09ab..55a200d99 100644 --- a/cypress/integration/view/dashboard_filter/create_dashboard.js +++ b/cypress/integration/view/dashboard_filter/create_dashboard.js @@ -9,6 +9,7 @@ import { dashboardChipSel, dashboardTitleSel, } from '../../../elements/viewDashboard.js' +import { getApiBaseUrl } from '../../../support/server/utils.js' import { EXTENDED_TIMEOUT, createDashboardTitle, @@ -16,42 +17,70 @@ import { const TEST_DASHBOARD_TITLE = createDashboardTitle('af') -When('I add a MAP and a CHART and save', () => { - //add the title - cy.get('[data-test="dashboard-title-input"]').type(TEST_DASHBOARD_TITLE) +const customApp = { + name: 'Users-Role-Monitor-Widget', + id: '5e43908a-3105-4baa-9a00-87a94ebdc034', +} - // add items - cy.get('[data-test="item-search"]').click() - cy.get('[data-test="item-search"]') - .find('input') - .type('Inpatient', { force: true }) +When('I add items and save', () => { + // first install a custom app + cy.request('POST', `${getApiBaseUrl()}/api/appHub/${customApp.id}`).then( + (response) => { + expect(response.status).to.eq(204) - //chart - cy.get( - '[data-test="menu-item-Inpatient: BMI this year by districts"]' - ).click() + //add the dashboard title + cy.get('[data-test="dashboard-title-input"]').type( + TEST_DASHBOARD_TITLE + ) - cy.get('[data-test="dhis2-uicore-layer"]').click('topLeft') + // open item selector + cy.get('[data-test="item-search"]').click() + cy.get('[data-test="item-search"]') + .find('input') + .type('Inpatient', { force: true }) - cy.get('[data-test="item-search"]').click() - cy.get('[data-test="item-search"]') - .find('input') - .type('ipt 2', { force: true }) + //CHART + cy.get( + '[data-test="menu-item-Inpatient: BMI this year by districts"]' + ).click() - //map - cy.get('[data-test="menu-item-ANC: IPT 2 Coverage this year"]').click() + cy.get('[data-test="dhis2-uicore-layer"]').click('topLeft') - cy.get('[data-test="dhis2-uicore-layer"]').click('topLeft') + cy.get('[data-test="item-search"]').click() + cy.get('[data-test="item-search"]') + .find('input') + .type('ipt 2', { force: true }) - //move things so the dashboard is more compact - // eslint-disable-next-line cypress/unsafe-to-chain-command - cy.get(`${gridItemSel}.MAP`) - .trigger('mousedown') - .trigger('mousemove', { clientX: 650 }) - .trigger('mouseup') + //MAP + cy.get( + '[data-test="menu-item-ANC: IPT 2 Coverage this year"]' + ).click() - //save - cy.get('button').contains('Save changes', EXTENDED_TIMEOUT).click() + // close the item selector + cy.get('[data-test="dhis2-uicore-layer"]').click('topLeft') + + //add a custom app item + cy.get('[data-test="item-search"]').click() + cy.get('[data-test="item-search"]') + .find('input') + .type('Role Monitor', { force: true }) + + cy.contains('Role Monitor Widget').click() + + // close the item selector + cy.get('[data-test="dhis2-uicore-layer"]').click('topLeft') + + //move things so the dashboard is more compact + // eslint-disable-next-line cypress/unsafe-to-chain-command + cy.get(`${gridItemSel}.MAP`) + .trigger('mousedown') + .trigger('mousemove', { clientX: 650 }) + .trigger('mouseup') + + //save + cy.get('button').contains('Save changes', EXTENDED_TIMEOUT).click() + } + ) }) Given('I open existing dashboard', () => { @@ -84,4 +113,7 @@ Then('different dashboard displays in view mode', () => { cy.get(dashboardTitleSel) .should('be.visible') .and('not.contain', TEST_DASHBOARD_TITLE) + + // remove the custom app + cy.request('DELETE', `${getApiBaseUrl()}/api/apps/${customApp.name}`) }) diff --git a/cypress/integration/view/dashboard_filter/dashboard_filter.js b/cypress/integration/view/dashboard_filter/dashboard_filter.js index 38439dde1..de4f51ea7 100644 --- a/cypress/integration/view/dashboard_filter/dashboard_filter.js +++ b/cypress/integration/view/dashboard_filter/dashboard_filter.js @@ -90,6 +90,23 @@ Then('the Facility Type filter is applied to the dashboard', () => { // .should('be.visible') }) +Then('the Org unit group filter is applied to the dashboard', () => { + // check that the filter badge is correct + cy.get(filterBadgeSel) + .contains('Organisation unit: District') + .should('be.visible') + + // check that the custom app is loaded (see ticket DHIS2-14544) + cy.get('iframe') + .invoke('attr', 'title') + .contains('Role Monitor Widget') + .scrollIntoView() + cy.get('iframe') + .invoke('attr', 'title') + .contains('Role Monitor Widget') + .should('be.visible') +}) + Then('the filter modal is opened', () => { cy.get(dimensionsModalSel, EXTENDED_TIMEOUT).should('be.visible') }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js new file mode 100644 index 000000000..bc732e6d7 --- /dev/null +++ b/cypress/support/commands.js @@ -0,0 +1,25 @@ +Cypress.Commands.add('getByDataTest', (selector, ...args) => + cy.get(`[data-test=${selector}]`, ...args) +) +Cypress.Commands.add( + 'findByDataTest', + { + prevSubject: true, + }, + (subject, selector, ...args) => + cy.wrap(subject).find(`[data-test="${selector}"]`, ...args) +) + +Cypress.Commands.add( + 'containsExact', + { + prevSubject: 'optional', + }, + (subject, selector) => + cy.wrap(subject).contains( + new RegExp( + `^${selector.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}$`, //eslint-disable-line no-useless-escape + 'gm' + ) + ) +) diff --git a/cypress/support/index.js b/cypress/support/index.js index 1b2720c19..356da91ea 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -1,6 +1,7 @@ import { enableAutoLogin } from '@dhis2/cypress-commands' import { enableNetworkShim } from './server/index.js' import { getDefaultMode, isStubMode } from './server/utils.js' +import './commands.js' enableNetworkShim() diff --git a/src/components/Item/AppItem/Item.js b/src/components/Item/AppItem/Item.js index 7681c5d00..00b0ee3d4 100644 --- a/src/components/Item/AppItem/Item.js +++ b/src/components/Item/AppItem/Item.js @@ -3,27 +3,13 @@ import { Divider, colors, spacers, IconQuestion24 } from '@dhis2/ui' import PropTypes from 'prop-types' import React from 'react' import { connect } from 'react-redux' -import { FILTER_ORG_UNIT } from '../../../actions/itemFilters.js' import { EDIT, isEditMode } from '../../../modules/dashboardModes.js' import { sGetItemFiltersRoot, DEFAULT_STATE_ITEM_FILTERS, } from '../../../reducers/itemFilters.js' import ItemHeader from '../ItemHeader/ItemHeader.js' - -const getIframeSrc = (appDetails, item, itemFilters) => { - let iframeSrc = `${appDetails.launchUrl}?dashboardItemId=${item.id}` - - if (itemFilters[FILTER_ORG_UNIT] && itemFilters[FILTER_ORG_UNIT].length) { - const ouIds = itemFilters[FILTER_ORG_UNIT].map( - (ouFilter) => ouFilter.path.split('/').slice(-1)[0] - ) - - iframeSrc += `&userOrgUnit=${ouIds.join(',')}` - } - - return iframeSrc -} +import { getIframeSrc } from './getIframeSrc.js' const AppItem = ({ dashboardMode, item, itemFilters }) => { const { d2 } = useD2() diff --git a/src/components/Item/AppItem/__tests__/getIframeSrc.spec.js b/src/components/Item/AppItem/__tests__/getIframeSrc.spec.js new file mode 100644 index 000000000..fd85d6037 --- /dev/null +++ b/src/components/Item/AppItem/__tests__/getIframeSrc.spec.js @@ -0,0 +1,106 @@ +import { getIframeSrc } from '../getIframeSrc.js' + +const appDetails = { launchUrl: 'debug/dev' } +const dashboardItem = { id: 'rainbowdashitem' } +const expectedSrc = `${appDetails.launchUrl}?dashboardItemId=${dashboardItem.id}` + +describe('getIframeSrc', () => { + it('no ou filter', () => { + const ouFilter = [] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual(expectedSrc) + }) + + it('org units chosen from the tree', () => { + const ouFilter = [ + { + id: 'fdc6uOvgoji', + path: '/ImspTQPwCqd/fdc6uOvgoji', + name: 'Bombali', + }, + { + id: 'lc3eMKXaEfw', + path: '/ImspTQPwCqd/lc3eMKXaEfw', + name: 'Bonthe', + }, + ] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual( + `${expectedSrc}&userOrgUnit=fdc6uOvgoji,lc3eMKXaEfw` + ) + }) + + it('org unit group and org unit from tree', () => { + const ouFilter = [ + { + id: 'OU_GROUP-b0EsAxm8Nge', + name: 'Western Area', + }, + { + id: 'lc3eMKXaEfw', + path: '/ImspTQPwCqd/lc3eMKXaEfw', + name: 'Bonthe', + }, + ] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual( + `${expectedSrc}&userOrgUnit=OU_GROUP-b0EsAxm8Nge,lc3eMKXaEfw` + ) + }) + + it('org unit level and org unit from tree', () => { + const ouFilter = [ + { + id: 'LEVEL-m9lBJogzE95', + name: 'Facility', + }, + { + id: 'fdc6uOvgoji', + path: '/ImspTQPwCqd/fdc6uOvgoji', + name: 'Bombali', + }, + ] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual( + `${expectedSrc}&userOrgUnit=LEVEL-m9lBJogzE95,fdc6uOvgoji` + ) + }) + + it('user org unit', () => { + const ouFilter = [ + { + id: 'USER_ORGUNIT', + displayName: 'User organisation unit', + }, + ] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual(`${expectedSrc}&userOrgUnit=USER_ORGUNIT`) + }) + + it('all user org units', () => { + const ouFilter = [ + { + id: 'USER_ORGUNIT_CHILDREN', + displayName: 'User sub-units', + }, + { + id: 'USER_ORGUNIT_GRANDCHILDREN', + displayName: 'User sub-x2-units', + }, + { + id: 'USER_ORGUNIT', + displayName: 'User organisation unit', + }, + ] + + const src = getIframeSrc(appDetails, dashboardItem, { ou: ouFilter }) + expect(src).toEqual( + `${expectedSrc}&userOrgUnit=USER_ORGUNIT_CHILDREN,USER_ORGUNIT_GRANDCHILDREN,USER_ORGUNIT` + ) + }) +}) diff --git a/src/components/Item/AppItem/getIframeSrc.js b/src/components/Item/AppItem/getIframeSrc.js new file mode 100644 index 000000000..ae2b1c2c8 --- /dev/null +++ b/src/components/Item/AppItem/getIframeSrc.js @@ -0,0 +1,15 @@ +import { FILTER_ORG_UNIT } from '../../../actions/itemFilters.js' + +export const getIframeSrc = (appDetails, item, itemFilters) => { + let iframeSrc = `${appDetails.launchUrl}?dashboardItemId=${item.id}` + + if (itemFilters[FILTER_ORG_UNIT] && itemFilters[FILTER_ORG_UNIT].length) { + const ouIds = itemFilters[FILTER_ORG_UNIT].map(({ id, path }) => + path ? path.split('/').slice(-1)[0] : id + ) + + iframeSrc += `&userOrgUnit=${ouIds.join(',')}` + } + + return iframeSrc +}