From e387160d3e93781fbe06a6463283fc8b55fbcd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 4 Dec 2023 16:36:27 +0100
Subject: [PATCH 01/17] feat: disable download button until map is rendered

---
 src/components/download/DownloadSettings.js | 37 ++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index b6efedb22..cdbedd756 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -13,8 +13,10 @@ import { Checkbox, Help } from '../core/index.js'
 import LegendLayers from './LegendLayers.js'
 import NorthArrowPosition from './NorthArrowPosition.js'
 import styles from './styles/DownloadSettings.module.css'
+import { is } from 'cypress/types/bluebird/index.js'
 
 const DownloadSettings = () => {
+    const [isRendered, setIsRendered] = useState(false)
     const [error, setError] = useState(null)
     const dispatch = useDispatch()
 
@@ -67,6 +69,35 @@ const DownloadSettings = () => {
         )
     }, [name, description, legendLayers, hasLayers, dispatch])
 
+    useEffect(() => {
+        const mapElements = document.getElementsByClassName('dhis2-map')
+
+        const observer = new MutationObserver((mutations) => {
+            mutations.forEach((mutation) => {
+                if (mutation.attributeName == 'class') {
+                    setIsRendered(
+                        mutation.target.classList.contains('dhis2-map-rendered')
+                    )
+                }
+            })
+        })
+
+        for (let mapEl of mapElements) {
+            observer.observe(mapEl, { attributes: true })
+        }
+
+        return () => {
+            observer.disconnect()
+        }
+    }, [showOverviewMap])
+
+    useEffect(() => {
+        if (isRendered) {
+            console.log('isRendered trigger download')
+            onDownload()
+        }
+    }, [isRendered, onDownload])
+
     const isSupported = downloadSupport() && !error
     const isSplitView = !!getSplitViewLayer(mapViews)
     const showMarginsCheckbox = false // Not in use
@@ -205,7 +236,11 @@ const DownloadSettings = () => {
                                     : i18n.t('Close')}
                             </Button>
                             {isSupported && (
-                                <Button primary onClick={onDownload}>
+                                <Button
+                                    primary
+                                    disabled={!isRendered}
+                                    onClick={onDownload}
+                                >
                                     {i18n.t('Download')}
                                 </Button>
                             )}

From 9f172b067fcc5d6a6c5f524045d402c45fa333f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 4 Dec 2023 17:54:20 +0100
Subject: [PATCH 02/17] chore: code cleaning

---
 src/components/download/DownloadSettings.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index cdbedd756..0b1b71006 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -13,7 +13,6 @@ import { Checkbox, Help } from '../core/index.js'
 import LegendLayers from './LegendLayers.js'
 import NorthArrowPosition from './NorthArrowPosition.js'
 import styles from './styles/DownloadSettings.module.css'
-import { is } from 'cypress/types/bluebird/index.js'
 
 const DownloadSettings = () => {
     const [isRendered, setIsRendered] = useState(false)
@@ -83,20 +82,14 @@ const DownloadSettings = () => {
         })
 
         for (let mapEl of mapElements) {
+            mapEl.classList.remove('dhis2-map-rendered')
             observer.observe(mapEl, { attributes: true })
         }
 
         return () => {
             observer.disconnect()
         }
-    }, [showOverviewMap])
-
-    useEffect(() => {
-        if (isRendered) {
-            console.log('isRendered trigger download')
-            onDownload()
-        }
-    }, [isRendered, onDownload])
+    }, [])
 
     const isSupported = downloadSupport() && !error
     const isSplitView = !!getSplitViewLayer(mapViews)

From d840c3d87a6045290fb11f6aaa00fe288890d6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 4 Dec 2023 18:03:37 +0100
Subject: [PATCH 03/17] chore: code cleaning

---
 src/components/download/DownloadSettings.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index 0b1b71006..54c1f4f32 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -14,6 +14,11 @@ import LegendLayers from './LegendLayers.js'
 import NorthArrowPosition from './NorthArrowPosition.js'
 import styles from './styles/DownloadSettings.module.css'
 
