From 6213fe1395fd31c966e487ac12a2e436d8c9b6d4 Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 23 Nov 2023 16:05:29 +0100
Subject: [PATCH 1/8] add i18n language support #1

---
 .../js/bundles/dn_what3words/manifest.json    |  5 ++--
 .../js/bundles/dn_what3words/nls/bundle.js    | 24 +++++++++++++++++++
 .../js/bundles/dn_what3words/nls/de/bundle.js | 23 ++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/main/js/bundles/dn_what3words/nls/bundle.js
 create mode 100644 src/main/js/bundles/dn_what3words/nls/de/bundle.js

diff --git a/src/main/js/bundles/dn_what3words/manifest.json b/src/main/js/bundles/dn_what3words/manifest.json
index 4ab024f..d2de86a 100644
--- a/src/main/js/bundles/dn_what3words/manifest.json
+++ b/src/main/js/bundles/dn_what3words/manifest.json
@@ -6,6 +6,7 @@
     "productName": "map.apps",
     "main": "",
     "i18n": [
+        "bundle"
     ],
     "dependencies": {
         "esri": "^4.10.1",
@@ -72,8 +73,8 @@
             "propertiesConstructor": true,
             "properties": {
                 "id": "popupToggleTool",
-                "title": "w3w Adresse in der Karte identifizieren",
-                "tooltip": "w3w Adresse in der Karte identifizieren",
+                "title": "${tool.title}",
+                "tooltip": "${tool.tooltip}",
                 "toolRole": "toolset",
                 "iconClass": "",
                 "togglable": true,
diff --git a/src/main/js/bundles/dn_what3words/nls/bundle.js b/src/main/js/bundles/dn_what3words/nls/bundle.js
new file mode 100644
index 0000000..c59940e
--- /dev/null
+++ b/src/main/js/bundles/dn_what3words/nls/bundle.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2020 con terra GmbH (info@conterra.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module.exports = {
+    root: ({
+        tool: {
+            tooltip: "Identify w3w address in the map",
+            title: "Identify w3w address in the map"
+        }
+    }),
+    de: true
+};
diff --git a/src/main/js/bundles/dn_what3words/nls/de/bundle.js b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
new file mode 100644
index 0000000..7cec547
--- /dev/null
+++ b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2020 con terra GmbH (info@conterra.de)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module.exports = {
+    root: ({
+        tool: {
+            tooltip: "w3w Adresse in der Karte identifizieren",
+            title: "w3w Adresse in der Karte identifizieren"
+        }
+    })
+};

From 104df35b55d7ffae028bbf3668c5eebf3e73b060 Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 23 Nov 2023 16:22:40 +0100
Subject: [PATCH 2/8] retrun words in same language as choosen locale #2

---
 .../dn_what3words/MapClickPopupHandler.js       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js b/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
index 445e835..e25c5e2 100644
--- a/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
+++ b/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import apprt_request from "apprt-request";
+import Locale from "apprt-core/Locale";
 
 const coordsUrl = "https://api.what3words.com/v3/convert-to-3wa";
 
@@ -54,10 +55,10 @@ function MapClickPopupHandler() {
                     return;
                 }
 
-                let latitude = event.mapPoint.latitude;
-                let lat = Math.round(latitude * 1000) / 1000;
-                let longitude = event.mapPoint.longitude;
-                let lon = Math.round(longitude * 1000) / 1000;
+                const latitude = event.mapPoint.latitude;
+                const lat = Math.round(latitude * 1000) / 1000;
+                const longitude = event.mapPoint.longitude;
+                const lon = Math.round(longitude * 1000) / 1000;
 
                 view.popup.open({
                     // Set the location of the popup to the clicked location
@@ -66,7 +67,8 @@ function MapClickPopupHandler() {
                     content: "what3words für: [" + lon + ", " + lat + "]"
                 });
 
-                let queryParams = {key, coordinates: `${latitude},${longitude}`, language: 'de'};
+                const currentLang = Locale.getCurrent().getLocaleString();
+                const queryParams = {key, coordinates: `${latitude},${longitude}`, language: currentLang};
 
                 apprt_request(coordsUrl, {query: queryParams}).then(
                     (response) => {
@@ -74,15 +76,14 @@ function MapClickPopupHandler() {
                     }
                 ).catch((e) => {
                     console.warn("Geocoding failed: " + e.response.data.error.message);
-                })
+                });
 
             });
         },
         deactivateTool: cleanup,
         deactivate: cleanup
