From 6dfd5e52ff4bbe21c19c1eeabaa0a086b2cf2005 Mon Sep 17 00:00:00 2001 From: Sebastian Holtkamp Date: Fri, 24 Nov 2023 08:36:11 +0100 Subject: [PATCH 01/13] Fix scm in pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c36cab9..4db8858 100644 --- a/pom.xml +++ b/pom.xml @@ -473,10 +473,10 @@ - scm:git:https://github.com/conterra/mapapps-devnet-blueprint.git - scm:git:https://github.com/conterra/mapapps-devnet-blueprint.git + scm:git:https://github.com/conterra/mapapps-printing-enhanced.git + scm:git:https://github.com/conterra/mapapps-printing-enhanced.git - https://github.com/conterra/mapapps-devnet-blueprint + https://github.com/conterra/mapapps-printing-enhanced HEAD From a8c855602a198f4943cb2f335b2c89e91f26b5d0 Mon Sep 17 00:00:00 2001 From: matthiasstein Date: Fri, 24 Nov 2023 07:40:06 +0000 Subject: [PATCH 02/13] [update-version] to 2.0.9 --- pom.xml | 2 +- src/main/js/bundles/dn_printingenhanced/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4db8858..2c913c8 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 de.conterra.devnet mapapps-printing-enhanced - 2.0.9-SNAPSHOT + 2.0.9 jar diff --git a/src/main/js/bundles/dn_printingenhanced/manifest.json b/src/main/js/bundles/dn_printingenhanced/manifest.json index 05b3fc4..32534ed 100644 --- a/src/main/js/bundles/dn_printingenhanced/manifest.json +++ b/src/main/js/bundles/dn_printingenhanced/manifest.json @@ -1,6 +1,6 @@ { "name": "dn_printingenhanced", - "version": "2.0.9-SNAPSHOT", + "version": "2.0.9", "title": "${bundleName}", "description": "${bundleDescription}", "vendor": "con terra GmbH", From 7de37813c010f37ebd0331c4851a2234fb17c4ad Mon Sep 17 00:00:00 2001 From: Sebastian Holtkamp Date: Fri, 24 Nov 2023 08:42:21 +0100 Subject: [PATCH 03/13] Set skip.apps.upload to true in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4db8858..75709bb 100644 --- a/pom.xml +++ b/pom.xml @@ -528,7 +528,7 @@ required --> true - false + true false From 261f6f33f1158980765a007efde6df2bd60f706e Mon Sep 17 00:00:00 2001 From: Sebastian Holtkamp Date: Fri, 24 Nov 2023 09:22:04 +0100 Subject: [PATCH 04/13] Update project to map.apps 4.15.1 --- .github/workflows/devnet-bundle-release.yml | 3 +++ .stylelintignore | 3 +++ .stylelintrc | 3 +++ RELEASE.md | 4 ++-- gulpfile.js | 11 +++++++++-- package.json | 4 ++-- pom.xml | 12 ++++-------- src/test/resources/application.properties | 19 ------------------- 8 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 .stylelintignore create mode 100644 .stylelintrc 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/.stylelintignore b/.stylelintignore new file mode 100644 index 0000000..b07fa47 --- /dev/null +++ b/.stylelintignore @@ -0,0 +1,3 @@ +# add path patterns to ignore style files +**/external-libs/** +**/styles/dijit/** \ No newline at end of file diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 0000000..57c90c1 --- /dev/null +++ b/.stylelintrc @@ -0,0 +1,3 @@ +{ + "extends": "stylelint-config-ct-prodeng" +} diff --git a/RELEASE.md b/RELEASE.md index d0ff34f..7951b33 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -✅ Tested for map.apps 4.15.0 / Linie 4 +✅ Tested for map.apps 4.15.1 / Linie 4 #### Release Notes -- SNAPSHOT-Release +- autogenerated SNAPSHOT-Release diff --git a/gulpfile.js b/gulpfile.js index a148ae5..da05b21 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -98,7 +98,12 @@ mapappsBrowserSync.registerTask({ // to prevent auto open of browser, set this to false urlToOpen: localOverrides?.openBrowser ?? true, - + properties: { + paths: [ + // Ensure @@key@@ expressions filtered in tests files + /^\/js\/tests\/(runTests.html|test-init.js|init-packs.js)$/ + ] + }, jsreg: { //npmDir : __dirname + "/node_modules/", npmModules: [ @@ -126,7 +131,9 @@ gulp.task("build", gulp.task("lint", gulp.parallel( "js-lint" - //,"style-lint" + /*, comment in to lint .css/.less files + "style-lint" + */ )); gulp.task("preview", diff --git a/package.json b/package.json index 67a74ba..899af04 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,11 @@ "check-licenses": "node ./src/support/js/check-licenses.js" }, "devDependencies": { - "@conterra/ct-mapapps-typings": "4.15.0", + "@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.27", + "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", diff --git a/pom.xml b/pom.xml index cd76743..392fb2d 100644 --- a/pom.xml +++ b/pom.xml @@ -86,11 +86,6 @@ - - de.conterra.mapapps - mapapps-maven-plugin - ${mapapps.version} - de.conterra.jsregistry ct-jsregistry-maven-plugin @@ -394,7 +389,8 @@ buildPacksProperties - + apps/**,bundles/sample_tests @@ -494,11 +490,11 @@ ${project.build.directory}/webapp ${root.build.outputPath}/js - 4.15.0 + 4.15.1 ${mapapps.version} - 1.5.9 + 1.5.10 2.0.2 diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 2572d4b..23cf088 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -34,9 +34,6 @@ client.config.initjs=$\{mapapps.remote.base\}/resources/jsregistry/root/apprt-bo # or change the name of the main layer file client.config.mainlayerfiles=apprt/launch/layer -#local (embedded) js registry root url -jsregistry.root.url=${applicationURL.noscheme}/resources/jsregistry/root - # This is used to filter a default app name in the *.html files default.app.name=${default.app.name} @@ -47,12 +44,6 @@ default.app.name=${default.app.name} # [,,];\ (username/password currently not encrypted) proxy.allowedServerUrls=${proxy.allowedServerUrls} -# the following is support for proxied ssl connections -# if you configure '*' then you trust all ssl server certificates -# you can also confige the dns of the certificate subjects to trust them, separated by '|' -# or leave the configuration empty, then the normal java mechanism is used. -proxy.allowedSSLDNs=${proxy.allowedSSLDNs} - # Defines rules for proxy access based on host names. # It provides more fine grained control what requests use a proxy page. # Sample: @@ -70,16 +61,6 @@ proxy.use.rules=${proxy.use.rules} # http://servicesbeta.esri.com,http://server.organization.com cors.request.trustedServers=${cors.request.trustedServers} -jsregistry.replacement.paths=**/tests/*.html - -jsregistry.directoryscanner.npmfolder=${basedir}/node_modules -jsregistry.directoryscanner.npmincludes=mocha,chai,@conterra,@conterra/mapapps-mocha-runner - -# Set to true to allow that *.js.map files are delivered. Default is false. -# This option should be set to true only for stage or development systems. -# It allows better debugging of errors, but may open details of the JavaScript Source code to attackers. -jsregistry.sourcemaps.enabled=true - # Enable debug logging (in browser console). client.config.logging=DEBUG From 2010544b8e561e1cbdb8f345ce017f8120dc51c5 Mon Sep 17 00:00:00 2001 From: Sebastian Holtkamp Date: Fri, 24 Nov 2023 09:29:16 +0100 Subject: [PATCH 05/13] Update inception year --- gulpfile.js | 2 +- pom.xml | 4 ++-- src/main/config/assembly.xml | 2 +- src/main/js/apps/sample/app.js | 2 +- src/main/js/apps/sample/nls/bundle.js | 2 +- src/main/js/apps/sample/nls/de/bundle.js | 2 +- src/main/js/bundles/dn_printingenhanced/LayoutHelper.js | 2 +- src/main/js/bundles/dn_printingenhanced/LayoutWidget.vue | 2 +- src/main/js/bundles/dn_printingenhanced/MapOnlyWidget.vue | 2 +- .../js/bundles/dn_printingenhanced/PrintingEnhancedWidget.vue | 2 +- .../dn_printingenhanced/PrintingEnhancedWidgetFactory.js | 2 +- .../js/bundles/dn_printingenhanced/PrintingInfosAnalyzer.js | 2 +- .../bundles/dn_printingenhanced/PrintingPreviewController.js | 2 +- .../js/bundles/dn_printingenhanced/PrintingPreviewDrawer.js | 2 +- .../dn_printingenhanced/PrintingPropertiesOverWriter.js | 2 +- .../js/bundles/dn_printingenhanced/PrintingResultsWidget.vue | 2 +- .../bundles/dn_printingenhanced/PrintingToggleToolHandler.js | 2 +- src/main/js/bundles/dn_printingenhanced/css/styles.css | 2 +- src/main/js/bundles/dn_printingenhanced/main.js | 2 +- src/main/js/bundles/dn_printingenhanced/module.js | 2 +- src/main/js/bundles/dn_printingenhanced/nls/bundle.js | 2 +- src/main/js/bundles/dn_printingenhanced/nls/de/bundle.js | 2 +- src/main/js/bundles/dn_printingenhanced/tests/all.js | 2 +- src/test/resources/application.properties | 2 +- src/test/webapp/index.html | 2 +- src/test/webapp/init.css | 2 +- src/test/webapp/js/tests/init-packs.js | 2 +- src/test/webapp/js/tests/runTests.html | 2 +- src/test/webapp/js/tests/test-init.js | 2 +- src/test/webapp/login.css | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index da05b21..4891036 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 con terra GmbH (info@conterra.de) + * 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. diff --git a/pom.xml b/pom.xml index 392fb2d..5b23a8e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@