diff --git a/.github/workflows/devnet-bundle-release.yml b/.github/workflows/devnet-bundle-release.yml index 128585e..273d217 100644 --- a/.github/workflows/devnet-bundle-release.yml +++ b/.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}} diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..67efcac --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "Vue.volar", + "Esri.arcgis-jsapi-snippets", + "ctjdr.vscode-apprt-bundles" + ] +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..e8ab909 --- /dev/null +++ b/.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" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 93297ba..d1643d5 100644 --- a/.vscode/tasks.json +++ b/.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": [], } ] } diff --git a/RELEASE.md b/RELEASE.md index f9ba788..e7a3ad9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ ✅ Tested for map.apps 4.18.0 / Linie 4 #### Release Notes -- SNAPSHOT-Release +- autogenerated SNAPSHOT-Release diff --git a/build.properties b/build.properties index e97229c..8f06767 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -# Copyright (C) 2023 con terra GmbH (info@conterra.de) +# Copyright (C) 2024 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/gulpfile.js b/gulpfile.js index 9d4b8c7..7b58279 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 con terra GmbH (info@conterra.de) + * Copyright (C) 2024 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/pom.xml b/pom.xml index ad2b760..942dc9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ default - useFileMappedBuffer - false + useFileMappedBuffer + false diff --git a/src/test/webapp/favicon.ico b/src/test/webapp/favicon.ico deleted file mode 100644 index 9728155..0000000 Binary files a/src/test/webapp/favicon.ico and /dev/null differ diff --git a/src/test/webapp/image.png b/src/test/webapp/image.png new file mode 100644 index 0000000..c11109f Binary files /dev/null and b/src/test/webapp/image.png differ diff --git a/src/test/webapp/index.html b/src/test/webapp/index.html index a96bb15..f6bd269 100644 --- a/src/test/webapp/index.html +++ b/src/test/webapp/index.html @@ -1,6 +1,6 @@ - - - - - - - - - - - - - - map.apps sample - - + - - -
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ var url = rule[1] || proxyUrl; + proxyrules.push({ + origin: origin, + proxyUrl: url + }); + }); + var trustedServers = "@@cors.request.trustedServers@@".split(/\s*,\s*/) + .filter(function(item){ return item && item.match(/^[^@.].*$/)}); + $apprt.changeConfig({ + isDebug: true, + has: { + "ct-debug": true, + "ct-log-deprecations": true + }, + ct: { + amdPackages: ["apprt@^@@apprt.version@@"], + preFetchBundles: false + }, + apprt: { + request: { + trustedServers: trustedServers, + proxyUrl: proxyUrl, + proxyRules: proxyrules + } + }, + packages: [ + // add local apps directory as amd package + { name: "localapps", location: "@@applicationURL.noscheme@@/js/apps" }, + // add local bundles directory as amd package + { name: "localbundles", location: "@@jsregistry.root.url@@" } + ] + }); + $apprt.startApp({ + configLocation: "localapps", + param: "app", + defaultApp: "@@default.app.name@@" + }); + + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ +

+
+
+

 

+
-
-

- -

-
-
-

 

-
+
-
-
-
- + diff --git a/src/test/webapp/init.css b/src/test/webapp/init.css index 9f5144e..1f96acb 100644 --- a/src/test/webapp/init.css +++ b/src/test/webapp/init.css @@ -1,5 +1,5 @@ /** - * Copyright (C) 2023 con terra GmbH (info@conterra.de) + * Copyright (C) 2024 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/test/webapp/js/tests/init-packs.js b/src/test/webapp/js/tests/init-packs.js index 77ddfb9..4d0d65f 100644 --- a/src/test/webapp/js/tests/init-packs.js +++ b/src/test/webapp/js/tests/init-packs.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 con terra GmbH (info@conterra.de) + * Copyright (C) 2024 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/test/webapp/js/tests/runTests.html b/src/test/webapp/js/tests/runTests.html index 12c07ed..ba53699 100644 --- a/src/test/webapp/js/tests/runTests.html +++ b/src/test/webapp/js/tests/runTests.html @@ -1,6 +1,6 @@ - - Tests - - - -Redirecting to test runner. - + + Tests + + + + Redirecting to test runner. + diff --git a/src/test/webapp/js/tests/test-init.js b/src/test/webapp/js/tests/test-init.js index 2c86832..85d5f99 100644 --- a/src/test/webapp/js/tests/test-init.js +++ b/src/test/webapp/js/tests/test-init.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 con terra GmbH (info@conterra.de) + * Copyright (C) 2024 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/test/webapp/login.css b/src/test/webapp/login.css index a2f498c..6c614f5 100644 --- a/src/test/webapp/login.css +++ b/src/test/webapp/login.css @@ -1,5 +1,5 @@ /** - * Copyright (C) 2023 con terra GmbH (info@conterra.de) + * Copyright (C) 2024 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. @@ -23,102 +23,86 @@ background-color: #48484B; border: none; color: #fff; - -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25); - -moz-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25); - box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25); + -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25) ; + -moz-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25) ; + box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.25) ; font-size: .688em; padding: 0; } - -.start.notheme .esriSignInDialog .dijitDialogTitleBar { +.start.notheme .esriSignInDialog .dijitDialogTitleBar{ background-color: #2C2D2E; font-size: 1.5em; padding: 5px 8px; cursor: move; } - -.start.notheme .esriSignInDialog .dijitDialogCloseIcon { +.start.notheme .esriSignInDialog .dijitDialogCloseIcon{ float: right; cursor: pointer; position: relative; top: -2px; right: 1px; } - -.start.notheme .esriSignInDialog .dijitDialogPaneContentArea { +.start.notheme .esriSignInDialog .dijitDialogPaneContentArea{ padding: 5px 7px 4px 7px; } - -.start.notheme .esriSignInDialog .dijitDialogPaneActionBar { +.start.notheme .esriSignInDialog .dijitDialogPaneActionBar{ padding: 5px 8px 14px; text-align: right; } - -.start.notheme .esriSignInDialog .dijitButtonNode { +.start.notheme .esriSignInDialog .dijitButtonNode{ padding: 4px 12px; color: #fff; font-weight: bold; background-color: #12A5F4; } - -.start.notheme .dijitDialogPaneActionBar .dijitButton:last-child .dijitButtonNode { +.start.notheme .dijitDialogPaneActionBar .dijitButton:last-child .dijitButtonNode{ background: #7C7C7C; } - -.start.notheme .esriSignInDialog .dijitButtonHover .dijitButtonNode { +.start.notheme .esriSignInDialog .dijitButtonHover .dijitButtonNode{ background-color: #2AAEF5; } - .start.notheme .esriSignInDialog .dijitTextBox { background-color: #FFF; - -webkit-box-sizing: border-box; + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; border: 1px solid #48484B; color: #000; margin-top: 3px; } - .start.notheme .esriSignInDialog .dijitTextBox .dijitInputField { padding-left: 5px; } - .start.notheme .esriSignInDialog .dijitInputInner { border: 0 !important; vertical-align: middle !important; background-color: transparent !important; width: 100% !important; } - -.start.notheme .esriSignInDialog .dijitTextBox .dijitInputInner { +.start.notheme .esriSignInDialog .dijitTextBox .dijitInputInner{ padding: 1px 2px 1px 0; outline: none; } - .start.notheme .esriSignInDialog .dijitTextBox .dijitValidationContainer, .start.notheme .esriSignInDialog .dijitToggleButtonIconChar { display: none !important; } - -.start.notheme .dijitButton { +.start.notheme .dijitButton{ margin: 0.2em; vertical-align: middle; cursor: pointer; } - .start.notheme .dijitOffScreen { position: absolute; left: 50%; top: -10000px; } - -.start.notheme .esriSignInDialog .esriErrorMsg { +.start.notheme .esriSignInDialog .esriErrorMsg{ background: #C0392B; padding: 3px; } - -.start.notheme .esriSignInDialog .dijitTextBoxHover, -.start.notheme .esriSignInDialog .dijitTextBoxFocused { +.start.notheme .esriSignInDialog .dijitTextBoxHover, +.start.notheme .esriSignInDialog .dijitTextBoxFocused{ border-color: #12A5F4; -ms-transition-duration: .1s; -moz-transition-duration: .1s; @@ -127,12 +111,11 @@ transition-duration: .1s; } -.start.notheme .esriSignInDialog .dijitTextBoxError { +.start.notheme .esriSignInDialog .dijitTextBoxError{ border-color: #C0392B; border-right-width: 10px; position: relative; } - .start.notheme .esriSignInDialog .dijitTextBoxError:after { content: '!'; position: absolute; @@ -144,6 +127,6 @@ /*IE and FF calculates the textbox input smaller so that the surround error container doesn't fit'*/ .dj_ie .start.notheme .dijitInputInner, -.dj_gecko .start.notheme .dijitInputInner { +.dj_gecko .start.notheme .dijitInputInner{ height: 22px; }