-    }
+    };
 
 }
 
 export default MapClickPopupHandler;
-

From 32a01d29ab99ac0547d7924ced45e011e3dd2d45 Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 23 Nov 2023 17:05:34 +0100
Subject: [PATCH 3/8] change display marker #3

---
 src/main/js/apps/sample/images/mapMarker.png | Bin 27678 -> 6937 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/js/apps/sample/images/mapMarker.png b/src/main/js/apps/sample/images/mapMarker.png
index 5e86a6b9ef777e628c79b1e3a39fb0a8268aca76..672869922727fb2ff772eb20f9d6ad6408534acc 100644
GIT binary patch
literal 6937
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
MtsSkdVxEWp3(PF-jQ{`u

literal 27678
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


From e3c8e3c47368b4778af77297ed7b25d608b7bafe Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 23 Nov 2023 17:25:53 +0100
Subject: [PATCH 4/8] white tooltip color on hover #4

---
 src/main/js/bundles/dn_what3words/styles/styles.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/js/bundles/dn_what3words/styles/styles.css b/src/main/js/bundles/dn_what3words/styles/styles.css
index 4e586ca..44261ae 100644
--- a/src/main/js/bundles/dn_what3words/styles/styles.css
+++ b/src/main/js/bundles/dn_what3words/styles/styles.css
@@ -37,7 +37,7 @@
 .ctAppRoot .ctTool_popupToggleTool .dijitButtonNode .ctToolIcon_popupToggleTool {
     height: 47px;
     width: 47px;
-    background: url(./../images/w3w_logo.svg) no-repeat top left;
+    background: url(./../images/w3w_logo.svg) no-repeat center;
     background-size: contain;
 }
 
@@ -47,3 +47,8 @@
     color: #45474d;
 }
 
+.ctAppRoot .dijitHover .ctTool_popupToggleTool  .dijitButtonNode .dijitButtonText  {
+    display: block;
+    font-size: 15px;
+    color: #fff;
+}

From 4926adf768b87f032d5e82086ac532825a230c03 Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 23 Nov 2023 17:32:57 +0100
Subject: [PATCH 5/8] improve code consistency

---
 .../js/bundles/dn_what3words/PopupOmnisearchHandler.js |  9 ++++-----
 src/main/js/bundles/dn_what3words/What3wordsModel.js   |  4 ++--
 src/main/js/bundles/dn_what3words/What3wordsStore.js   |  2 +-
 .../js/bundles/dn_what3words/What3wordsStoreFactory.js | 10 +++++-----
 src/main/js/bundles/dn_what3words/module.js            |  2 +-
 src/main/js/bundles/dn_what3words/nls/bundle.js        |  2 +-
 src/main/js/bundles/dn_what3words/nls/de/bundle.js     |  2 +-
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/js/bundles/dn_what3words/PopupOmnisearchHandler.js b/src/main/js/bundles/dn_what3words/PopupOmnisearchHandler.js
index aad8e0c..8e452bf 100644
--- a/src/main/js/bundles/dn_what3words/PopupOmnisearchHandler.js
+++ b/src/main/js/bundles/dn_what3words/PopupOmnisearchHandler.js
@@ -65,16 +65,15 @@ function PopupOmnisearchHandler(){
                 title: "what3words",
                 location: item.geometry // Set the location of the popup to the clicked location
             });
-            view.popup.content = `///${item.title} <--> [${lon}, ${lat}]`
+            view.popup.content = `///${item.title} <--> [${lon}, ${lat}]`;
 
         },
 
         _clear: function () {
-           const view = this.model.get("view");
-           view && view.popup.close();
+            const view = this.model.get("view");
+            view && view.popup.close();
         }
-    }
-
+    };
 }
 
 export default PopupOmnisearchHandler;
