Merge branch 'master' into 12-printing-frame-is-not-used

.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}}

.stylelintignore

@@ -0,0 +1,3 @@
+# add path patterns to ignore style files
+**/external-libs/**
+**/styles/dijit/**

.stylelintrc

@@ -0,0 +1,3 @@
+{
+	"extends": "stylelint-config-ct-prodeng"
+}

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

gulpfile.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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",

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",

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.conterra.devnet</groupId>
     <artifactId>mapapps-printing-enhanced</artifactId>
-    <version>2.0.9-SNAPSHOT</version>
+    <version>2.0.12-SNAPSHOT</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
@@ -86,11 +86,6 @@
     <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>
@@ -326,7 +321,7 @@
                     <properties>
                         <owner>con terra GmbH</owner>
                         <email>[email protected]</email>
-                        <project.inceptionYear>2020</project.inceptionYear>
+                        <project.inceptionYear>2023</project.inceptionYear>
                     </properties>
                     <includes>
                         <include>src/main/js/**/*.js</include>
@@ -394,7 +389,8 @@
                             <goal>buildPacksProperties</goal>
                         </goals>
                         <configuration>
-                            <!-- don't list not shipped bundles in the META-INF\js-registry-packs.properties file -->
+                            <!-- don't list not shipped bundles in the
+                            META-INF\js-registry-packs.properties file -->
                             <scanPackagesExcludes>apps/**,bundles/sample_tests</scanPackagesExcludes>
                         </configuration>
                     </execution>
@@ -473,10 +469,10 @@
         </plugins>
     </build>
     <scm>
-        <connection>scm:git:https://github.com/conterra/mapapps-devnet-blueprint.git</connection>
-        <developerConnection>scm:git:https://github.com/conterra/mapapps-devnet-blueprint.git
+        <connection>scm:git:https://github.com/conterra/mapapps-printing-enhanced.git</connection>
+        <developerConnection>scm:git:https://github.com/conterra/mapapps-printing-enhanced.git
         </developerConnection>
-        <url>https://github.com/conterra/mapapps-devnet-blueprint</url>
+        <url>https://github.com/conterra/mapapps-printing-enhanced</url>
         <tag>HEAD</tag>
     </scm>
     <distributionManagement>
@@ -494,11 +490,11 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.15.0</mapapps.version>
+        <mapapps.version>4.15.1</mapapps.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
         <!-- java lib versions -->
-        <ct.jsregistry.version>1.5.9</ct.jsregistry.version>
+        <ct.jsregistry.version>1.5.10</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-->
@@ -528,7 +524,7 @@
         required -->
         <mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
         <!-- enable this if "upload" profile should only deploy bundles -->
-        <skip.apps.upload>false</skip.apps.upload>
+        <skip.apps.upload>true</skip.apps.upload>
         <!-- enable this if "upload" profile should pre-optimize apps -->
         <triggerPreOptimization>false</triggerPreOptimization>
     </properties>

src/main/config/assembly.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

src/main/js/apps/sample/app.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/apps/sample/nls/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/apps/sample/nls/de/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/LayoutHelper.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/LayoutWidget.vue

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -118,6 +118,13 @@
                 v-if="visibleUiElements.scaleEnabled"
                 md12
             >
+                <div
+                    v-if="!scaleEnabled && !visibleUiElements.printPreviewCheckbox"
+                    aria-live="polite"
+                    class="ct-message ct-message--info mt-2"
+                >
+                    {{ i18n.helperTextScaleEnabled }}
+                </div>
                 <v-checkbox
                     v-model="scaleEnabledValue"
                     :label="i18n.scaleEnabled"

src/main/js/bundles/dn_printingenhanced/MapOnlyWidget.vue

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -135,6 +135,13 @@
                 v-if="visibleUiElements.scaleEnabled"
                 md12
             >
+                <div
+                    v-if="!scaleEnabled && !visibleUiElements.printPreviewCheckbox"
+                    aria-live="polite"
+                    class="ct-message ct-message--info mt-2"
+                >
+                    {{ i18n.helperTextScaleEnabled }}
+                </div>
                 <v-checkbox
                     v-model="scaleEnabledValue"
                     :label="i18n.scaleEnabled"
@@ -194,13 +201,6 @@
                     class="pa-0 ma-0"
                 />
             </v-flex>
-            <div
-                v-if="!scaleEnabled"
-                aria-live="polite"
-                class="ct-message ct-message--info mt-2"
-            >
-                {{ i18n.helperTextScaleEnabled }}
-            </div>
         </v-layout>
     </v-container>
 </template>

src/main/js/bundles/dn_printingenhanced/PrintingEnhancedWidget.vue

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -219,6 +219,10 @@
                     type: Boolean,
                     default: true
                 },
+                printPreviewInitallyVisible:{
+                    type: Boolean,
+                    default: null
+                },
                 activeTab: {
                     type: Number,
                     default: 0
@@ -254,6 +258,9 @@
             } else {
                 this.activeTab = 0;
             }
+            if (!this.visibleUiElements.printPreviewCheckbox) {
+                this.printPreviewInitallyVisible = this.enablePrintPreview;
+            }
             this.$emit('startup');
         },
         methods: {

src/main/js/bundles/dn_printingenhanced/PrintingEnhancedWidgetFactory.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingInfosAnalyzer.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingPreviewController.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingPreviewDrawer.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingPropertiesOverWriter.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingResultsWidget.vue

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020 con terra GmbH ([email protected])
+    Copyright (C) 2023 con terra GmbH ([email protected])
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/PrintingToggleToolHandler.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/css/styles.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,6 @@
 
 .ctAppRoot .vue-base.printing-enhanced-widget .infoButton {
     margin: 0px;
-    top: 0px
+    top: 0px !important;
 }
 

src/main/js/bundles/dn_printingenhanced/main.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "dn_printingenhanced",
-    "version": "2.0.9-SNAPSHOT",
+    "version": "2.0.12-SNAPSHOT",
     "title": "${bundleName}",
     "description": "${bundleDescription}",
     "vendor": "con terra GmbH",

src/main/js/bundles/dn_printingenhanced/module.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/nls/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/nls/de/bundle.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/js/bundles/dn_printingenhanced/tests/all.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 con terra GmbH ([email protected])
+ * Copyright (C) 2023 con terra GmbH ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.