DN-34: Updated to map.apps 4.18.1

conterra · Jun 12, 2024 · 4bb7970 · 4bb7970
1 parent 28d8de4
commit 4bb7970
Show file tree

Hide file tree

Showing 15 changed files with 128 additions and 88 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,6 +1,6 @@
 {
-    "extends": "eslint-config-ct-prodeng",
-    "plugins": [
-        "vue"
-    ]
+	"extends": "eslint-config-ct-prodeng",
+	"plugins": [
+		"vue"
+	]
 }
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@
 /.vscode/settings.json
 /.externalToolBuilders/
 /package-lock.json
+/gulpfile.overrides.js
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,4 @@
-✅ Tested for map.apps 4.15.0 / Linie 4
+✅ Tested for map.apps 4.18.1 / Linie 4
 
 #### Release Notes
 - autogenerated SNAPSHOT-Release
diff --git 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"

diff --git a/package.json b/package.json
@@ -4,22 +4,33 @@
     "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.18.1",
+        "@conterra/mapapps-mocha-runner": "1.1.1",
+        "@conterra/reactivity-core": "^0.4.0",
+        "@types/chai": "4.3.10",
+        "@types/license-checker": "^25.0.6",
+        "@types/mocha": "10.0.4",
+        "arcgis-js-api": "4.29.10",
+        "chai": "4.3.10",
+        "ct-mapapps-browser-sync": "0.0.39",
+        "ct-mapapps-gulp-js": "0.10.3",
+        "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.4.5",
+        "vue": "2.7.15",
+        "vue-template-compiler": "2.7.15"
     }
 }
diff --git 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>
@@ -81,7 +77,6 @@
             <version>${ct.jsrt-test.version}</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     <build>
         <pluginManagement>
@@ -96,6 +91,10 @@
                     <artifactId>ct-jsregistry-maven-plugin</artifactId>
                     <version>${ct.jsregistry.version}</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.8.2</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -143,10 +142,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>
@@ -172,11 +170,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>
@@ -202,6 +195,29 @@
             </testResource>
         </testResources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.8.0,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[17,)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>de.conterra.maven</groupId>
                 <artifactId>setproperties-maven-plugin</artifactId>
@@ -214,32 +230,31 @@
                     </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>
             </plugin>
             <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>
             </plugin>
             <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>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <id>unpack-themes-src</id>
@@ -342,6 +357,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>
@@ -408,6 +426,13 @@
             <plugin>
                 <groupId>de.conterra.mapapps</groupId>
                 <artifactId>mapapps-maven-plugin</artifactId>
+                <configuration>
+                    <!-- only build zip files -->
+                    <skipDeploy>true</skipDeploy>
+                    <createApp>false</createApp>
+                    <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 -->
@@ -435,13 +460,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>
@@ -494,11 +512,12 @@
         <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.18.1</mapapps.version>
+        <vuetify.version>1.5.30</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.1.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-->
@@ -528,7 +547,7 @@
         required -->
         <mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
         <!-- enable this if "upload" profile should only deploy bundles -->
-        <skip.apps.upload>true</skip.apps.upload>
+        <skip.apps.upload>false</skip.apps.upload>
         <!-- enable this if "upload" profile should pre-optimize apps -->
         <triggerPreOptimization>false</triggerPreOptimization>
     </properties>
@@ -561,6 +580,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>
@@ -571,6 +595,11 @@
                     <artifactId>apprt-polyfill</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>de.conterra.js</groupId>
+                    <artifactId>reactivity</artifactId>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
         <profile>

diff --git a/src/main/js/apps/sample/app.js b/src/main/js/apps/sample/app.js
diff --git a/src/main/js/bundles/dn_hierarchicalsearch/HierarchicalSearchController.ts b/src/main/js/bundles/dn_hierarchicalsearch/HierarchicalSearchController.ts
@@ -21,7 +21,7 @@ import type { InjectedReference } from "apprt-core/InjectedReference";
 import ServiceResolver from "apprt/ServiceResolver";
 import ct_util from "ct/ui/desktop/util";
 import Filter from "ct/store/Filter";
-import ComplexQueryToSQL from "ct/store/ComplexQueryToSQL";
+import {toSQLWhere} from "store-api/rest/ComplexQueryToSQL";
 import Query from "esri/rest/support/Query";
 import * as query from "esri/rest/query";
 import HierarchicalSearchModel from "./HierarchicalSearchModel";
@@ -172,7 +172,7 @@ export default class HierarchicalSearchController {
             queryObject.where = "1=1";
         } else {
             const complexQuery = this.getComplexQuery();
-            queryObject.where = ComplexQueryToSQL.toSQLWhere(complexQuery, {});
+            queryObject.where = toSQLWhere(complexQuery, {});
         }
         query.executeQueryJSON(this.store.target, queryObject).then(function (response) {
             response.features.forEach((feature) => {

diff --git a/src/main/types/mocha-global.d.ts b/src/main/types/mocha-global.d.ts
@@ -0,0 +1 @@
+declare const testConfig: (opts?: Record<string, any>) => void;
diff --git a/src/main/types/thirdparty.d.ts b/src/main/types/thirdparty.d.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) con terra GmbH
+ */
+
+declare module "dojo/*";
+declare module "dijit/*";
+declare module "dojox/*";
diff --git a/src/main/types/vue-shim.d.ts b/src/main/types/vue-shim.d.ts
@@ -0,0 +1,4 @@
+declare module "*.vue" {
+    import Vue from "vue";
+    export default Vue;
+}