Update project to map.apps version 4.17.0

.github/workflows/devnet-bundle-release.yml

@@ -28,3 +28,6 @@ jobs:
          release_version: ${{ github.event.inputs.releaseVersion }}
          next_dev_version: ${{ github.event.inputs.nextDevVersion }}
          ms_teams_webhook_uri: ${{secrets.MS_TEAMS_WEBHOOK_URI}}
+         demo_user: ${{secrets.DEMO_USER}}
+         demo_user_pw: ${{secrets.DEMO_USER_PW}}
+         demo_url: ${{secrets.DEMO_URL}}

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "Vue.volar",
+        "Esri.arcgis-jsapi-snippets",
+        "ctjdr.vscode-apprt-bundles"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:9090",
+            "webRoot": "${workspaceFolder}/src/main"
+        }
+    ]
+}

.vscode/tasks.json

@@ -3,33 +3,54 @@
     "tasks": [
         {
             "label": "Initialize",
+            "detail": "Initialize map.apps for Developers project",
             "type": "shell",
             "command": "mvn initialize",
             "group": "build"
         },
         {
-            "label": "Run HTTP Server",
+            "label": "Run",
+            "detail": "Run map.apps for Developers development server",
             "type": "shell",
-            "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties'",
-            "group": "build"
+            "command": "mvn",
+            "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
+            "group": "build",
+            "isBackground": true
         },
         {
-            "label": "Run stand-alone HTTP Server",
+            "label": "Run (Remote project mode)",
+            "detail": "Run map.apps for Developers development server in 'remote project' mode",
             "type": "shell",
-            "command": "mvn jetty:run -Denv=dev '-Dlocal.configfile=./build.properties' -Pinclude-mapapps-deps",
-            "group": "build"
+            "command": "mvn",
+            "args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
+            "group": "build",
+            "isBackground": true
         },
         {
             "label": "Compress",
+            "detail": "Prepare bundles and apps for deployment on a map.apps instance",
             "type": "shell",
-            "command": "mvn install -P compress",
-            "group": "build"
+            "command": "mvn",
+            "args": ["clean", "install", "-Pcompress"],
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            }
         },
         {
             "label": "Clean",
             "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": [],
         }
     ]
 }

RELEASE.md

@@ -1,4 +1,4 @@
 ✅ Tested for map.apps 4.18.0 / Linie 4
 
 #### Release Notes
-- SNAPSHOT-Release
+- autogenerated SNAPSHOT-Release

src/main/config/assembly.xml

@@ -34,4 +34,4 @@
             <outputDirectory>.</outputDirectory>
         </fileSet>
     </fileSets>
-</assembly>
+</assembly>

src/main/js/bundles/dn_welcome/README.md

@@ -27,7 +27,7 @@ All configuration is performed on the `Config` component as show in the followin
             "checkboxChecked": true,
             "showImage": true,
             "imageUrl": "resource('${app}:images/welcome.jpg')",
-            "imageHeight": "300px"
+               "imageHeight": "300px"
         }
     }
 }
@@ -36,12 +36,12 @@ All configuration is performed on the `Config` component as show in the followin
 
 All of these properties are optional.
 
