Merge branch 'master' into feature/cognito-test

.github/workflows/build.yml

@@ -27,28 +27,40 @@ jobs:
       - name: Install nodejs
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: '16.x'
+          registry-url: 'https://npm.pkg.github.com'
+          scope: 'AtlasOfLivingAustralia'
 
       - run: npm install
       - run: npm run package-turf
+
+
+      - name: Update your package.json with an npm pre-release version
+        id: pre-release-version
+        uses: adobe/update-prerelease-npm-version@v1.0.0
+
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
 
       - name: Run tests and jacoco coverage report with Gradle
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: -PenableJacoco=true test
 
       - name: Run javascript unit tests
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
       - name: Clean to remove clover instrumentation
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
-        uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: publish
         env:

build.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "6.1-PWA-SNAPSHOT"
+version "6.3-PWA-SNAPSHOT"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

gradle.properties

@@ -1,5 +1,5 @@
 groovyVersion=3.0.11
-grailsVersion=5.3.2
+grailsVersion=5.3.5
 gorm.version=7.1.2
 grailsGradlePluginVersion=5.3.0
 org.gradle.daemon=true
@@ -14,4 +14,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xss2048k -Xmx1024M
 exploded=true
 enableClover=false
 enableJacoco=true
-alaSecurityLibsVersion=6.0.0
+alaSecurityLibsVersion=6.2.0

grails-app/assets/javascripts/feature.js

@@ -614,6 +614,8 @@ ecodata.forms.maps.showMapInModal = function(options) {
 
     })
     .one('hidden.bs.modal', function (e) {
+        $ok.unbind('click', okPressed); // This is done because otherwise when cancel is pressed the listener isn't removed.
+
         // This check is necessary because the accordion also fires these events which bubble to the modal.
         if (e.target == this) {
             self.featureMapInstance.clearDrawnItems();