chore: dependency upgrades (#2722)

dhis2 · Jun 27, 2023 · 3ba7831 · 3ba7831
1 parent fd5696d
commit 3ba7831
Show file tree

Hide file tree

Showing 8 changed files with 547 additions and 528 deletions.
diff --git a/cypress/elements/basemap_card.js b/cypress/elements/basemap_card.js
@@ -21,6 +21,9 @@ const activeBasemap = (basemapName) => {
     cy.getByDataTest('basemaplistitem-name')
         .contains(basemapName)
         .scrollIntoView()
+
+    cy.getByDataTest('basemaplistitem-name')
+        .contains(basemapName)
         .siblings('[data-test=basemaplistitem-img]')
         .should('have.css', 'outline', 'rgb(21, 101, 192) solid 3px') // TODO - could remove the actual attribute value
 }

diff --git a/cypress/elements/file_menu.js b/cypress/elements/file_menu.js
@@ -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')
@@ -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()
@@ -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()

diff --git a/cypress/elements/layer.js b/cypress/elements/layer.js
@@ -21,10 +21,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
     }

diff --git a/cypress/integration/layers/facilitylayer.cy.js b/cypress/integration/layers/facilitylayer.cy.js
@@ -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', () => {

diff --git a/cypress/integration/layers/orgunitlayer.cy.js b/cypress/integration/layers/orgunitlayer.cy.js
@@ -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', () => {

diff --git a/cypress/integration/plugin.cy.js b/cypress/integration/plugin.cy.js
@@ -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')
 
@@ -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')
 
@@ -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')
 
@@ -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')
 
@@ -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')
 
@@ -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')
 
@@ -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')
 
@@ -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')
 

diff --git a/package.json b/package.json
@@ -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",
@@ -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",
@@ -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",