Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): data visualizer plugin [v39] (DHIS2-16888) #2916

Merged
merged 12 commits into from
Apr 10, 2024
Merged

fix(deps): data visualizer plugin [v39] (DHIS2-16888) #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5776b56
fix(deps): update dv plugin dep
janhenrikoverland Feb 22, 2024
d651209
Merge branch 'v39' into fix/data-visualizer-plugin-v39
janhenrikoverland Feb 29, 2024
c301dce
fix(deps): update dv plugin dep
janhenrikoverland Mar 4, 2024
757ede7
fix(deps): update dv plugin dep
janhenrikoverland Mar 4, 2024
de1c94c
fix: bump dv plugin to latest
martinkrulltott Apr 8, 2024
69060aa
chore: allow both 200 and 201 response
jenniferarnesen Apr 8, 2024
bb0e301
chore: lint again
jenniferarnesen Apr 8, 2024
4691488
chore: lint again
jenniferarnesen Apr 8, 2024
402e879
chore: lint again
jenniferarnesen Apr 8, 2024
dd19d4c
Merge branch 'v39' into fix/data-visualizer-plugin-v39
jenniferarnesen Apr 9, 2024
d1990bc
Merge branch 'v39' into fix/data-visualizer-plugin-v39
jenniferarnesen Apr 9, 2024
6e43954
chore: bump DV plugin to latest
edoardo Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cypress/integration/edit/edit_dashboard/show_description.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getApiBaseUrl } from '../../../support/server/utils.js'

const RESP_CODE_200 = 200
const RESP_CODE_201 = 201
const SHOW_DESC_RESP_CODE_FAIL = 409
const RESP_CODE_FAIL = 409

before(() => {
//ensure that the description is not currently shown
Expand Down Expand Up @@ -45,14 +45,14 @@ When('I click to hide the description', () => {
// 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(
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.25",
"@dhis2/ui": "^8.12.4",
"@krakenjs/post-robot": "^11.0.0",
"classnames": "^2.3.2",
Expand Down
30 changes: 13 additions & 17 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,16 +2153,17 @@
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.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"
Expand Down Expand Up @@ -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==
Expand Down Expand Up @@ -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.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.0.9"
"@dhis2/app-runtime" "^3.4.4"
"@dhis2/analytics" "^24.10.5"
"@dhis2/app-runtime" "^3.9.0"
"@dhis2/d2-i18n" "^1.1.0"
"@dhis2/ui" "^8.4.11"
lodash-es "^4.17.21"
Expand Down Expand Up @@ -8896,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"
Expand Down
Loading