Merge remote-tracking branch 'origin/develop'

# Conflicts: # build.gradle
AtlasOfLivingAustralia · Nov 1, 2023 · c61f9ed · c61f9ed
2 parents c6ddc63 + 7078fbd
commit c61f9ed
Show file tree

Hide file tree

Showing 57 changed files with 387 additions and 620 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 }
 
-version "2.0.0"
+version "2.1.0"
 group "au.org.ala"
 
 apply plugin:"eclipse"
@@ -105,9 +105,10 @@ dependencies {
         exclude group: 'org.slf4j', module: 'slf4j-nop'
     }
     implementation "org.grails.plugins:ala-admin-plugin:2.3.0"
-    implementation "org.grails.plugins:ala-auth:6.0.0"
+    implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
+    implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
 
-    implementation "org.grails.plugins:ala-bootstrap3:4.1.0"
+    implementation "org.grails.plugins:ala-bootstrap3:4.4.0"
 
     implementation "au.org.ala.plugins.grails:ala-charts-plugin:2.3.0-ANGULAR-SNAPSHOT"
     runtimeOnly 'org.grails.plugins:sandbox-hub:1.0'

diff --git a/gradle.properties b/gradle.properties
@@ -9,4 +9,5 @@ seleniumVersion=3.14.0
 webdriverBinariesVersion=2.6
 #chromeDriverVersion=2.45.0
 geckodriverVersion=0.24.0
-seleniumSafariDriverVersion=3.14.0
+seleniumSafariDriverVersion=3.14.0
+alaSecurityLibsVersion=6.2.0
diff --git a/grails-app/assets/compile/spAppModules.js b/grails-app/assets/compile/spAppModules.js
diff --git a/grails-app/assets/javascripts/spApp/controller/addAreaCtrl.js b/grails-app/assets/javascripts/spApp/controller/addAreaCtrl.js
@@ -379,6 +379,7 @@
                             if (data.data === undefined || data.data.id === undefined || !data.data.indb) {
                                 LayersService.getWkt(pid).then(function (wkt) {
                                     $scope.selectedArea.wkt = wkt.data
+                                    $scope.selectedArea.obj.wkt = wkt.data
                                     if (mapNow) {
                                         $scope.addToMapAndClose();
                                     }
@@ -426,4 +427,4 @@
                 $scope.isLoggedIn = $scope.isLoggedIn = $SH.userId !== undefined && $SH.userId !== null && $SH.userId.length > 0;
                 $scope.isNotLoggedIn = !$scope.isLoggedIn;
             }])
-}(angular));
+}(angular));
diff --git a/grails-app/assets/javascripts/spApp/controller/areaReportCtrl.js b/grails-app/assets/javascripts/spApp/controller/areaReportCtrl.js
@@ -262,7 +262,7 @@
                                 name: $i18n(365, "Number of species - spatially valid only"),
                                 query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
                                 map: false,
-                                extraQ: ["geospatial_kosher:true"]
+                                extraQ: ["spatiallyValid:true"]
                             },
                             {
                                 name: $i18n(366, "Number of endemic species"),
@@ -275,7 +275,7 @@
                                 endemic: true,
                                 query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
                                 map: false,
-                                extraQ: ["geospatial_kosher:true"]
+                                extraQ: ["spatiallyValid:true"]
                             }];
 
                         // TODO: move this into config and retrieve from $SH
@@ -289,7 +289,7 @@
                                 name: $i18n(368, "Occurrences - spatially valid only"),
                                 query: {q: areaQ.q, bs: areaQ.bs, ws: areaQ.ws, wkt: areaQ.wkt, qid: areaQ.qid},
                                 occurrences: true,
-                                extraQ: ["geospatial_kosher:true"]
+                                extraQ: ["spatiallyValid:true"]
                             },
                             {
                                 name: $i18n(356, "Expert distributions"),
@@ -512,8 +512,8 @@
                         overrideValues: {
                             ToolExportSampleService: {
                                 input: {
-                                    species: {constraints: {'default': query, disable: true}},
-                                    area: {constraints: {'default': area, disable: true}}
+                                    species: {constraints: {'defaultValue': query, disable: true}},
+                                    area: {constraints: {'defaultValue': area, disable: true}}
                                 }
                             }
                         },

diff --git a/grails-app/assets/javascripts/spApp/controller/createSpeciesListCtrl.js b/grails-app/assets/javascripts/spApp/controller/createSpeciesListCtrl.js
@@ -47,7 +47,7 @@
                 $scope.newListName = $i18n(375, "My species list");
                 $scope.newListDescription = '';
                 $scope.newItems = '';
-                $scope.makePrivate = false;
+                $scope.makePrivate = true; // new lists are private by default
                 $scope.newListType = $scope.listTypes[0]
 
                 $scope.selectedQ = {
@@ -227,4 +227,4 @@
 
 
             }])
-}(angular));
+}(angular));
diff --git a/grails-app/assets/javascripts/spApp/controller/exportBccvlCtrl.js b/grails-app/assets/javascripts/spApp/controller/exportBccvlCtrl.js
diff --git a/grails-app/assets/javascripts/spApp/controller/leafletMapController.js b/grails-app/assets/javascripts/spApp/controller/leafletMapController.js
@@ -484,7 +484,7 @@
                                     if (data[pt] instanceof Array) {
                                         g = [data[pt][1], data[pt][2]];
                                     } else {
-                                        g = data[pt].geometry.replace("POINT(", "").replace(")", "").split(" ");
+                                        g = data[pt].geometry.replace("POINT (", "").replace(")", "").split(" ");
                                     }
                                     var m = L.marker([g[1], g[0]])
                                         .bindLabel(data[pt].name, {noHide: true});
@@ -772,4 +772,4 @@
                 }, 0)
 
             }])
-}(angular));
+}(angular));