diff --git a/src/main/js/bundles/dn_what3words/What3wordsModel.js b/src/main/js/bundles/dn_what3words/What3wordsModel.js
index b511a84..3c35b41 100644
--- a/src/main/js/bundles/dn_what3words/What3wordsModel.js
+++ b/src/main/js/bundles/dn_what3words/What3wordsModel.js
@@ -17,8 +17,8 @@ import {declare} from "apprt-core/Mutable";
 
 const What3wordsModel = declare({
 
-    apiKey: "",
+    apiKey: ""
 
 });
 
-export default What3wordsModel;
\ No newline at end of file
+export default What3wordsModel;
diff --git a/src/main/js/bundles/dn_what3words/What3wordsStore.js b/src/main/js/bundles/dn_what3words/What3wordsStore.js
index 2b3a1bc..3037bfd 100644
--- a/src/main/js/bundles/dn_what3words/What3wordsStore.js
+++ b/src/main/js/bundles/dn_what3words/What3wordsStore.js
@@ -64,7 +64,7 @@ let emptyResult = function () {
 class What3wordsStore {
 
     constructor(properties) {
-        this.key = properties.apiKey
+        this.key = properties.apiKey;
     }
 
     get(id, options) {
diff --git a/src/main/js/bundles/dn_what3words/What3wordsStoreFactory.js b/src/main/js/bundles/dn_what3words/What3wordsStoreFactory.js
index 7b00eb6..0edcb09 100644
--- a/src/main/js/bundles/dn_what3words/What3wordsStoreFactory.js
+++ b/src/main/js/bundles/dn_what3words/What3wordsStoreFactory.js
@@ -19,7 +19,7 @@ function What3wordsStoreFactory() {
     let _registration;
 
     function _unregisterStore() {
-        let reg = _registration;
+        const reg = _registration;
         _registration = undefined;
         if (reg) {
             reg.unregister();
@@ -31,10 +31,10 @@ function What3wordsStoreFactory() {
             this._initStore();
         },
         _initStore() {
-            let props = this._properties;
+            const props = this._properties;
             props.apiKey = this.model.get("apiKey");
-            let store = new What3wordsStore(props);
-            _registration = this._componentContext.getBundleContext().registerService(["ct.api.Store"], store, props)
+            const store = new What3wordsStore(props);
+            _registration = this._componentContext.getBundleContext().registerService(["ct.api.Store"], store, props);
         },
         deactivate() {
             _unregisterStore();
@@ -42,4 +42,4 @@ function What3wordsStoreFactory() {
     };
 }
 
-export default What3wordsStoreFactory;
\ No newline at end of file
+export default What3wordsStoreFactory;
diff --git a/src/main/js/bundles/dn_what3words/module.js b/src/main/js/bundles/dn_what3words/module.js
index 11dd2a0..89913c5 100644
--- a/src/main/js/bundles/dn_what3words/module.js
+++ b/src/main/js/bundles/dn_what3words/module.js
@@ -17,4 +17,4 @@ import ".";
 import "./What3wordsStoreFactory";
 import "./PopupOmnisearchHandler";
 import "./MapClickPopupHandler";
-import "./What3wordsModel";
\ No newline at end of file
+import "./What3wordsModel";
diff --git a/src/main/js/bundles/dn_what3words/nls/bundle.js b/src/main/js/bundles/dn_what3words/nls/bundle.js
index c59940e..1a0d3d9 100644
--- a/src/main/js/bundles/dn_what3words/nls/bundle.js
+++ b/src/main/js/bundles/dn_what3words/nls/bundle.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2022 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/dn_what3words/nls/de/bundle.js b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
index 7cec547..83a5a57 100644
--- a/src/main/js/bundles/dn_what3words/nls/de/bundle.js
+++ b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2022 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 0001570d0e314658fbc3d71524aef84c0c3e7b12 Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 14 Dec 2023 16:50:49 +0100
Subject: [PATCH 6/8] add copy button #5

---
 .../dn_what3words/MapClickPopupHandler.js     | 48 ++++++++++++++++---
 .../js/bundles/dn_what3words/images/copy.svg  |  1 +
 .../js/bundles/dn_what3words/manifest.json    |  4 +-
 .../js/bundles/dn_what3words/nls/bundle.js    |  4 ++
 .../js/bundles/dn_what3words/nls/de/bundle.js |  4 ++
 .../bundles/dn_what3words/styles/styles.css   | 37 ++++++++++++++
 6 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 src/main/js/bundles/dn_what3words/images/copy.svg

diff --git a/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js b/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
index e25c5e2..a29c944 100644
--- a/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
+++ b/src/main/js/bundles/dn_what3words/MapClickPopupHandler.js
@@ -18,11 +18,12 @@ import Locale from "apprt-core/Locale";
 
 const coordsUrl = "https://api.what3words.com/v3/convert-to-3wa";
 
-function MapClickPopupHandler() {
+function MapClickPopupHandler(i18n) {
 
     let _clickHandle;
     let mapWidgetModel;
     let key;
+    i18n = i18n._i18n.get().root;
 
     function cleanup() {
         _clear();
@@ -42,15 +43,46 @@ function MapClickPopupHandler() {
             mapWidgetModel = this.mapWidgetModel;
             key = this.what3wordsModel.get("apiKey");
             const view = mapWidgetModel.get("view");
-            if(!view){
+            if (!view) {
                 return;
             }
+            // Defines an action to zoom out from the selected feature
+            let copyAction = {
+                // This text is displayed as a tooltip
+                title: i18n.popup.button,
+                // The ID by which to reference the action in the event handler
+                id: "copy-result",
+                // Sets the icon font used to style the action button
+                image: "js/bundles/dn_what3words/images/copy.svg"
+            };
+            // Adds the custom action to the popup.
+            view.popup.actions.push(copyAction);
+
+            view.popup.on("trigger-action", function (event) {
+                // If the zoom-out action is clicked, fire the zoomOut() function
+                if (event.action.id === "copy-result") {
+                    copyText();
+                }
+            });
+
+            function copyText() {
+                const copyText = document.getElementsByClassName("popupTitle")[0];
+                navigator.clipboard.writeText(copyText.textContent);
+                const tooltip = document.getElementsByClassName("tooltiptext")[0];
+                tooltip.style.visibility = "visible";
+                tooltip.style.opacity = "1";
+                setTimeout(() => {
+                    tooltip.style.visibility = "hidden";
+                    tooltip.style.opacity = "0";
+                }, 5000);
+
+            }
 
             view.popup.autoOpenEnabled = false;
             _clickHandle = view.on("click", (event) => {
                 _clear();
 
-                if(key === ""){
+                if (key === "") {
                     console.warn("API key for what3words is empty!");
                     return;
                 }
@@ -68,11 +100,15 @@ function MapClickPopupHandler() {
                 });
 
                 const currentLang = Locale.getCurrent().getLocaleString();
-                const queryParams = {key, coordinates: `${latitude},${longitude}`, language: currentLang};
+                const queryParams = { key, coordinates: `${latitude},${longitude}`, language: currentLang };
+
+
 
-                apprt_request(coordsUrl, {query: queryParams}).then(
+                apprt_request(coordsUrl, { query: queryParams }).then(
                     (response) => {
-                        view.popup.title = "///" + response.words;
+                        view.popup.title = "<div class='tooltip'> "
+                        + "<span class='tooltiptext'>"+ i18n.popup.tooltip +"</span>"
+                        + "<span class=popupTitle> ///" + response.words + '</span></div>';
                     }
                 ).catch((e) => {
                     console.warn("Geocoding failed: " + e.response.data.error.message);
diff --git a/src/main/js/bundles/dn_what3words/images/copy.svg b/src/main/js/bundles/dn_what3words/images/copy.svg
new file mode 100644
index 0000000..be509c1
--- /dev/null
+++ b/src/main/js/bundles/dn_what3words/images/copy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="14" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc.--><path opacity="1" fill="#808080" d="M208 0H332.1c12.7 0 24.9 5.1 33.9 14.1l67.9 67.9c9 9 14.1 21.2 14.1 33.9V336c0 26.5-21.5 48-48 48H208c-26.5 0-48-21.5-48-48V48c0-26.5 21.5-48 48-48zM48 128h80v64H64V448H256V416h64v48c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V176c0-26.5 21.5-48 48-48z"/></svg>
\ No newline at end of file
diff --git a/src/main/js/bundles/dn_what3words/manifest.json b/src/main/js/bundles/dn_what3words/manifest.json
index d2de86a..b851239 100644
--- a/src/main/js/bundles/dn_what3words/manifest.json
+++ b/src/main/js/bundles/dn_what3words/manifest.json
@@ -73,8 +73,8 @@
             "propertiesConstructor": true,
             "properties": {
                 "id": "popupToggleTool",
-                "title": "${tool.title}",
-                "tooltip": "${tool.tooltip}",
+                "title": "${root.tool.title}",
+                "tooltip": "${root.tool.tooltip}",
                 "toolRole": "toolset",
                 "iconClass": "",
                 "togglable": true,
diff --git a/src/main/js/bundles/dn_what3words/nls/bundle.js b/src/main/js/bundles/dn_what3words/nls/bundle.js
index 1a0d3d9..3799eee 100644
--- a/src/main/js/bundles/dn_what3words/nls/bundle.js
+++ b/src/main/js/bundles/dn_what3words/nls/bundle.js
@@ -18,6 +18,10 @@ module.exports = {
         tool: {
             tooltip: "Identify w3w address in the map",
             title: "Identify w3w address in the map"
+        },
+        popup: {
+            button: "Copy Adress",
+            tooltip: "Copied"
         }
     }),
     de: true
diff --git a/src/main/js/bundles/dn_what3words/nls/de/bundle.js b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
index 83a5a57..e099bc8 100644
--- a/src/main/js/bundles/dn_what3words/nls/de/bundle.js
+++ b/src/main/js/bundles/dn_what3words/nls/de/bundle.js
@@ -18,6 +18,10 @@ module.exports = {
         tool: {
             tooltip: "w3w Adresse in der Karte identifizieren",
             title: "w3w Adresse in der Karte identifizieren"
+        },
+        popup: {
+            button: "Kopiere Adresse",
+            tooltip: "Kopiert"
         }
     })
 };
diff --git a/src/main/js/bundles/dn_what3words/styles/styles.css b/src/main/js/bundles/dn_what3words/styles/styles.css
index 44261ae..b74f7c2 100644
--- a/src/main/js/bundles/dn_what3words/styles/styles.css
+++ b/src/main/js/bundles/dn_what3words/styles/styles.css
@@ -52,3 +52,40 @@
     font-size: 15px;
     color: #fff;
 }
+
+.tooltip {
+    position: relative;
+    display: inline-block;
+  }
+
+  .tooltip .tooltiptext {
+    visibility: hidden;
+    width: 80px;
+    background-color: #555;
+    color: #fff;
+    text-align: center;
+    border-radius: 6px;
+    padding: 5px 0;
+
+    /* Position the tooltip */
+    position: absolute;
+    z-index: 1;
+    top: -5px;
+    left: 105%;
+    opacity: 0;
+    transition: opacity 0.3s;
+
+  }
+
+  .tooltip .tooltiptext::after {
+    content: " ";
+    position: absolute;
+    top: 50%;
+    right: 100%; /* To the left of the tooltip */
+    margin-top: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: transparent #555 transparent transparent;
+    height: 10px;
+  }
+

From 2ff8dc32cd6705ed81289bbf36e9390358f80d3a Mon Sep 17 00:00:00 2001
From: Nick Jakuschona <n_jaku01@wwu.de>
Date: Thu, 14 Dec 2023 16:58:24 +0100
Subject: [PATCH 7/8] cursor to default over popup #6

---
 src/main/js/bundles/dn_what3words/styles/styles.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/js/bundles/dn_what3words/styles/styles.css b/src/main/js/bundles/dn_what3words/styles/styles.css
index b74f7c2..0c7df82 100644
--- a/src/main/js/bundles/dn_what3words/styles/styles.css
+++ b/src/main/js/bundles/dn_what3words/styles/styles.css
@@ -89,3 +89,6 @@
     height: 10px;
   }
 
+.ctAppRoot .esri-popup__main-container {
+    cursor: default;
+}

From 2836f2fbc19e46575a7330c7154fb0ad602ebd93 Mon Sep 17 00:00:00 2001
From: Sebastian Holtkamp <S.Holtkamp@conterra.de>
Date: Fri, 1 Mar 2024 15:12:37 +0100
Subject: [PATCH 8/8] Update to map.apps version 4.17.0

---
 .gitignore                            |  1 +
 .vscode/extensions.json               |  2 +-
 .vscode/launch.json                   |  2 +-
 .vscode/tasks.json                    |  8 ++++
 RELEASE.md                            |  2 +-
 gulpfile.js                           |  9 ++--
 package.json                          | 40 ++++++++++------
 pom.xml                               | 66 ++++++++++++---------------
 src/test/webapp/js/tests/test-init.js | 12 ++---
 tsconfig.json                         |  6 ++-
 10 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index cc762e4..e41ab5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /.vscode/settings.json
 /.externalToolBuilders/
 /package-lock.json
+/gulpfile.overrides.js
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 67efcac..cc765a8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,4 +5,4 @@
         "Esri.arcgis-jsapi-snippets",
         "ctjdr.vscode-apprt-bundles"
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e8ab909..29fadc6 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -12,4 +12,4 @@
             "webRoot": "${workspaceFolder}/src/main"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 30fd3c8..d1643d5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -43,6 +43,14 @@
             "type": "shell",
             "command": "mvn clean",
             "group": "build"
+        },
+        {
+            "label": "Watch types",
+            "detail": "Start TypeScript compiler in watch mode",
+            "type": "npm",
+            "script": "watch-types",
+            "group": "build",
+            "problemMatcher": [],
         }
     ]
 }
diff --git a/RELEASE.md b/RELEASE.md
index 7951b33..4820d0b 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,4 +1,4 @@
-✅ Tested for map.apps 4.15.1 / Linie 4
+✅ Tested for map.apps 4.17.0 / Linie 4
 
 #### Release Notes
 - autogenerated SNAPSHOT-Release
diff --git a/gulpfile.js b/gulpfile.js
index c302438..d650c29 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -64,15 +64,13 @@ mapapps.registerTasks({
     },
 
     /* a list of themes inside this project */
-    themes: [/*"sample-theme"*/],
+    themes: [],
     /* state that the custom theme will be dependant from map.apps everlasting theme that provides the base styles */
     hasBaseThemes: true,
     /* state that we want to support vuetify components and therefore need the vuetify core styles*/
     hasVuetify: true,
     themeChangeTargets: {
-        "vuetify": [
-            // "sample_theme"
-        ]
+        "vuetify": []
     },
     /* A list oft target browser versions. This should be streamlined with Esri JS API requirements. */
     transpileTargets: {
@@ -139,7 +137,6 @@ gulp.task("lint",
 gulp.task("preview",
     gulp.series(
         "build",
-        "lint",
         gulp.parallel(
             "watch",
             "browser-sync"
@@ -152,7 +149,7 @@ gulp.task("run-tests",
         function transportTestUrls() {
             // transport test url to run-browser-tests
             // eslint-disable-next-line max-len
-            const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_what3words/tests/all&reporter=tap";
+            const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=sample_helloworld/tests/all&reporter=tap";
             runBrowserTests.push(testsAt);
             return Promise.resolve();
         },
diff --git a/package.json b/package.json
index 899af04..6430ec8 100644
--- a/package.json
+++ b/package.json
@@ -4,22 +4,32 @@
     "version": "0.0.1",
     "license": "CC0-1.0",
     "scripts": {
-        "check-licenses": "node ./src/support/js/check-licenses.js"
+        "check-licenses": "tsx ./src/support/js/check-licenses.ts",
+        "check-types": "tsc --noEmit",
+        "watch-types": "tsc -w --noEmit"
     },
     "devDependencies": {
-        "@conterra/ct-mapapps-typings": "4.15.1",
-        "@conterra/mapapps-mocha-runner": "^1.1.1",
-        "@types/arcgis-js-api": "4.26.0",
-        "chai": "^4.3.7",
-        "ct-mapapps-browser-sync": "0.0.30",
-        "ct-mapapps-gulp-js": "0.9.4",
-        "eslint-config-ct-prodeng": "1.3.0-next-2",
-        "license-checker": "^25.0.1",
-        "mocha": "^10.2.0",
-        "puppeteer": "^19.11.1",
-        "vue-template-compiler": "2.7.8",
-        "stylelint-config-ct-prodeng": "1.0.4",
-        "stylelint-config-recommended": "5.0.0",
-        "stylelint": "^13.13.1"
+        "@conterra/ct-mapapps-typings": "~4.17.0",
+        "@conterra/mapapps-mocha-runner": "1.1.1",
+        "@types/arcgis-js-api": "4.28.0",
+        "@types/chai": "4.3.10",
+        "@types/license-checker": "^25.0.6",
+        "@types/mocha": "10.0.4",
+        "chai": "4.3.10",
+        "ct-mapapps-browser-sync": "0.0.35",
+        "ct-mapapps-gulp-js": "0.10.2",
+        "eslint-config-ct-prodeng": "1.4.0",
+        "license-checker": "25.0.1",
+        "mocha": "10.2.0",
+        "puppeteer": "21.5.2",
+        "stylelint": "15.11.0",
+        "stylelint-config-ct-prodeng": "2.0.0",
+        "stylelint-config-recommended": "13.0.0",
+        "stylelint-config-recommended-less": "2.0.0",
+        "ts-node": "^10.9.1",
+        "tsx": "^4.6.0",
+        "typescript": "5.2.2",
+        "vue": "2.7.15",
+        "vue-template-compiler": "2.7.15"
     }
 }
diff --git a/pom.xml b/pom.xml
index 396e5e1..6d87381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,8 @@
     limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.conterra.devnet</groupId>
@@ -46,11 +47,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>de.conterra.mapapps</groupId>
-                <artifactId>ct-mapapps-js</artifactId>
-                <version>${mapapps.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -92,6 +88,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>de.conterra.mapapps</groupId>
+                    <artifactId>mapapps-maven-plugin</artifactId>
+                    <version>${mapapps.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>de.conterra.jsregistry</groupId>
                     <artifactId>ct-jsregistry-maven-plugin</artifactId>
@@ -144,10 +145,9 @@
                 <plugin>
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
-                    <version>1.12.1</version>
+                    <version>1.14.2</version>
                     <configuration>
-                        <nodeVersion>v18.13.0</nodeVersion>
-                        <npmVersion>8.19.3</npmVersion>
+                        <nodeVersion>v20.9.0</nodeVersion>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -173,11 +173,6 @@
                     <artifactId>setproperties-maven-plugin</artifactId>
                     <version>1.0.2</version>
                 </plugin>
-                <plugin>
-                    <groupId>de.conterra.jsrt</groupId>
-                    <artifactId>ct-jsrt-test-maven-plugin</artifactId>
-                    <version>${ct.jsrt-test.version}</version>
-                </plugin>
             </plugins>
         </pluginManagement>
         <sourceDirectory>src/main/js</sourceDirectory>
@@ -215,9 +210,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <!-- add here properties which are used in plugin configuration resolution -->
                     <properties>
-                        <!-- deployment of map.apps installation -->
                         <mapapps.remote.base>.</mapapps.remote.base>
                     </properties>
                 </configuration>
@@ -225,7 +218,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.11.0</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -233,7 +226,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -241,6 +234,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>unpack-themes-src</id>
@@ -343,6 +337,9 @@
                         <include>**/gulpfile.js</include>
                         <include>**/pom.xml</include>
                     </includes>
+                    <excludes>
+                        <exclude>src/main/js/**/*.min.js</exclude>
+                    </excludes>
                     <mapping>
                         <vue>XML_STYLE</vue>
                     </mapping>
@@ -409,6 +406,12 @@
             <plugin>
                 <groupId>de.conterra.mapapps</groupId>
                 <artifactId>mapapps-maven-plugin</artifactId>
+                <configuration>
+                    <!-- only build zip files -->
+                    <skipDeploy>true</skipDeploy>
+                    <sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
+                </configuration>
                 <executions>
                     <execution>
                         <!-- used to create .zip files containing the apps during the build -->
@@ -436,13 +439,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <!-- only build zip files -->
-                    <skipDeploy>true</skipDeploy>
-                    <createApp>false</createApp>
-                    <sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
-                    <outputDirectory>${project.build.directory}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -496,15 +492,16 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.15.1</mapapps.version>
+        <mapapps.version>4.17.0</mapapps.version>
+        <vuetify.version>1.5.28</vuetify.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
         <!-- java lib versions -->
-        <ct.jsregistry.version>1.5.10</ct.jsregistry.version>
+        <ct.jsregistry.version>2.0.1</ct.jsregistry.version>
         <ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
 
         <!-- the default app, replaced in the *.html files to switch app names-->
-        <default.app.name>sample</default.app.name>
+        <default.app.name>Demo</default.app.name>
 
         <!-- don't do this in production configuration! This allows to go any http traffic over the
         /proxy endpoint -->
@@ -563,6 +560,11 @@
                     <artifactId>ags-js-api4</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>com.esri</groupId>
+                    <artifactId>terraformer-js</artifactId>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>moment-js</groupId>
                     <artifactId>moment-js</artifactId>
@@ -665,12 +667,6 @@
             </properties>
             <build>
                 <plugins>
-                    <plugin>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <groupId>de.conterra.jsregistry</groupId>
                         <artifactId>ct-jsregistry-maven-plugin</artifactId>
@@ -713,8 +709,6 @@
                         <configuration>
                             <skipDeploy>${skip.apps.upload}</skipDeploy>
                             <deployAsApp>true</deployAsApp>
-                            <appName>${project.artifactId}</appName>
-                            <appTitle>${project.artifactId}-${project.version}</appTitle>
                             <appEditorState>PUBLISHED</appEditorState>
                             <serverResourcesEndpoint>${mapapps.remote.base}/resources</serverResourcesEndpoint>
                             <username>${mapapps.user}</username>
diff --git a/src/test/webapp/js/tests/test-init.js b/src/test/webapp/js/tests/test-init.js
index 6421e5a..c9df5fc 100644
--- a/src/test/webapp/js/tests/test-init.js
+++ b/src/test/webapp/js/tests/test-init.js
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+// eslint-disable-next-line no-undef
 testConfig({
     jsregistry: [{
-            //root: "url to registry..",
-            packages: [
-                // register all self hosted packages
-                "*"
-            ]
-        }
+        //root: "url to registry..",
+        packages: [
+            // register all self hosted packages
+            "*"
+        ]}
         //uncomment, if project runs in remote mode
         // ,{
         //     root: "@@mapapps.remote.base@@/resources/jsregistry/root",
diff --git a/tsconfig.json b/tsconfig.json
index f33e19d..c1df1bb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,11 @@
         },
         "allowJs": true,
         "noEmit": true,
+        "strict": true,
+        "noImplicitAny": true,
+        "strictNullChecks": true,
         "skipLibCheck": true,
         "esModuleInterop": true
-    }
+    },
+    "include": ["src"]
 }