dev-to-master diff

.github/dependabot.yml

@@ -5,5 +5,4 @@ updates:
       schedule:
           interval: daily
       open-pull-requests-limit: 10
-      target-branch: master
       versioning-strategy: increase

.gitignore

@@ -4,6 +4,9 @@ cypress/videos/
 cypress/screenshots/
 cypress/downloads/
 cypress.env.json
+yarn-error.log
+.jshintignore
+.jshintrc
 
 # DHIS2 Platform
 .d2

.tx/config

@@ -1,18 +1,13 @@
 [main]
-host     = https://www.transifex.com
+host = https://www.transifex.com
 lang_map = fa_AF: prs, uz@Cyrl: uz, uz@Latn: uz_Latn
 
+
 [o:hisp-uio:p:app-maps:r:en-pot]
-file_filter  = i18n/<lang>.po
-source_file  = i18n/en.pot
-source_lang  = en
-type         = PO
+file_filter = i18n/<lang>.po
+source_file = i18n/en.pot
+source_lang = en
+type = PO
 minimum_perc = 0
 
-[o:hisp-uio:p:app-maps:r:i18n_module_en-properties]
-file_filter  = public/i18n_old/i18n_module_<lang>.properties
-source_file  = public/i18n_old/i18n_module_en.properties
-source_lang  = en
-type         = PROPERTIES
-minimum_perc = 0
 

cypress.json

@@ -8,5 +8,6 @@
         "networkMode": "live",
         "dhis2ApiVersion": "40"
     },
-    "testFiles": "**/*.cy.js"
+    "testFiles": "**/*.cy.js",
+    "defaultCommandTimeout": 15000
 }

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
 }

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()

cypress/elements/layer.js

@@ -1,12 +1,10 @@
-import { EXTENDED_TIMEOUT } from '../support/util.js'
-
 export class Layer {
     openDialog(layer) {
         const dataTest = `addlayeritem-${layer
             .toLowerCase()
             .replace(/\s/g, '_')}`
 
-        cy.getByDataTest('add-layer-button', EXTENDED_TIMEOUT).click()
+        cy.getByDataTest('add-layer-button').click()
 
         cy.get(`[data-test="${dataTest}"]`).click()
 
@@ -23,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
     }
@@ -51,38 +48,36 @@ export class Layer {
     }
 
     addToMap() {
-        cy.getByDataTest('dhis2-uicore-modalactions', EXTENDED_TIMEOUT)
+        cy.getByDataTest('dhis2-uicore-modalactions')
             .contains('Add layer')
             .click()
     }
 
     validateDialogClosed(closed) {
         if (closed) {
-            cy.getByDataTest('layeredit', EXTENDED_TIMEOUT).should('not.exist')
+            cy.getByDataTest('layeredit').should('not.exist')
         } else {
-            cy.getByDataTest('layeredit', EXTENDED_TIMEOUT).should('be.visible')
+            cy.getByDataTest('layeredit').should('be.visible')
         }
     }
 
     validateCardTitle(title) {
-        cy.getByDataTest('layercard', EXTENDED_TIMEOUT)
-            .contains(title, EXTENDED_TIMEOUT)
+        cy.getByDataTest('layercard')
+            .contains(title, { timeout: 50000 })
             .should('be.visible')
 
         return this
     }
 
     validateCardPeriod(period) {
-        cy.getByDataTest('layercard', EXTENDED_TIMEOUT)
-            .contains(period)
-            .should('be.visible')
+        cy.getByDataTest('layercard').contains(period).should('be.visible')
 
         return this
     }
 
     validateCardItems(items) {
         items.forEach((item) => {
-            cy.getByDataTest('layercard', EXTENDED_TIMEOUT)
+            cy.getByDataTest('layercard')
                 .find('[data-test="layerlegend-item"]')
                 .contains(item)
                 .should('be.visible')

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', () => {

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', () => {

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')