From 0f47490910b43d6f3109360aa57968715ac64dd1 Mon Sep 17 00:00:00 2001 From: Mozafar Date: Tue, 7 Mar 2023 08:40:38 +0000 Subject: [PATCH] chore: backport multi-calendar functionality into 38.x (#2239) * feat: support non-gregorian fixed periods (#2233) * fix: fix failing e2e run on CI --- .github/workflows/cypress.yml | 8 +++++-- packages/app/package.json | 2 +- packages/plugin/package.json | 2 +- yarn.lock | 43 ++++++++++++++++++++++++++++------- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 0f6a9ef787..3701c2c34f 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -10,8 +10,8 @@ env: SERVER_START_CMD: 'yarn cypress:start' SERVER_URL: 'http://localhost:3000' CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} - REACT_APP_DHIS2_BASE_URL: ${{ secrets.REACT_APP_DHIS2_BASE_URL }} - cypress_dhis2_base_url: ${{ secrets.REACT_APP_DHIS2_BASE_URL }} + REACT_APP_DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }} + cypress_dhis2_base_url: ${{ secrets.CYPRESS_DHIS2_BASE_URL_38 }} cypress_dhis2_username: ${{ secrets.DHIS2_USERNAME }} cypress_dhis2_password: ${{ secrets.DHIS_PASSWORD }} @@ -27,6 +27,10 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: 14.x + - name: Tests uses: cypress-io/github-action@v2 with: diff --git a/packages/app/package.json b/packages/app/package.json index 1e613f794e..6d639733c8 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -13,7 +13,7 @@ "redux-mock-store": "^1.5.4" }, "dependencies": { - "@dhis2/analytics": "^21.8.2", + "@dhis2/analytics": "^21.9.0", "@dhis2/app-runtime": "^3.2.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/d2-i18n": "^1.1.0", diff --git a/packages/plugin/package.json b/packages/plugin/package.json index ad20d1a5fd..e2415482ea 100644 --- a/packages/plugin/package.json +++ b/packages/plugin/package.json @@ -14,7 +14,7 @@ "access": "public" }, "dependencies": { - "@dhis2/analytics": "^21.8.2", + "@dhis2/analytics": "^21.9.0", "@dhis2/app-runtime": "^3.2.0", "@dhis2/d2-i18n": "^1.1.0", "@dhis2/ui": "^7.7.3", diff --git a/yarn.lock b/yarn.lock index 62e74d8b62..9f4e2e3a37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2174,12 +2174,13 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^21.8.2": - version "21.8.2" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-21.8.2.tgz#c8a0e2264fcd7ce2a1615f563e4b03d20f970182" - integrity sha512-6RVUxgWULcglECSuGLf0Hl85bJ84o717XnNQAY9bxlP8vZcXNAG1S8TToWc7m0pTtH4jaFIlbJ8ktdgrcd6SZA== +"@dhis2/analytics@^21.9.0": + version "21.9.0" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-21.9.0.tgz#2cf08806418fe27680084ff8704accf49d9041e2" + integrity sha512-97cpgA78fzyv4QU9DygmzVyuQ/mFqfag9MikXv6nBYqPSFfn5MadCk1VKLm8Bq/KnAdj1m1da6/0p9HgvjfPXA== dependencies: "@dhis2/d2-ui-translation-dialog" "^7.3.1" + "@dhis2/multi-calendar-dates" "1.0.0" classnames "^2.3.1" d2-utilizr "^0.2.16" d3-color "^1.2.3" @@ -2452,6 +2453,14 @@ react-select "^2.0.0" rxjs "^5.5.7" +"@dhis2/multi-calendar-dates@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.0.tgz#bf7f49aecdffa9781837a5d60d56a094b74ab4df" + integrity sha512-IB9a+feuS6yE4lpZj/eZ9uBmpYI7Hxitl2Op0JjoRL4tP+p6uw4ns9cjoSdUeIU9sOAxVZV7oQqSyIw+9P6YjQ== + dependencies: + "@js-temporal/polyfill" "^0.4.2" + classnames "^2.3.2" + "@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" @@ -3149,6 +3158,14 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@js-temporal/polyfill@^0.4.2": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b" + integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw== + dependencies: + jsbi "^4.1.0" + tslib "^2.3.1" + "@ls-lint/ls-lint@^1.9.2": version "1.10.0" resolved "https://registry.yarnpkg.com/@ls-lint/ls-lint/-/ls-lint-1.10.0.tgz#cad20085edc010a3e938aa01bb66d05e5e12b3f3" @@ -6038,10 +6055,10 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== +classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" + integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== clean-css@^4.2.3: version "4.2.3" @@ -11761,6 +11778,11 @@ js-yaml@^3.13.1, js-yaml@^3.9.0: argparse "^1.0.7" esprima "^4.0.0" +jsbi@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741" + integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g== + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -17851,6 +17873,11 @@ tslib@^2.0.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@^2.3.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== + tsutils@^3.17.1: version "3.17.1" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"