From 5776b5674fdb4d55534219b1595beece4f86c0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Thu, 22 Feb 2024 11:39:10 +0100 Subject: [PATCH 1/9] fix(deps): update dv plugin dep --- package.json | 2 +- yarn.lock | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index bb0760923..a2967dd0b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@dhis2/d2-ui-interpretations": "^7.4.1", "@dhis2/d2-ui-mentions-wrapper": "^7.4.1", "@dhis2/d2-ui-rich-text": "^7.4.1", - "@dhis2/data-visualizer-plugin": "^39.2.10", + "@dhis2/data-visualizer-plugin": "39.2.19", "@dhis2/ui": "^8.12.4", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 454e5a839..50fd37eea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2153,12 +2153,13 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^24.0.9": - version "24.2.5" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.2.5.tgz#85b3b42081cf0a08963d33f213625a11450b183a" - integrity sha512-NKC461JXEpz6+Dkc14QPm1N56YxR3/7qAlV4pu2Tpa1yZqrZpNQBPRsCG3bd0T9BkkbClkCWfr/oH9VA9jUyTQ== +"@dhis2/analytics@^24.9.3": + version "24.10.2" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.2.tgz#011d49703125112dda792eadd2fa150d9fa95484" + integrity sha512-26BUUut1AwMEBipgIjKbZGFR9PvrZmf0cJ3am71yMj33n6XRLYI13NUduJ4hSGKXO5bwRkthNkUBsNzhCxOHoQ== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.0" + "@dhis2/multi-calendar-dates" "1.0.0" classnames "^2.3.1" d2-utilizr "^0.2.16" d3-color "^1.2.3" @@ -2204,7 +2205,7 @@ dependencies: prop-types "^15.7.2" -"@dhis2/app-runtime@^3.4.4", "@dhis2/app-runtime@^3.9.0", "@dhis2/app-runtime@^3.9.3": +"@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== @@ -2454,13 +2455,13 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@^39.2.10": - version "39.2.12" - resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.12.tgz#a3e00e9ef6c9bed37d37536cf301e70f5a567aab" - integrity sha512-/esgB1JP+esNdkra6TAlxQjXYRwViHaakGeT9plCRIbCHVPNe0zo0BW/4m/M1ISaJUkrKts4X1R84WEKru3FDQ== +"@dhis2/data-visualizer-plugin@39.2.19": + version "39.2.19" + resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.19.tgz#817dae1fa463324b847cd18b7edb8f2c06f66770" + integrity sha512-CS6qgHRIcdaTwPZozzWmVvplEpojiLPP/sjsrnKcAIV6QIdMPSRC+xUEcDhzyzILcfDPTyruNXgEGQ1gI5Ukqg== dependencies: - "@dhis2/analytics" "^24.0.9" - "@dhis2/app-runtime" "^3.4.4" + "@dhis2/analytics" "^24.9.3" + "@dhis2/app-runtime" "^3.9.0" "@dhis2/d2-i18n" "^1.1.0" "@dhis2/ui" "^8.4.11" lodash-es "^4.17.21" From c301dce257a25a09f0d2b38462711da0b53ef473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Mon, 4 Mar 2024 10:36:57 +0100 Subject: [PATCH 2/9] fix(deps): update dv plugin dep --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a2967dd0b..896cbe751 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@dhis2/d2-ui-interpretations": "^7.4.1", "@dhis2/d2-ui-mentions-wrapper": "^7.4.1", "@dhis2/d2-ui-rich-text": "^7.4.1", - "@dhis2/data-visualizer-plugin": "39.2.19", + "@dhis2/data-visualizer-plugin": "39.2.21", "@dhis2/ui": "^8.12.4", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 50fd37eea..820dfff83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2455,10 +2455,10 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@39.2.19": - version "39.2.19" - resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.19.tgz#817dae1fa463324b847cd18b7edb8f2c06f66770" - integrity sha512-CS6qgHRIcdaTwPZozzWmVvplEpojiLPP/sjsrnKcAIV6QIdMPSRC+xUEcDhzyzILcfDPTyruNXgEGQ1gI5Ukqg== +"@dhis2/data-visualizer-plugin@39.2.21": + version "39.2.21" + resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.21.tgz#1438f9c31a511511bbc3f75bd7c8d0d714e7e3cc" + integrity sha512-eSy0wUw+FbfFwvdv48NWd38A4iATL7mOXZEpK8JEXdi/BwpoJzEjCAOYZv8BXOst3ukn6yTdZqxSIqQBFcNJmQ== dependencies: "@dhis2/analytics" "^24.9.3" "@dhis2/app-runtime" "^3.9.0" From 757ede7012cf7c485b8daa1e113536750cc53381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Henrik=20=C3=98verland?= Date: Mon, 4 Mar 2024 10:46:43 +0100 Subject: [PATCH 3/9] fix(deps): update dv plugin dep --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 896cbe751..9aafb5490 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@dhis2/d2-ui-interpretations": "^7.4.1", "@dhis2/d2-ui-mentions-wrapper": "^7.4.1", "@dhis2/d2-ui-rich-text": "^7.4.1", - "@dhis2/data-visualizer-plugin": "39.2.21", + "@dhis2/data-visualizer-plugin": "^39.2.21", "@dhis2/ui": "^8.12.4", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 820dfff83..46323685e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2455,7 +2455,7 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@39.2.21": +"@dhis2/data-visualizer-plugin@^39.2.21": version "39.2.21" resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.21.tgz#1438f9c31a511511bbc3f75bd7c8d0d714e7e3cc" integrity sha512-eSy0wUw+FbfFwvdv48NWd38A4iATL7mOXZEpK8JEXdi/BwpoJzEjCAOYZv8BXOst3ukn6yTdZqxSIqQBFcNJmQ== From de1c94cb13f3dc1470cbf18e97c5645bb4035ddc Mon Sep 17 00:00:00 2001 From: Martin Ohlson Date: Mon, 8 Apr 2024 13:48:35 +0200 Subject: [PATCH 4/9] fix: bump dv plugin to latest --- package.json | 2 +- yarn.lock | 25 ++++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 9aafb5490..0f121637a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@dhis2/d2-ui-interpretations": "^7.4.1", "@dhis2/d2-ui-mentions-wrapper": "^7.4.1", "@dhis2/d2-ui-rich-text": "^7.4.1", - "@dhis2/data-visualizer-plugin": "^39.2.21", + "@dhis2/data-visualizer-plugin": "^39.2.24", "@dhis2/ui": "^8.12.4", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index 46323685e..a2fb99f03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2153,17 +2153,17 @@ classnames "^2.3.1" prop-types "^15.7.2" -"@dhis2/analytics@^24.9.3": - version "24.10.2" - resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.2.tgz#011d49703125112dda792eadd2fa150d9fa95484" - integrity sha512-26BUUut1AwMEBipgIjKbZGFR9PvrZmf0cJ3am71yMj33n6XRLYI13NUduJ4hSGKXO5bwRkthNkUBsNzhCxOHoQ== +"@dhis2/analytics@^24.10.5": + version "24.10.5" + resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-24.10.5.tgz#1520c20fce10739039ddffb8078eac8319c21bba" + integrity sha512-MM0owzVmFkJr1LYSnfd6Du+j8yM/v5482iAOs6mLStL54JB1jxt3SW5V7LTc8rT8X7Vp55Vj0ZG7pLipEz9bng== dependencies: "@dhis2/d2-ui-rich-text" "^7.4.0" "@dhis2/multi-calendar-dates" "1.0.0" classnames "^2.3.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" @@ -2455,12 +2455,12 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@^39.2.21": - version "39.2.21" - resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.21.tgz#1438f9c31a511511bbc3f75bd7c8d0d714e7e3cc" - integrity sha512-eSy0wUw+FbfFwvdv48NWd38A4iATL7mOXZEpK8JEXdi/BwpoJzEjCAOYZv8BXOst3ukn6yTdZqxSIqQBFcNJmQ== +"@dhis2/data-visualizer-plugin@^39.2.24": + version "39.2.24" + resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.24.tgz#a698898c745cbc62b9d56e86a00e4ae10b173e00" + integrity sha512-R6MZU8DBeqaEdLg4HiWvPVL7FbXx574oYS4eiHdU8R+nGe7TS0BR/ws8ECc/pBsyZWI7P9M9TzIxg2vFu3VoPg== dependencies: - "@dhis2/analytics" "^24.9.3" + "@dhis2/analytics" "^24.10.5" "@dhis2/app-runtime" "^3.9.0" "@dhis2/d2-i18n" "^1.1.0" "@dhis2/ui" "^8.4.11" @@ -8897,11 +8897,6 @@ 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" From 69060aa9a27e8db74e811a560eb71d37cc8846cc Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 8 Apr 2024 16:00:03 +0200 Subject: [PATCH 5/9] chore: allow both 200 and 201 response --- .../edit/edit_dashboard/show_description.js | 15 ++++++++------- .../view_dashboard/toggle_show_more_dashboards.js | 5 ++++- .../view_errors/error_while_show_description.js | 10 +++++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/cypress/integration/edit/edit_dashboard/show_description.js b/cypress/integration/edit/edit_dashboard/show_description.js index 5d56f918b..11aa35d1a 100644 --- a/cypress/integration/edit/edit_dashboard/show_description.js +++ b/cypress/integration/edit/edit_dashboard/show_description.js @@ -2,8 +2,9 @@ import { When, Then } from 'cypress-cucumber-preprocessor/steps' import { clickViewActionButton } from '../../../elements/viewDashboard.js' import { getApiBaseUrl } from '../../../support/server/utils.js' -const SHOW_DESC_RESP_CODE_SUCCESS = 201 -const SHOW_DESC_RESP_CODE_FAIL = 409 +const RESP_CODE_200 = 200 +const RESP_CODE_201 = 201 +const RESP_CODE_FAIL = 409 before(() => { //ensure that the description is not currently shown @@ -15,7 +16,7 @@ before(() => { }, body: 'false', }).then((response) => - expect(response.status).to.equal(SHOW_DESC_RESP_CODE_SUCCESS) + expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) ) }) @@ -29,7 +30,7 @@ When('I click to show description', () => { cy.wait('@toggleDescription') .its('response.statusCode') - .should('eq', SHOW_DESC_RESP_CODE_SUCCESS) + .sho.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201]) }) When('I click to hide the description', () => { @@ -38,20 +39,20 @@ When('I click to hide the description', () => { cy.wait('@toggleDescription') .its('response.statusCode') - .should('eq', SHOW_DESC_RESP_CODE_SUCCESS) + .should('be.oneOf', [RESP_CODE_200, RESP_CODE_201]) }) // Error scenario When('clicking to show description fails', () => { cy.intercept('PUT', 'userDataStore/dashboard/showDescription', { - statusCode: SHOW_DESC_RESP_CODE_FAIL, + statusCode: RESP_CODE_FAIL, }).as('showDescriptionFails') clickViewActionButton('More') cy.contains('Show description').click() cy.wait('@showDescriptionFails') .its('response.statusCode') - .should('eq', SHOW_DESC_RESP_CODE_FAIL) + .should('eq', RESP_CODE_FAIL) }) Then( diff --git a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js index b1dad68a1..f3e255f49 100644 --- a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js +++ b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js @@ -10,6 +10,9 @@ import { EXTENDED_TIMEOUT } from '../../../support/utils.js' const MIN_DASHBOARDS_BAR_HEIGHT = 71 const MAX_DASHBOARDS_BAR_HEIGHT = 431 +const RESP_CODE_200 = 200 +const RESP_CODE_201 = 201 + beforeEach(() => { cy.request({ method: 'PUT', @@ -18,7 +21,7 @@ beforeEach(() => { 'content-type': 'application/json', }, body: '1', - }).then((response) => expect(response.status).to.equal(201)) + }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) }) When('I toggle show more dashboards', () => { diff --git a/cypress/integration/view/view_errors/error_while_show_description.js b/cypress/integration/view/view_errors/error_while_show_description.js index e63549f04..8cec577d1 100644 --- a/cypress/integration/view/view_errors/error_while_show_description.js +++ b/cypress/integration/view/view_errors/error_while_show_description.js @@ -3,6 +3,10 @@ import { getApiBaseUrl } from '../../../support/server/utils.js' // Error scenario +const RESP_CODE_200 = 200 +const RESP_CODE_201 = 201 +const RESP_CODE_FAIL = 409 + before(() => { //first ensure that the description is not currently shown cy.request({ @@ -12,12 +16,12 @@ before(() => { 'content-type': 'application/json', }, body: 'false', - }).then((response) => expect(response.status).to.equal(201)) + }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) }) When('clicking to show description fails', () => { cy.intercept('PUT', 'userDataStore/dashboard/showDescription', { - statusCode: 409, + statusCode: RESP_CODE_FAIL, }).as('showDescriptionFails') cy.get('button').contains('More').click() @@ -25,7 +29,7 @@ When('clicking to show description fails', () => { cy.wait('@showDescriptionFails') .its('response.statusCode') - .should('eq', 409) + .should('eq', RESP_CODE_FAIL) }) Then( From bb0e301db003b8fdb68304f62880bae2a866e513 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 8 Apr 2024 16:51:35 +0200 Subject: [PATCH 6/9] chore: lint again --- cypress/integration/edit/edit_dashboard/show_description.js | 2 +- .../view/view_dashboard/toggle_show_more_dashboards.js | 2 +- .../view/view_errors/error_while_show_description.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/integration/edit/edit_dashboard/show_description.js b/cypress/integration/edit/edit_dashboard/show_description.js index 11aa35d1a..0636ad100 100644 --- a/cypress/integration/edit/edit_dashboard/show_description.js +++ b/cypress/integration/edit/edit_dashboard/show_description.js @@ -30,7 +30,7 @@ When('I click to show description', () => { cy.wait('@toggleDescription') .its('response.statusCode') - .sho.should('be.oneOf', [RESP_CODE_200, RESP_CODE_201]) + .should('be.oneOf', [RESP_CODE_200, RESP_CODE_201]) }) When('I click to hide the description', () => { diff --git a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js index f3e255f49..2d78fceea 100644 --- a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js +++ b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js @@ -21,7 +21,7 @@ beforeEach(() => { 'content-type': 'application/json', }, body: '1', - }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) + }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])) }) When('I toggle show more dashboards', () => { diff --git a/cypress/integration/view/view_errors/error_while_show_description.js b/cypress/integration/view/view_errors/error_while_show_description.js index 8cec577d1..c4aa937a9 100644 --- a/cypress/integration/view/view_errors/error_while_show_description.js +++ b/cypress/integration/view/view_errors/error_while_show_description.js @@ -16,7 +16,7 @@ before(() => { 'content-type': 'application/json', }, body: 'false', - }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) + }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])) }) When('clicking to show description fails', () => { From 4691488b718ad3c51cd3ed560ce2c3e7c2127188 Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 8 Apr 2024 19:56:36 +0200 Subject: [PATCH 7/9] chore: lint again --- cypress/integration/edit/edit_dashboard/show_description.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/edit/edit_dashboard/show_description.js b/cypress/integration/edit/edit_dashboard/show_description.js index 0636ad100..2f00c3ddb 100644 --- a/cypress/integration/edit/edit_dashboard/show_description.js +++ b/cypress/integration/edit/edit_dashboard/show_description.js @@ -16,7 +16,7 @@ before(() => { }, body: 'false', }).then((response) => - expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) + expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200]) ) }) From 402e879a256d379f63e37cc2c29f8f1ff64b860d Mon Sep 17 00:00:00 2001 From: Jen Jones Arnesen Date: Mon, 8 Apr 2024 20:01:41 +0200 Subject: [PATCH 8/9] chore: lint again --- .../view/view_dashboard/toggle_show_more_dashboards.js | 5 +---- .../view/view_errors/error_while_show_description.js | 10 +++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js index 2d78fceea..25579ee52 100644 --- a/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js +++ b/cypress/integration/view/view_dashboard/toggle_show_more_dashboards.js @@ -10,9 +10,6 @@ import { EXTENDED_TIMEOUT } from '../../../support/utils.js' const MIN_DASHBOARDS_BAR_HEIGHT = 71 const MAX_DASHBOARDS_BAR_HEIGHT = 431 -const RESP_CODE_200 = 200 -const RESP_CODE_201 = 201 - beforeEach(() => { cy.request({ method: 'PUT', @@ -21,7 +18,7 @@ beforeEach(() => { 'content-type': 'application/json', }, body: '1', - }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])) + }).then((response) => expect(response.status).to.be.oneOf([200, 201])) }) When('I toggle show more dashboards', () => { diff --git a/cypress/integration/view/view_errors/error_while_show_description.js b/cypress/integration/view/view_errors/error_while_show_description.js index c4aa937a9..367be68cd 100644 --- a/cypress/integration/view/view_errors/error_while_show_description.js +++ b/cypress/integration/view/view_errors/error_while_show_description.js @@ -3,10 +3,6 @@ import { getApiBaseUrl } from '../../../support/server/utils.js' // Error scenario -const RESP_CODE_200 = 200 -const RESP_CODE_201 = 201 -const RESP_CODE_FAIL = 409 - before(() => { //first ensure that the description is not currently shown cy.request({ @@ -16,12 +12,12 @@ before(() => { 'content-type': 'application/json', }, body: 'false', - }).then((response) => expect(response.status).to.be.oneOf([RESP_CODE_201, RESP_CODE_200])) + }).then((response) => expect(response.status).to.be.oneOf([200, 201])) }) When('clicking to show description fails', () => { cy.intercept('PUT', 'userDataStore/dashboard/showDescription', { - statusCode: RESP_CODE_FAIL, + statusCode: 409, }).as('showDescriptionFails') cy.get('button').contains('More').click() @@ -29,7 +25,7 @@ When('clicking to show description fails', () => { cy.wait('@showDescriptionFails') .its('response.statusCode') - .should('eq', RESP_CODE_FAIL) + .should('eq', 409) }) Then( From 6e439549a3b7c3b3292a9b62c7b6b523f8485482 Mon Sep 17 00:00:00 2001 From: Edoardo Sabadelli Date: Tue, 9 Apr 2024 14:24:30 +0200 Subject: [PATCH 9/9] chore: bump DV plugin to latest --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0f121637a..bb72753ef 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@dhis2/d2-ui-interpretations": "^7.4.1", "@dhis2/d2-ui-mentions-wrapper": "^7.4.1", "@dhis2/d2-ui-rich-text": "^7.4.1", - "@dhis2/data-visualizer-plugin": "^39.2.24", + "@dhis2/data-visualizer-plugin": "^39.2.25", "@dhis2/ui": "^8.12.4", "@krakenjs/post-robot": "^11.0.0", "classnames": "^2.3.2", diff --git a/yarn.lock b/yarn.lock index a2fb99f03..908b80a76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2455,10 +2455,10 @@ recompose "^0.26.0" rxjs "^5.5.7" -"@dhis2/data-visualizer-plugin@^39.2.24": - version "39.2.24" - resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.24.tgz#a698898c745cbc62b9d56e86a00e4ae10b173e00" - integrity sha512-R6MZU8DBeqaEdLg4HiWvPVL7FbXx574oYS4eiHdU8R+nGe7TS0BR/ws8ECc/pBsyZWI7P9M9TzIxg2vFu3VoPg== +"@dhis2/data-visualizer-plugin@^39.2.25": + version "39.2.25" + resolved "https://registry.yarnpkg.com/@dhis2/data-visualizer-plugin/-/data-visualizer-plugin-39.2.25.tgz#02376570ac778f67fdf43b9097d1770e0d98949e" + integrity sha512-XiEtSMdjsP7nsF/GWBT+OR3k6cA7HjLktt2TdQFXDsEogL8NBI7hLgGzsRc8K/mddsbmFe4wl2jqXFa61lFLjQ== dependencies: "@dhis2/analytics" "^24.10.5" "@dhis2/app-runtime" "^3.9.0"