Merge branch 'master' into dependabot/npm_and_yarn/ansi-regex-3.0.1

cypress/e2e/dashboard_filter/dashboard_filter.js

@@ -25,8 +25,8 @@ Then('the Period filter is applied to the dashboard', () => {
     cy.get(filterBadgeSel).contains(`Period: ${PERIOD}`).should('be.visible')
 
     // check the CHART
-    cy.get(`${gridItemSel}.VISUALIZATION`)
-        .getIframeBody()
+    cy.get(`${gridItemSel}.VISUALIZATION`).getIframeBody().as('iframeBody')
+    cy.get('@iframeBody')
         .find(`${chartSubtitleSel} > title`, EXTENDED_TIMEOUT)
         .invoke('text')
         .then((text) => {
@@ -39,12 +39,12 @@ Then('the Period filter is applied to the dashboard', () => {
     // TODO - restore the normal EXTENDED_TIMEOUT when
     // slow loading of this map has been fixes
     // https://dhis2.atlassian.net/browse/DHIS2-14365
-    cy.get(`${gridItemSel}.MAP`)
-        .getIframeBody()
+    cy.get(`${gridItemSel}.MAP`).getIframeBody().as('iframeBodyMap')
+    cy.get('@iframeBodyMap')
         .find('.dhis2-map-legend-button', { timeout: 85000 })
         .trigger('mouseover')
-    cy.get(`${gridItemSel}.MAP`)
-        .getIframeBody()
+    cy.get(`${gridItemSel}.MAP`).getIframeBody().as('iframeBodyMap2')
+    cy.get('@iframeBodyMap2')
         .find('.dhis2-map-legend-period', EXTENDED_TIMEOUT)
         .contains(PERIOD)
         .should('be.visible')
@@ -80,8 +80,8 @@ Then('the Facility Type filter is applied to the dashboard', () => {
         .should('be.visible')
 
     cy.get(innerScrollContainerSel).scrollTo('top')
-    cy.get(`${gridItemSel}.VISUALIZATION`)
-        .getIframeBody()
+    cy.get(`${gridItemSel}.VISUALIZATION`).getIframeBody().as('iframeBody')
+    cy.get('@iframeBody')
         .find(chartSubtitleSel, EXTENDED_TIMEOUT)
         .as('chartSubtitleSel')
         .scrollIntoView()

yarn.lock

@@ -6755,9 +6755,9 @@ [email protected]:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 ejs@^3.1.5, ejs@^3.1.6:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
   dependencies:
     jake "^10.8.5"
 
@@ -14549,9 +14549,9 @@ tmp@^0.0.33:
     os-tmpdir "~1.0.2"
 
 [email protected]:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-absolute-glob@^2.0.0:
   version "2.0.2"
@@ -15446,9 +15446,9 @@ widest-line@^2.0.0:
     string-width "^2.1.1"
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wordwrap@^1.0.0:
   version "1.0.0"