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

chore: dependency upgrades #2722

Merged
merged 4 commits into from
Jun 27, 2023
Merged

chore: dependency upgrades #2722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
974843c
chore: dependency upgrades
turban Jun 26, 2023
ddb2d82
chore: dependency upgrades
turban Jun 26, 2023
68bd17d
chore: cypress lint fixes
turban Jun 27, 2023
9b79926
chore: cypress test fix
turban Jun 27, 2023
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
3 changes: 3 additions & 0 deletions cypress/elements/basemap_card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ const activeBasemap = (basemapName) => {
cy.getByDataTest('basemaplistitem-name')
.contains(basemapName)
.scrollIntoView()

cy.getByDataTest('basemaplistitem-name')
turban marked this conversation as resolved.
Show resolved Hide resolved
.contains(basemapName)
.siblings('[data-test=basemaplistitem-img]')
.should('have.css', 'outline', 'rgb(21, 101, 192) solid 3px') // TODO - could remove the actual attribute value
}
Expand Down
13 changes: 11 additions & 2 deletions cypress/elements/file_menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ export const openMap = (mapName) => {
method: 'GET',
url: /\/maps\?/,
}).as('fetchListOfMaps')

cy.getByDataTest('open-file-dialog-modal-name-filter').find('input').clear()

cy.getByDataTest('open-file-dialog-modal-name-filter').find('input').focus()

cy.getByDataTest('open-file-dialog-modal-name-filter')
.find('input')
.clear()
.focus()
.type(mapName)