-| Property                  | Type    | Possible values         | Default     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|---------------------------|---------|-------------------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `heading`                 | String  |                         |             | The heading shown below the image.                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-| `infoText`                | String  |                         |             | The text displayed in the main content area of the window.                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| `showButton`              | Boolean | `true` | `false`   | `true`      | Whether to show the button. If you still require a way to close the windo without using the button, you can remove `noTitleBarAndWindowTools` CSS class from the window's `windowClass` property. The window title bar containing a "close" button will then become visible. See the [templates bundle documentation](https://demos.conterra.de/mapapps/resources/jsregistry/root/templates/latest/README.md#b%3Dtemplates%3Bv%3D4.17.0%3Bf%3Dtempla%3B) for more information. |
-| `buttonText`              | String  |                         |             | The label of the button.                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| Property     | Type    | Possible values       | Default | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|--------------|---------|-----------------------|---------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `heading`    | String  |                       |         | The heading shown below the image.                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| `infoText`   | String  |                       |         | The text displayed in the main content area of the window.                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| `showButton` | Boolean | `true` | `false` | `true`  | Whether to show the button. If you still require a way to close the windo without using the button, you can remove `noTitleBarAndWindowTools` CSS class from the window's `windowClass` property. The window title bar containing a "close" button will then become visible. See the [templates bundle documentation](https://demos.conterra.de/mapapps/resources/jsregistry/root/templates/latest/README.md#b%3Dtemplates%3Bv%3D4.17.0%3Bf%3Dtempla%3B) for more information. |
+| `buttonText` | String  |                       |         | The label of the button.                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | `buttonDependsOnCheckbox` | Boolean | `true` | `false`   | `false`     | If `true`, the button is only enabled when the checkbox is checked. If the checkbox is not checked, the button is greyed out and cannot be clicked. Note: `showCheckbox` must be `true` for this property to have an effect.
 | `showCheckbox`            | Boolean | `true` | `false`   | `true`      | Whether to show the checkbox in the window. Note: The property `buttonDependsOnCheckbox` is ignored, if `showCheckbox` is `false`.                                                                                                                                                                                                                                                                                                                                             |
 | `checkboxText`            | String  |                         |             | The label for the checkbox.                                                                                                                                                                                                                                                                                                                                                                                                                                                    |

src/main/js/bundles/dn_welcome/build.config.js

@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2023 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.
+ */
 ///
 /// Copyright (C) 2023 con terra GmbH (info@conterra.de)
 ///

src/main/types/mocha-global.d.ts

@@ -0,0 +1 @@
+declare const testConfig: (opts?: Record<string, any>) => void;

src/main/types/thirdparty.d.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) con terra GmbH
+ */
+
+declare module "dojo/*";
+declare module "dijit/*";
+declare module "dojox/*";

src/main/types/vue-shim.d.ts

@@ -0,0 +1,4 @@
+declare module "*.vue" {
+    import Vue from "vue";
+    export default Vue;
+}

src/support/js/check-licenses.ts

@@ -0,0 +1,59 @@
+/*
+    Checks licenses of node dependencies against a list of allowed licenses.
+    Fails with exit code != 0 and an error message if a disallowed license is encountered.
+    The script should be executed from the project root directory after dependencies have been installed:
+
+        $ tsx ./src/support/js/check-licenses.ts
+
+    To run checks yourself (e.g. to update the allow list or to get details), install
+    license-checker yourself and run it from the project root directory:
+
+        $ npm install -g license-checker
+        $ license-checker --summary # outputs list of used licenses
+        $ license-checker --json    # outputs details
+
+    See also https://www.npmjs.com/package/license-checker
+*/
+
+import { init as initChecker } from "license-checker";
+import { cwd, exit} from "node:process";
+
+// Licenses known to be OK.
+const ACCEPTED_LICENSES = [
+    "MIT",
+    "ISC",
+    "Apache-2.0",
+    "Apache 2.0",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "BSD",
+    "CC0-1.0",
+    "CC-BY-3.0",
+    "CC-BY-4.0",
+    "Python-2.0",
+    "Unlicense" // Note: not unlicenseD (https://opensource.org/licenses/unlicense)
+];
+
+// Packages with licenses that are not recognized properly by license-checker.
+// These must be checked manually.
+const SKIP_PACKAGES = [
+    "event-stream@3.0.20", // MIT License not recognized
+    "taffydb@2.6.2" // BSD-1-Clause License in source code
+];
+
+initChecker(
+    {
+        start: cwd(),
+        onlyAllow: ACCEPTED_LICENSES.join(";"),
+        excludePackages: SKIP_PACKAGES.join(";")
+    },
+    (error, packages) => {
+        void packages; // currently unused
+
+        if (error) {
+            console.error("Error: ", error);
+            exit(1);
+        }
+        exit(0);
+    }
+);

src/test/webapp/WEB-INF/web.xml

@@ -26,8 +26,8 @@
         -->
         <servlet-name>default</servlet-name>
         <init-param>
-            <param-name>useFileMappedBuffer</param-name>
-            <param-value>false</param-value>
+           <param-name>useFileMappedBuffer</param-name>
+           <param-value>false</param-value>
         </init-param>
     </servlet>