+const mapContainerId = 'dhis2-map-container'
+const mapClass = 'dhis2-map'
+const renderedClass = 'dhis2-map-rendered'
+const downloadingClass = 'dhis2-map-downloading'
+
 const DownloadSettings = () => {
     const [isRendered, setIsRendered] = useState(false)
     const [error, setError] = useState(null)
@@ -39,17 +44,17 @@ const DownloadSettings = () => {
 
     const onDownload = useCallback(() => {
         const filename = standardizeFilename(getMapName(name), 'png')
-        let mapEl = document.getElementById('dhis2-map-container')
+        let mapEl = document.getElementById(mapContainerId)
 
         if (includeMargins) {
             mapEl = mapEl.parentNode
         }
 
         // Temporary added to remove close 'x' from map popups
-        mapEl.classList.add('dhis2-map-downloading')
+        mapEl.classList.add(downloadingClass)
 
         downloadMapImage(mapEl, filename)
-            .then(() => mapEl.classList.remove('dhis2-map-downloading'))
+            .then(() => mapEl.classList.remove(downloadingClass))
             .catch(setError)
     }, [name, includeMargins])
 
@@ -69,20 +74,21 @@ const DownloadSettings = () => {
     }, [name, description, legendLayers, hasLayers, dispatch])
 
     useEffect(() => {
-        const mapElements = document.getElementsByClassName('dhis2-map')
+        // Multiple map elements if split view
+        const mapElements = document.getElementsByClassName(mapClass)
 
         const observer = new MutationObserver((mutations) => {
             mutations.forEach((mutation) => {
                 if (mutation.attributeName == 'class') {
                     setIsRendered(
-                        mutation.target.classList.contains('dhis2-map-rendered')
+                        mutation.target.classList.contains(renderedClass)
                     )
                 }
             })
         })
 
-        for (let mapEl of mapElements) {
-            mapEl.classList.remove('dhis2-map-rendered')
+        for (const mapEl of mapElements) {
+            mapEl.classList.remove(renderedClass)
             observer.observe(mapEl, { attributes: true })
         }
 

From 1dfc9fcdc09e2d8c6afcde232c31cbd8074cb143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 4 Dec 2023 18:05:52 +0100
Subject: [PATCH 04/17] chore: code comment

---
 src/components/download/DownloadSettings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index 54c1f4f32..dd494056b 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -77,6 +77,7 @@ const DownloadSettings = () => {
         // Multiple map elements if split view
         const mapElements = document.getElementsByClassName(mapClass)
 
+        // Observe is rendered class is added to map element
         const observer = new MutationObserver((mutations) => {
             mutations.forEach((mutation) => {
                 if (mutation.attributeName == 'class') {

From d3f02cfdb0125d8bab82b18a1e5e442f0644a975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 11 Dec 2023 13:06:33 +0100
Subject: [PATCH 05/17] fix: isPushAnalytics url param

---
 src/components/download/DownloadSettings.js | 47 ++++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index dd494056b..4296db3e8 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -6,7 +6,7 @@ import { setDownloadConfig } from '../../actions/download.js'
 import { standardizeFilename } from '../../util/dataDownload.js'
 import { downloadMapImage, downloadSupport } from '../../util/export-image.js'
 import { getSplitViewLayer } from '../../util/helpers.js'
-import { closeDownloadMode } from '../../util/history.js'
+import { closeDownloadMode, getHashUrlParams } from '../../util/history.js'
 import { getMapName } from '../app/FileMenu.js'
 import Drawer from '../core/Drawer.js'
 import { Checkbox, Help } from '../core/index.js'
@@ -20,10 +20,13 @@ const renderedClass = 'dhis2-map-rendered'
 const downloadingClass = 'dhis2-map-downloading'
 
 const DownloadSettings = () => {
+    const isPushAnalytics = getHashUrlParams('isPushAnalytics') === 'true'
     const [isRendered, setIsRendered] = useState(false)
     const [error, setError] = useState(null)
     const dispatch = useDispatch()
 
+    console.log('isPushAnalytics', isPushAnalytics)
+
     const { mapViews, name, description } = useSelector((state) => state.map)
     const {
         showName,
@@ -74,29 +77,31 @@ const DownloadSettings = () => {
     }, [name, description, legendLayers, hasLayers, dispatch])
 
     useEffect(() => {
-        // Multiple map elements if split view
-        const mapElements = document.getElementsByClassName(mapClass)
-
-        // Observe is rendered class is added to map element
-        const observer = new MutationObserver((mutations) => {
-            mutations.forEach((mutation) => {
-                if (mutation.attributeName == 'class') {
-                    setIsRendered(
-                        mutation.target.classList.contains(renderedClass)
-                    )
-                }
+        if (isPushAnalytics) {
+            // Multiple map elements if split view
+            const mapElements = document.getElementsByClassName(mapClass)
+
+            // Observe is rendered class is added to map element
+            const observer = new MutationObserver((mutations) => {
+                mutations.forEach((mutation) => {
+                    if (mutation.attributeName == 'class') {
+                        setIsRendered(
+                            mutation.target.classList.contains(renderedClass)
+                        )
+                    }
+                })
             })
-        })
 
-        for (const mapEl of mapElements) {
-            mapEl.classList.remove(renderedClass)
-            observer.observe(mapEl, { attributes: true })
-        }
+            for (const mapEl of mapElements) {
+                mapEl.classList.remove(renderedClass)
+                observer.observe(mapEl, { attributes: true })
+            }
 
-        return () => {
-            observer.disconnect()
+            return () => {
+                observer.disconnect()
+            }
         }
-    }, [])
+    }, [isPushAnalytics])
 
     const isSupported = downloadSupport() && !error
     const isSplitView = !!getSplitViewLayer(mapViews)
@@ -238,7 +243,7 @@ const DownloadSettings = () => {
                             {isSupported && (
                                 <Button
                                     primary
-                                    disabled={!isRendered}
+                                    disabled={isPushAnalytics && !isRendered}
                                     onClick={onDownload}
                                 >
                                     {i18n.t('Download')}

From e6de337136abce0e5d360a4e729255db805b9114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Sandvik?= <bjorn@mastermaps.com>
Date: Mon, 11 Dec 2023 13:07:08 +0100
Subject: [PATCH 06/17] fix: isPushAnalytics url param

---
 src/components/download/DownloadSettings.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index 4296db3e8..e8f97eec0 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -25,8 +25,6 @@ const DownloadSettings = () => {
     const [error, setError] = useState(null)
     const dispatch = useDispatch()
 
-    console.log('isPushAnalytics', isPushAnalytics)
-
     const { mapViews, name, description } = useSelector((state) => state.map)
     const {
         showName,

From 52b4c114081e6a05857c9e5f57b8b2d9ebe6d3d2 Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Mon, 5 Feb 2024 11:35:55 +0100
Subject: [PATCH 07/17] chore: update @dhis2/analytics and deduplicate deps

---
 package.json |   2 +-
 yarn.lock    | 150 +++++++--------------------------------------------
 2 files changed, 21 insertions(+), 131 deletions(-)

diff --git a/package.json b/package.json
index 0678986a0..70f8966d4 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
         "start-server-and-test": "^2.0.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^26.2.0",
+        "@dhis2/analytics": "^26.3.0",
         "@dhis2/app-runtime": "^3.10.2",
         "@dhis2/app-runtime-adapter-d2": "^1.1.0",
         "@dhis2/app-service-alerts": "^3.9.4",
diff --git a/yarn.lock b/yarn.lock
index 7add303b8..c2bcaaa7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26,14 +26,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.22.13":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.8.3":
   version "7.22.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
   integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
@@ -76,17 +69,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.21.0", "@babel/generator@^7.7.2":
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
-  integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
-  dependencies:
-    "@babel/types" "^7.21.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.23.0":
+"@babel/generator@^7.21.0", "@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
   integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
@@ -156,12 +139,7 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-environment-visitor@^7.22.20":
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
@@ -173,15 +151,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -189,14 +159,7 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-hoist-variables@^7.22.5":
+"@babel/helper-hoist-variables@^7.18.6", "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
@@ -279,36 +242,19 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-
-"@babel/helper-string-parser@^7.22.5":
+"@babel/helper-string-parser@^7.19.4", "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-identifier@^7.22.20":
+"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1", "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
@@ -337,16 +283,7 @@
     "@babel/traverse" "^7.21.0"
     "@babel/types" "^7.21.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.22.13":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6", "@babel/highlight@^7.22.13":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
   integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
@@ -355,12 +292,7 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.7.0":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
-  integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0", "@babel/parser@^7.7.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
@@ -1141,30 +1073,14 @@
     core-js "^2.6.12"
     regenerator-runtime "^0.13.11"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
-  dependencies:
-    regenerator-runtime "^0.13.11"
-
-"@babel/runtime@^7.7.6":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.0", "@babel/runtime@^7.16.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.20.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.22.10"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
   integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/template@^7.22.15":
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.22.15", "@babel/template@^7.3.3":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -1197,16 +1113,7 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
-  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
+"@babel/types@^7.0.0", "@babel/types@^7.12.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
   integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -2109,10 +2016,10 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2/analytics@^26.2.0":
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.2.0.tgz#36a7f258ac96ddab90f4001e62257e2cc64f202e"
-  integrity sha512-YcJu6EHnor6pbHmwXKYumLRVy/9TxuLtBDv9JIzjt9/APZa8kbak6sT2/53pnWDnbUjzDwR8EV1UIz24vAX+ig==
+"@dhis2/analytics@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-26.3.0.tgz#ada2fe27442f19704fa704e334546416c85ea1d6"
+  integrity sha512-B/pUh8K8wyivL4yBiwqPoQ94pMWwCqh0xu3Uak4jmJqS+jO0slUlyDLtAmXU/jqRlRgRg1nR4u18npjd511Q7A==
   dependencies:
     "@dhis2/d2-ui-rich-text" "^7.4.1"
     "@dhis2/multi-calendar-dates" "1.0.0"
@@ -8308,12 +8215,7 @@ flush-write-stream@^1.0.2:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
-follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
   version "1.15.3"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
   integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
@@ -14125,14 +14027,7 @@ rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.5.1:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
-  dependencies:
-    tslib "^2.1.0"
-
-rxjs@^7.8.1:
+rxjs@^7.5.1, rxjs@^7.8.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
@@ -15539,16 +15434,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0:
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
   integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
 
-tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"

From 7f1c04d2e53748642af072582cffcd38666ef745 Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Mon, 5 Feb 2024 12:21:09 +0100
Subject: [PATCH 08/17] chore: read single url param

---
 src/components/download/DownloadSettings.js | 4 ++--
 src/util/history.js                         | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index e8f97eec0..ba234d3d4 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -6,7 +6,7 @@ import { setDownloadConfig } from '../../actions/download.js'
 import { standardizeFilename } from '../../util/dataDownload.js'
 import { downloadMapImage, downloadSupport } from '../../util/export-image.js'
 import { getSplitViewLayer } from '../../util/helpers.js'
-import { closeDownloadMode, getHashUrlParams } from '../../util/history.js'
+import { closeDownloadMode, getHashUrlParam } from '../../util/history.js'
 import { getMapName } from '../app/FileMenu.js'
 import Drawer from '../core/Drawer.js'
 import { Checkbox, Help } from '../core/index.js'
@@ -20,7 +20,7 @@ const renderedClass = 'dhis2-map-rendered'
 const downloadingClass = 'dhis2-map-downloading'
 
 const DownloadSettings = () => {
-    const isPushAnalytics = getHashUrlParams('isPushAnalytics') === 'true'
+    const isPushAnalytics = getHashUrlParam('isPushAnalytics')
     const [isRendered, setIsRendered] = useState(false)
     const [error, setError] = useState(null)
     const dispatch = useDispatch()
diff --git a/src/util/history.js b/src/util/history.js
index 52a26f358..ed49ecf89 100644
--- a/src/util/history.js
+++ b/src/util/history.js
@@ -34,6 +34,11 @@ const getHashUrlParams = (loc) => {
     return params
 }
 
+const getHashUrlParam = (key) => {
+    const params = getHashUrlParams(history.location)
+    return params[key]
+}
+
 const openDownloadMode = () => {
     if (history.location.pathname === '/') {
         history.push(`/${DOWNLOAD}`)
@@ -53,6 +58,7 @@ const closeDownloadMode = () => {
 
 export {
     getHashUrlParams,
+    getHashUrlParam,
     defaultHashUrlParams,
     openDownloadMode,
     closeDownloadMode,

From 4e5e008a8067e2d7b95d367861111ea08cb4b105 Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Mon, 5 Feb 2024 12:34:33 +0100
Subject: [PATCH 09/17] fix: ensure isDownload is a bool to avoid prop-types
 error

---
 src/components/layers/LayersToggle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/layers/LayersToggle.js b/src/components/layers/LayersToggle.js
index f9f31a69c..a1768527d 100644
--- a/src/components/layers/LayersToggle.js
+++ b/src/components/layers/LayersToggle.js
@@ -31,7 +31,7 @@ LayersToggle.propTypes = {
 export default connect(
     (state) => ({
         isOpen: state.ui.layersPanelOpen,
-        isDownload: state.download.downloadMode,
+        isDownload: !!state.download.downloadMode,
     }),
     { openLayersPanel, closeLayersPanel }
 )(LayersToggle)

From f71ce1c5953a669c2230aca1b94d448bd538f3cf Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Mon, 5 Feb 2024 12:39:12 +0100
Subject: [PATCH 10/17] fix: add class-names for push-analytics

---
 src/components/download/DownloadButton.js   | 9 ++++++++-
 src/components/download/DownloadSettings.js | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/download/DownloadButton.js b/src/components/download/DownloadButton.js
index 971d76e9f..63f3b3d78 100644
--- a/src/components/download/DownloadButton.js
+++ b/src/components/download/DownloadButton.js
@@ -1,11 +1,18 @@
 import i18n from '@dhis2/d2-i18n'
+import cx from 'classnames'
 import React from 'react'
 import { openDownloadMode } from '../../util/history.js'
 import styles from './styles/DownloadButton.module.css'
 
 const DownloadButton = () => {
     return (
-        <button className={styles.button} onClick={openDownloadMode}>
+        <button
+            className={cx(
+                styles.button,
+                'push-analytics-download-dropdown-menu-button'
+            )}
+            onClick={openDownloadMode}
+        >
             {i18n.t('Download')}
         </button>
     )
diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index ba234d3d4..585835723 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -243,6 +243,7 @@ const DownloadSettings = () => {
                                     primary
                                     disabled={isPushAnalytics && !isRendered}
                                     onClick={onDownload}
+                                    className="push-analytics-download-button"
                                 >
                                     {i18n.t('Download')}
                                 </Button>

From a09c125c852bf6c1eedb390bcaf4792456459889 Mon Sep 17 00:00:00 2001
From: Jen Jones Arnesen <jennifer@dhis2.org>
Date: Wed, 14 Feb 2024 10:39:46 +0100
Subject: [PATCH 11/17] fix: check download param when navigating to new

---
 src/components/app/useLoadMap.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/app/useLoadMap.js b/src/components/app/useLoadMap.js
index 7660df3c0..5e4cbb3b7 100644
--- a/src/components/app/useLoadMap.js
+++ b/src/components/app/useLoadMap.js
@@ -26,30 +26,36 @@ export const useLoadMap = () => {
 
     const loadMap = useCallback(
         async (hashLocation) => {
-            previousParamsRef.current = getHashUrlParams(hashLocation)
+            const params = getHashUrlParams(hashLocation)
 
-            if (hashLocation.pathname === '/') {
+            if (params.mapId === '') {
                 dispatch(newMap())
+                if (
+                    params.isDownload !== previousParamsRef.current.isDownload
+                ) {
+                    dispatch(setDownloadMode(params.isDownload))
+                }
+
+                previousParamsRef.current = params
                 return
             }
 
-            const { mapId, isDownload, interpretationId } =
-                previousParamsRef.current
-
-            if (mapId === CURRENT_AO_KEY) {
+            if (params.mapId === CURRENT_AO_KEY) {
                 dispatch(newMap())
                 dispatch(setAnalyticalObject(true))
-                if (isDownload) {
+                if (params.isDownload) {
                     dispatch(setDownloadMode(true))
                 }
+
+                previousParamsRef.current = params
                 return
             }
 
             try {
-                const map = await fetchMap(mapId, engine, defaultBasemap)
+                const map = await fetchMap(params.mapId, engine, defaultBasemap)
 
                 engine.mutate(dataStatisticsMutation, {
-                    variables: { id: mapId },
+                    variables: { id: params.mapId },
                     onError: (error) => log.error('Error: ', error),
                 })
 
@@ -66,15 +72,17 @@ export const useLoadMap = () => {
                     })
                 )
 
-                if (interpretationId) {
-                    dispatch(setInterpretation(interpretationId))
-                } else if (isDownload) {
+                if (params.interpretationId) {
+                    dispatch(setInterpretation(params.interpretationId))
+                } else if (params.isDownload) {
                     dispatch(setDownloadMode(true))
                 }
             } catch (e) {
                 log.error(e)
                 dispatch(newMap())
+                dispatch(setDownloadMode(false))
             }
+            previousParamsRef.current = params
         },
         [basemaps, defaultBasemap, dispatch, engine]
     )

From fc755036475f1def24fef71780e2facac1b7fffa Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Wed, 14 Feb 2024 18:16:55 +0100
Subject: [PATCH 12/17] fix: prevent enabling download button while loading
 mask is showing

---
 src/components/download/DownloadSettings.js | 6 +++++-
 src/components/map/MapLoadingMask.js        | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/download/DownloadSettings.js b/src/components/download/DownloadSettings.js
index 585835723..a6bfd81e7 100644
--- a/src/components/download/DownloadSettings.js
+++ b/src/components/download/DownloadSettings.js
@@ -10,6 +10,7 @@ import { closeDownloadMode, getHashUrlParam } from '../../util/history.js'
 import { getMapName } from '../app/FileMenu.js'
 import Drawer from '../core/Drawer.js'
 import { Checkbox, Help } from '../core/index.js'
+import { loadingMaskClass } from '../map/MapLoadingMask.js'
 import LegendLayers from './LegendLayers.js'
 import NorthArrowPosition from './NorthArrowPosition.js'
 import styles from './styles/DownloadSettings.module.css'
@@ -84,7 +85,10 @@ const DownloadSettings = () => {
                 mutations.forEach((mutation) => {
                     if (mutation.attributeName == 'class') {
                         setIsRendered(
-                            mutation.target.classList.contains(renderedClass)
+                            !document.querySelector(`.${loadingMaskClass}`) &&
+                                mutation.target.classList.contains(
+                                    renderedClass
+                                )
                         )
                     }
                 })
diff --git a/src/components/map/MapLoadingMask.js b/src/components/map/MapLoadingMask.js
index ce43dd3ec..7cc781260 100644
--- a/src/components/map/MapLoadingMask.js
+++ b/src/components/map/MapLoadingMask.js
@@ -1,11 +1,14 @@
 import { ComponentCover, CenteredContent, CircularLoader } from '@dhis2/ui'
+import cx from 'classnames'
 import React from 'react'
 import styles from './styles/MapLoadingMask.module.css'
 
+export const loadingMaskClass = 'dhis2-map-loading-mask'
+
 const MapLoadingMask = () => (
     <ComponentCover
         translucent
-        className={styles.cover}
+        className={cx(styles.cover, loadingMaskClass)}
         dataTest="map-loading-mask"
     >
         <CenteredContent>

From c9470bf2e7c6bc51adb85be08c427a39bb5b94eb Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Wed, 14 Feb 2024 18:17:42 +0100
Subject: [PATCH 13/17] fix: add class to map container when no map id is set

---
 src/components/map/MapPosition.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/map/MapPosition.js b/src/components/map/MapPosition.js
index 67a821e5e..e16700206 100644
--- a/src/components/map/MapPosition.js
+++ b/src/components/map/MapPosition.js
@@ -100,6 +100,7 @@ const MapPosition = () => {
                     className={cx(styles.mapContainer, {
                         [styles.download]: downloadMode,
                         'dhis2-map-download': downloadMode,
+                        'dhis2-map-new': !downloadMode && !mapId,
                     })}
                 >
                     <MapContainer resizeCount={resizeCount} setMap={setMap} />

From 36a35934c90a93707385aa8ad360c8d66d780a02 Mon Sep 17 00:00:00 2001
From: Joseph John Aas Cooper <joe@dhis2.org>
Date: Fri, 26 Jan 2024 14:04:46 +0100
Subject: [PATCH 14/17] fix: improve hover states and add consistent spacing
 [UX-161] (#3121)

---
 src/AppWrapper.js                             |  7 ++++-
 .../core/styles/IconButton.module.css         | 15 ++++++++--
 .../overlays/styles/AddLayerButton.module.css | 12 ++++++--
 .../layers/overlays/styles/Layer.module.css   | 28 +++++++++++++++----
 .../overlays/styles/LayerList.module.css      |  4 +--
 .../layers/styles/LayerCard.module.css        | 12 ++++----
 .../layers/styles/LayersPanel.module.css      |  5 ++--
 .../layers/styles/LayersToggle.module.css     |  8 ++++--
 .../layers/styles/SortableHandle.module.css   |  9 +++++-
 .../toolbar/styles/LayerToolbar.module.css    |  4 +--
 .../toolbar/styles/OpacitySlider.module.css   | 18 ++++++++++--
 11 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/src/AppWrapper.js b/src/AppWrapper.js
index 282a0fa8b..3c74bbff4 100644
--- a/src/AppWrapper.js
+++ b/src/AppWrapper.js
@@ -106,7 +106,12 @@ const AppWrapper = () => {
                             >
                                 <WindowDimensionsProvider>
                                     <OrgUnitsProvider>
-                                        <CssVariables colors spacers theme />
+                                        <CssVariables
+                                            colors
+                                            elevations
+                                            spacers
+                                            theme
+                                        />
                                         <App />
                                     </OrgUnitsProvider>
                                 </WindowDimensionsProvider>
diff --git a/src/components/core/styles/IconButton.module.css b/src/components/core/styles/IconButton.module.css
index 29313a7a7..e14ada233 100644
--- a/src/components/core/styles/IconButton.module.css
+++ b/src/components/core/styles/IconButton.module.css
@@ -1,10 +1,16 @@
 .iconButton {
-    width: var(--spacers-dp32);
-    height: var(--spacers-dp32);
+    width: 28px;
+    height: 28px;
     cursor: pointer;
     display: flex;
     justify-content: center;
     align-items: center;
+    background-color: transparent;
+    border-radius: 5px;
+}
+
+.iconButton:hover {
+    background-color: var(--colors-grey200);
 }
 
 .iconButton > span {
@@ -17,4 +23,9 @@
 
 .icon svg {
     display: block;
+    color: var(--colors-grey700);
+}
+
+.iconButton:hover .icon svg {
+    color: var(--colors-grey900);
 }
diff --git a/src/components/layers/overlays/styles/AddLayerButton.module.css b/src/components/layers/overlays/styles/AddLayerButton.module.css
index 529d04c8d..de920d003 100644
--- a/src/components/layers/overlays/styles/AddLayerButton.module.css
+++ b/src/components/layers/overlays/styles/AddLayerButton.module.css
@@ -17,8 +17,8 @@
     color: var(--colors-grey900);
     cursor: pointer;
     user-select: none;
-    padding: 0px 12px;
-    width: 100%
+    padding: 0px;
+    width: 100%;
 }
 
 .content {
@@ -27,12 +27,20 @@
     padding: var(--spacers-dp4) var(--spacers-dp8);
     gap: var(--spacers-dp8);
 }
+.content svg {
+    color: var(--colors-grey700);
+}
 
 .button:hover:enabled,
 .button:active {
     background-color: var(--colors-grey200);
 }
 
+.button:hover:enabled .content svg,
+.button:active .content svg {
+    color: var(--colors-grey900);
+}
+
 .button:focus {
     outline: 3px solid var(--theme-focus);
     outline-offset: -3px;
diff --git a/src/components/layers/overlays/styles/Layer.module.css b/src/components/layers/overlays/styles/Layer.module.css
index f8297abf3..8d5222bde 100644
--- a/src/components/layers/overlays/styles/Layer.module.css
+++ b/src/components/layers/overlays/styles/Layer.module.css
@@ -1,10 +1,17 @@
 .container {
     float: left;
-    width: 120px;
-    margin-right: var(--spacers-dp16);
+    width: 128px;
+    margin-right: var(--spacers-dp4);
+    margin-bottom: var(--spacers-dp4);
+    padding: var(--spacers-dp4);
     cursor: pointer;
     box-sizing: border-box;
-    height: 160px;
+    height: auto;
+    background-color: transparent;
+    border-radius: 3px;
+}
+.container:hover {
+    background-color: var(--colors-grey100);
 }
 
 .image {
@@ -12,6 +19,10 @@
     border: 1px solid var(--colors-grey400);
     width: 120px;
     height: 120px;
+    border-radius: 2px;
+}
+.container:hover .image {
+    border-color: var(--colors-grey500);
 }
 
 .noImage {
@@ -19,20 +30,27 @@
     border: 1px solid var(--colors-grey400);
     width: 120px;
     height: 120px;
+    border-radius: 2px;
     line-height: 120px;
     background: var(--colors-grey200);
-    color: var(--colors-grey500);
+    color: var(--colors-grey600);
     font-size: 12px;
     text-align: center;
     margin-bottom: var(--spacers-dp4);
 }
+.container:hover .noImage {
+    border-color: var(--colors-grey500);
+}
 
 .name {
     font-size: 14px;
     color: var(--colors-grey800);
-    padding-bottom: 20px;
+    padding-bottom: var(--spacers-dp4);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     text-align: center;
 }
+.container:hover .name {
+    color: var(--colors-grey900);
+}
diff --git a/src/components/layers/overlays/styles/LayerList.module.css b/src/components/layers/overlays/styles/LayerList.module.css
index 79ac907ac..4ec3058bb 100644
--- a/src/components/layers/overlays/styles/LayerList.module.css
+++ b/src/components/layers/overlays/styles/LayerList.module.css
@@ -3,9 +3,9 @@
 }
 
 .list {
-    max-width: 696px;
+    max-width: 684px;
     max-height: calc(100vh - 150px);
-    padding: var(--spacers-dp16) 0 0 var(--spacers-dp16);
+    padding: var(--spacers-dp8) var(--spacers-dp12);
     overflow-y: auto;
 }
 
diff --git a/src/components/layers/styles/LayerCard.module.css b/src/components/layers/styles/LayerCard.module.css
index cb6aebe71..74905c0fd 100644
--- a/src/components/layers/styles/LayerCard.module.css
+++ b/src/components/layers/styles/LayerCard.module.css
@@ -1,6 +1,6 @@
 .card {
     position: relative;
-    margin: var(--spacers-dp8) var(--spacers-dp4) -4px var(--spacers-dp4);
+    margin: var(--spacers-dp4) var(--spacers-dp4) -2px var(--spacers-dp4);
     padding-bottom: 0;
     z-index: 1200;
 }
@@ -53,10 +53,10 @@
 
 .expand {
     position: absolute;
-    top: 4px;
-    right: -4px;
-    width: 48px;
-    height: 48px;
+    top: 11px;
+    right: 2px;
+    width: 32px;
+    height: 32px;
     padding: 12px;
     cursor: pointer;
 }
@@ -68,7 +68,7 @@
 .collapsibleContent {
     max-height: 0px;
     overflow: hidden;
-    transition: max-height 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    transition: max-height 0.2s ease;
 }
 
 .expanded .collapsibleContent {
diff --git a/src/components/layers/styles/LayersPanel.module.css b/src/components/layers/styles/LayersPanel.module.css
index 7edd3910a..1a46f6ade 100644
--- a/src/components/layers/styles/LayersPanel.module.css
+++ b/src/components/layers/styles/LayersPanel.module.css
@@ -7,9 +7,8 @@
 }
 
 .layersPanelInner {
-    background-color: #f4f6f8;
-    border-right: 1px solid #e0e0e0;
-    box-shadow: 1px 0 1px 0 rgba(0, 0, 0, 0.2);
+    background-color: var(--colors-grey200);
+    border-right: 1px solid var(--colors-grey400);
     height: 100%;
     overflow-y: auto;
     z-index: 1190;
diff --git a/src/components/layers/styles/LayersToggle.module.css b/src/components/layers/styles/LayersToggle.module.css
index e4dcfa7a4..f47cba551 100644
--- a/src/components/layers/styles/LayersToggle.module.css
+++ b/src/components/layers/styles/LayersToggle.module.css
@@ -7,9 +7,11 @@
     padding: var(--spacers-dp8) 0;
     color: var(--colors-grey600);
     background-color: var(--colors-white);
-    box-shadow: 3px 1px 5px -1px rgba(0, 0, 0, 0.2);
+    box-shadow: var(--elevations-e100);
     z-index: 1100;
     cursor: pointer;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
 }
 
 .layersToggle.collapsed {
@@ -17,5 +19,7 @@
 }
 
 .layersToggle:hover {
-    background-color: var(--colors-grey100);
+    background-color: var(--colors-grey050);
+    color: var(--colors-grey900);
+    box-shadow: var(--elevations-e200);
 }
diff --git a/src/components/layers/styles/SortableHandle.module.css b/src/components/layers/styles/SortableHandle.module.css
index 9aa693612..68395ae56 100644
--- a/src/components/layers/styles/SortableHandle.module.css
+++ b/src/components/layers/styles/SortableHandle.module.css
@@ -1,7 +1,14 @@
 .handle {
     position: absolute;
     left: var(--spacers-dp4);
-    top: var(--spacers-dp16);
+    top: 15px;
+    width: 24px;
+    height: 24px;
+    border-radius: 3px;
     color: var(--colors-grey600);
     cursor: ns-resize;
 }
+.handle:hover {
+    background-color: var(--colors-grey200);
+    color: var(--colors-grey900);
+}
diff --git a/src/components/layers/toolbar/styles/LayerToolbar.module.css b/src/components/layers/toolbar/styles/LayerToolbar.module.css
index 1ca6c3a28..4c51cf99d 100644
--- a/src/components/layers/toolbar/styles/LayerToolbar.module.css
+++ b/src/components/layers/toolbar/styles/LayerToolbar.module.css
@@ -2,14 +2,14 @@
     position: relative;
     height: var(--spacers-dp32);
     min-height: var(--spacers-dp32);
-    padding: 0 var(--spacers-dp8);
+    padding: 2px var(--spacers-dp8);
     border-top: 1px solid var(--colors-grey300);
     color: var(--colors-grey600);
 }
 
 .spacer {
     float: left;
-    height: var(--spacers-dp32);
+    height: 28px;
     width: var(--spacers-dp8);
 }
 
diff --git a/src/components/layers/toolbar/styles/OpacitySlider.module.css b/src/components/layers/toolbar/styles/OpacitySlider.module.css
index c7c42a871..347b619c2 100644
--- a/src/components/layers/toolbar/styles/OpacitySlider.module.css
+++ b/src/components/layers/toolbar/styles/OpacitySlider.module.css
@@ -1,6 +1,6 @@
 .container {
     width: 100px;
-    height: var(--spacers-dp32);
+    height: 28px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -17,23 +17,35 @@
     cursor: pointer;
 }
 
+.slider:disabled {
+    cursor: not-allowed;
+}
+
 .slider::-webkit-slider-thumb {
     -webkit-appearance: none;
     appearance: none;
     width: 12px;
     height: 12px;
-    background: var(--colors-grey600);
+    background: var(--colors-grey700);
     border-radius: 50%;
 }
 
 .slider::-moz-range-thumb {
     width: 12px;
     height: 12px;
-    background: var(--colors-grey600);
+    background: var(--colors-grey700);
     border: 0;
     border-radius: 50%;
 }
 
+.slider::-webkit-slider-thumb:hover {
+    background: var(--colors-grey900);
+}
+
+.slider::-moz-range-thumb:hover {
+    background: var(--colors-grey900);
+}
+
 .slider::-moz-focus-outer {
     border: 0;
 }

From f9943ce2be789dd17f0f6dd889c2546e67e0c93f Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Thu, 15 Feb 2024 10:38:19 +0100
Subject: [PATCH 15/17] fix: make `dhis2-map-new` class independent of
 downloadMode

---
 src/components/map/MapPosition.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/map/MapPosition.js b/src/components/map/MapPosition.js
index e16700206..33df2f167 100644
--- a/src/components/map/MapPosition.js
+++ b/src/components/map/MapPosition.js
@@ -100,7 +100,7 @@ const MapPosition = () => {
                     className={cx(styles.mapContainer, {
                         [styles.download]: downloadMode,
                         'dhis2-map-download': downloadMode,
-                        'dhis2-map-new': !downloadMode && !mapId,
+                        'dhis2-map-new': !mapId,
                     })}
                 >
                     <MapContainer resizeCount={resizeCount} setMap={setMap} />

From efec16c89eee626073d6d0fe0d87fa34745a6a8b Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Thu, 29 Feb 2024 15:12:44 +0100
Subject: [PATCH 16/17] feat: add push analytics instructions

---
 public/push-analytics.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 public/push-analytics.json

diff --git a/public/push-analytics.json b/public/push-analytics.json
new file mode 100644
index 000000000..f94685d0d
--- /dev/null
+++ b/public/push-analytics.json
@@ -0,0 +1,24 @@
+{
+    "version": "0.0.1",
+    "showVisualization": {
+        "strategy": "navigateToUrl",
+        "steps": [
+            { "goto": "{{appUrl}}/#/{{id}}/download?isPushAnalytics=true" },
+            { "waitForSelector": ".push-analytics-download-button:enabled" }
+        ]
+    },
+    "triggerDownload": {
+        "strategy": "useUiElements",
+        "steps": [{ "click": ".push-analytics-download-button" }]
+    },
+    "obtainDownloadArtifact": {
+        "strategy": "interceptFileDownload"
+    },
+    "clearVisualization": {
+        "strategy": "navigateToUrl",
+        "steps": [
+            { "goto": "{{appUrl}}/#/" },
+            { "waitForSelector": ".dhis2-map-new .dhis2-map-rendered" }
+        ]
+    }
+}

From dd0781a022f3bac82629b071ae4172310349fbf4 Mon Sep 17 00:00:00 2001
From: HendrikThePendric <hendrik@dhis2.org>
Date: Tue, 5 Mar 2024 13:34:29 +0100
Subject: [PATCH 17/17] chore: upgrade @dhis2/maps-gl

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9c0b49b25..9e3741499 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
         "@dhis2/app-service-alerts": "3.9.4",
         "@dhis2/app-service-datastore": "^1.0.0-beta.3",
         "@dhis2/d2-i18n": "^1.1.3",
-        "@dhis2/maps-gl": "^3.8.6",
+        "@dhis2/maps-gl": "^3.9.0",
         "@dhis2/ui": "^9.2.0",
         "@krakenjs/post-robot": "^11.0.0",
         "@reportportal/agent-js-cypress": "git+https://github.com/dhis2/agent-js-cypress.git#develop",
diff --git a/yarn.lock b/yarn.lock
index dd4698e72..f2e8054ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2243,10 +2243,10 @@
     markdown-it "^8.4.2"
     prop-types "^15.6.2"
 
-"@dhis2/maps-gl@^3.8.6":
-  version "3.8.6"
-  resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-3.8.6.tgz#eace04fca9bb5d4cc24ca3fcebb4c13e3f8a6422"
-  integrity sha512-9jVfPczgT9MZrU/Cm5ksSjVnUV8/sPOdcaRVLj/nusDMOUVJ23Bt6/U6Gd6SOu/XPk8pWAi9dwyOF1p5pB8L7g==
+"@dhis2/maps-gl@^3.9.0":
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-3.9.0.tgz#124f560eaa2107c7b0555b47d7b88533ebdca9e5"
+  integrity sha512-bGxBsiTRktUihyM4epcYGl1joJe5RG/r0HOHicU4UaxJLU7t8f1b9VVW18hp9TWyinjMUMmaorIu+dwOgFg/MA==
   dependencies:
     "@mapbox/sphericalmercator" "^1.2.0"
     "@turf/area" "^6.5.0"