cy.wait('@fetchListOfMaps')
Expand Down Expand Up @@ -42,6 +45,9 @@ export const saveAsNewMap = (newMapName) => {
cy.getByDataTest('file-menu-saveas-modal-name-content', EXTENDED_TIMEOUT)
.find('input')
.clear()

cy.getByDataTest('file-menu-saveas-modal-name-content', EXTENDED_TIMEOUT)
.find('input')
.type(newMapName)

cy.get('button').contains('Save').click()
Expand All @@ -58,6 +64,9 @@ export const saveNewMap = (newMapName) => {
cy.getByDataTest('file-menu-saveas-modal-name-content', EXTENDED_TIMEOUT)
.find('input')
.clear()

cy.getByDataTest('file-menu-saveas-modal-name-content', EXTENDED_TIMEOUT)
.find('input')
.type(newMapName)

cy.get('button').contains('Save').click()
Expand Down
7 changes: 3 additions & 4 deletions cypress/elements/layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ export class Layer {
}

selectOu(ouName) {
cy.getByDataTest('org-unit-tree')
.contains(ouName)
.scrollIntoView()
.click()
cy.getByDataTest('org-unit-tree').contains(ouName).scrollIntoView()

cy.getByDataTest('org-unit-tree').contains(ouName).click()

return this
}
Expand Down
6 changes: 3 additions & 3 deletions cypress/integration/layers/facilitylayer.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ context('Facility Layers', () => {

Layer.validateDialogClosed(false)

cy.contains('No organisation units are selected')
.scrollIntoView()
.should('be.visible')
cy.contains('No organisation units are selected').scrollIntoView()

cy.contains('No organisation units are selected').should('be.visible')
})

it('adds a facilities layer', () => {
Expand Down
6 changes: 3 additions & 3 deletions cypress/integration/layers/orgunitlayer.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ context('Org Unit Layers', () => {

Layer.validateDialogClosed(false)

cy.contains('No organisation units are selected')
.scrollIntoView()
.should('be.visible')
cy.contains('No organisation units are selected').scrollIntoView()

cy.contains('No organisation units are selected').should('be.visible')
})

it('adds a org unit layer', () => {
Expand Down
24 changes: 16 additions & 8 deletions cypress/integration/plugin.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}aVYDp6FYyFU`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('aVYDp6FYyFU')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('aVYDp6FYyFU')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap1')

Expand All @@ -48,7 +49,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}zDP78aJU8nX`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('zDP78aJU8nX')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('zDP78aJU8nX')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand All @@ -73,7 +75,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}qTfO4YkQ9xW`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('qTfO4YkQ9xW')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('qTfO4YkQ9xW')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand Down Expand Up @@ -106,7 +109,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}ZugJzZ7xxRW`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('ZugJzZ7xxRW')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('ZugJzZ7xxRW')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand Down Expand Up @@ -139,7 +143,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}ZBjCfSaLSqD`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('ZBjCfSaLSqD')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('ZBjCfSaLSqD')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand Down Expand Up @@ -172,7 +177,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}wIIoj44X77r`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('wIIoj44X77r')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('wIIoj44X77r')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand All @@ -196,7 +202,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}voX07ulo2Bq`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('voX07ulo2Bq')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('voX07ulo2Bq')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand All @@ -220,7 +227,8 @@ describe.skip('Basemap checks for plugin', () => {

// cy.visit(`${pluginUrl}voX07ulo2Bq`, EXTENDED_TIMEOUT);
cy.visit(pluginUrl)
cy.get('#inputMapID').clear().type('voX07ulo2Bq')
cy.get('#inputMapID').clear()
cy.get('#inputMapID').type('voX07ulo2Bq')
cy.get('#btnLoadPlugin').click()
cy.wait('@openMap')

Expand Down
28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"postinstall": "patch-package"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "^10.3.8",
"@dhis2/cli-style": "^10.4.3",
"@dhis2/cli-app-scripts": "^10.3.9",
"@dhis2/cli-style": "^10.5.1",
"@dhis2/cypress-commands": "^9.0.2",
"@dhis2/cypress-plugins": "^9.0.2",
"@testing-library/react": "^12.1.5",
Expand All @@ -30,36 +30,36 @@
"cypress-wait-until": "^1.7.2",
"d2-i18n-extract": "^1.0.5",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"enzyme-adapter-react-16": "^1.15.7",
"enzyme-to-json": "^3.6.2",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-cypress": "^2.13.3",
"patch-package": "^6.5.1",
"redux-devtools": "^3.7.0",
"redux-mock-store": "^1.5.4",
"start-server-and-test": "^1.14.0"
"start-server-and-test": "^1.15.4"
},
"dependencies": {
"@dhis2/analytics": "^24.9.3",
"@dhis2/app-runtime": "^3.9.0",
"@dhis2/analytics": "^24.10.1",
"@dhis2/app-runtime": "^3.9.4",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/app-service-alerts": "^3.9.0",
"@dhis2/app-service-alerts": "^3.9.4",
"@dhis2/app-service-datastore": "^1.0.0-beta.3",
"@dhis2/d2-i18n": "^1.1.1",
"@dhis2/maps-gl": "^3.8.4",
"@dhis2/ui": "^8.12.2",
"@dhis2/ui": "^8.13.11",
"@krakenjs/post-robot": "^11.0.0",
"abortcontroller-polyfill": "^1.7.3",
"abortcontroller-polyfill": "^1.7.5",
"array-move": "^4.0.0",
"classnames": "^2.3.2",
"d2": "^31.10.2",
"d2-utilizr": "^0.2.16",
"d3-array": "^3.2.2",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
"d3-color": "^3.1.0",
"d3-format": "^3.1.0",
"d3-scale": "^4.0.2",
"d3-selection": "^3.0.0",
"d3-time": "^3.0.1",
"d3-time": "^3.1.0",
"d3-time-format": "^4.1.0",
"file-saver": "^2.0.5",
"html-to-image": "^1.11.1",
Expand All @@ -68,9 +68,9 @@
"prop-types": "^15.8.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-redux": "^8.0.5",
"react-redux": "^8.1.1",
"react-sortable-hoc": "^1.11.0",
"react-virtualized": "^9.22.3",
"react-virtualized": "^9.22.5",
"redux": "^4.2.1",
"redux-logger": "^3.0.6",
"redux-thunk": "^2.4.2",
Expand Down
Loading