From 5d2a7da34905e2a79f6908b74c145d2c1b61d23a Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Fri, 15 Sep 2023 09:35:57 +0200 Subject: [PATCH 1/3] fix: translate dimension labels in PT DHIS2-15750 --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index cff75991e9..f14221d28e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "start-server-and-test": "^2.0.0" }, "dependencies": { - "@dhis2/analytics": "^26.0.7", + "@dhis2/analytics": "^26.0.19", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index 05cefb0660..669209e150 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2028,12 +2028,12 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.0.7": - version "26.0.7" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.7.tgz#d0883c74fc909359d1ce01e82c267ba99e8186a5" - integrity sha512-NJ//FeWWn6yy1bDK3lcMPdwOWVhLBQyh1vmj+S0/k86iKRfF+8tmZwinZLVLebzV3DRjSoWSPCzwU6zVDedjWg== +"@dhis2/analytics@^26.0.19": + version "26.0.19" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.19.tgz#0e70c5171049c5d81c0b2a0180abaa958a3ae1f3" + integrity sha512-OJhBmZ7MYbvYpuvSpX/d7exATD6jOyFQYCt3mtTxx+QhSaFMYiuEHHiGQlCNoo/C/VN5gS6s+rZgl1dImlo6cQ== 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" @@ -2043,7 +2043,7 @@ 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" @@ -2245,10 +2245,10 @@ i18next "^10.3" moment "^2.24.0" -"@dhis2/d2-ui-rich-text@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-rich-text/-/d2-ui-rich-text-7.4.0.tgz#e1fb6eff7309ea80a6af3bee2a247c9f93ea721d" - integrity sha512-q8woPPyYHiqQfNtujuCQH8eq7zRcN0140XqrKHw1DXF/fnqmrcVDTNZkPSaWMuUsdPhcgTHcnuEySP0MRAXv6g== +"@dhis2/d2-ui-rich-text@^7.4.1": + 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== dependencies: babel-runtime "^6.26.0" markdown-it "^8.4.2" @@ -8599,10 +8599,10 @@ he@1.2.0, 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: - version "10.2.0" - resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-10.2.0.tgz#646b1c80fb4add9e35e5813bd87419ccdf1fc6b7" - integrity sha512-MvLo4dzR2Vo7Y85dsqJ07uabBXSSIRKRRdW4l9IGP55h2jYWNm/m9JBszVVxySH5Lda6g+Ins9NdGppZJpjNCA== +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== history@^5.3.0: version "5.3.0" From a591b6f990bb9ef91945bffbeac2d4c77883d043 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Thu, 28 Sep 2023 11:56:18 +0200 Subject: [PATCH 2/3] chore: bump analytics to fix chart crash --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f14221d28e..de23595d9a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "start-server-and-test": "^2.0.0" }, "dependencies": { - "@dhis2/analytics": "^26.0.19", + "@dhis2/analytics": "^26.0.21", "@dhis2/app-runtime": "^3.7.0", "@dhis2/app-runtime-adapter-d2": "^1.1.0", "@dhis2/app-service-datastore": "^1.0.0-beta.3", diff --git a/yarn.lock b/yarn.lock index 669209e150..8a9f0c0ea6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2028,10 +2028,10 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^26.0.19": - version "26.0.19" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.19.tgz#0e70c5171049c5d81c0b2a0180abaa958a3ae1f3" - integrity sha512-OJhBmZ7MYbvYpuvSpX/d7exATD6jOyFQYCt3mtTxx+QhSaFMYiuEHHiGQlCNoo/C/VN5gS6s+rZgl1dImlo6cQ== +"@dhis2/analytics@^26.0.21": + version "26.0.21" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.0.21.tgz#72bd6d1a954161411bf5f6cfa24529a039d5ccdd" + integrity sha512-msDRXjqYeareCdUrTrh0jDIzUQe9g7X8kjo9E6KruVjKRKuiZh0IG31enAbnAAefNT+X4i2sL1DLy1DMflWgRg== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.1" "@dhis2/multi-calendar-dates" "1.0.0" From 0a07a79ef5894b514864b65e50e941ec6aa10942 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 3 Oct 2023 15:34:38 +0200 Subject: [PATCH 3/3] test: remove line that causes tests to fail locally --- cypress/integration/dimensions/data.cy.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/cypress/integration/dimensions/data.cy.js b/cypress/integration/dimensions/data.cy.js index 58965ee184..90c245e4c9 100644 --- a/cypress/integration/dimensions/data.cy.js +++ b/cypress/integration/dimensions/data.cy.js @@ -31,7 +31,6 @@ import { expectSubGroupSelectToBeVisible, expectSubGroupSelectToBe, switchSubGroupTo, - expectSourceToBeLoading, expectSourceToNotBeLoading, unselectAllItemsByButton, selectAllItemsByButton, @@ -439,7 +438,6 @@ describe('Data dimension', () => { cy.intercept('GET', DATA_ITEMS_URL).as('**/dataItems*') } switchDataTypeToAll() - expectSourceToBeLoading() cy.wait('@**/dataItems*').then(({ request, response }) => { expect(request.url).to.contain('page=1') expect(response.statusCode).to.eq(200)