Merge pull request #3127 from AtlasOfLivingAustralia/dev

Preparing 4.4

.github/workflows/build.yml

@@ -30,7 +30,13 @@ jobs:
         with:
           node-version: 16
 
+      - run: npm config set //npm.pkg.github.com/:_authToken $NODE_AUTH_TOKEN
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - run: npm install
+
+
       - name: Validate Gradle wrapper
         uses: gradle/[email protected]
 

.gitignore

@@ -44,3 +44,6 @@ grails-app/assets/vendor-ext
 /build/
 /.gradle/
 /grails-app/assets/components/compile/templates.js
+/ehcache/.lock
+/ehcache/file/homePageStatistics_c96622e3da276e1ccd3532e6f1f975756232b01a/offheap-disk-store/ehcache-disk-store.data
+/ehcache/file/homePageStatistics_c96622e3da276e1ccd3532e6f1f975756232b01a/offheap-disk-store/ehcache-disk-store.meta

.npmrc

@@ -0,0 +1 @@
+@atlasoflivingaustralia:registry=https://npm.pkg.github.com

README.md

@@ -28,10 +28,14 @@ It is currently in use by the Australian Government.
 This configuration file largely specifies URLs to MERIT dependencies.  See https://github.com/AtlasOfLivingAustralia/fieldcapture/wiki/MERIT-Dependencies for information about these.
 Note that you will need to obtain an ALA API key to use ALA services and a Google Maps API key and specify them in this file.
 
+npm / nodejs are used to run javascript unit tests.  There is a dependency on the ecodata-client-plugin for some javascript which is published to github packages which requires an access token to read.
+
 * Install npm and nodejs (see https://www.npmjs.com/get-npm)
+* Authenticate to github packages using your github username and access token setup for package:read
 * Install the node dependencies for MERIT.  Note these are currently only used for testing.
 
 ```
+npm login --scope=@atlasoflivingaustralia --auth-type=legacy --registry=https://npm.pkg.github.com
 npm install
 npm install -g karma
 ```

build.gradle

@@ -97,8 +97,7 @@ dependencies {
     implementation "org.grails.plugins:gsp"
     implementation 'dk.glasius:external-config:3.0.0'
     implementation "org.grails.plugins:ala-auth:$alaSecurityLibsVersion"
-    // Needs to be left at 2.0 until we finish replacing pdfgen HTML report generation
-    implementation "org.grails.plugins:ala-ws-security-plugin:2.0"
+    implementation "org.grails.plugins:ala-ws-security-plugin:$alaSecurityLibsVersion"
     implementation "org.grails.plugins:ala-ws-plugin:$alaSecurityLibsVersion"
     implementation "au.org.ala:userdetails-service-client:$alaSecurityLibsVersion"
     implementation "com.github.ben-manes.caffeine:caffeine:3.1.6"
@@ -150,6 +149,7 @@ dependencies {
     implementation "commons-io:commons-io:2.6"
     implementation "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
     implementation "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    implementation group: 'com.googlecode.owasp-java-html-sanitizer', name: 'owasp-java-html-sanitizer', version: '20220608.1'
 
     compileOnly "io.micronaut:micronaut-inject-groovy"
     console "org.grails:grails-console"
@@ -186,7 +186,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:6.1.2"
+        implementation "org.grails.plugins:ecodata-client-plugin:6.2"
     }
 }
 
@@ -244,15 +244,16 @@ clientDependencies {
         'underscore'('1.12.1') {
             include 'underscore.js'
         }
-        'datatables.net-bs4'("1.10.25")
-        "datatables.net-buttons-dt"("1.7.1")
-        'datatables.net-buttons-bs4'("1.7.1")
+        'datatables.net'("1.13.6")
+        'datatables.net-bs4'("1.13.6")
+        "datatables.net-buttons-dt"("2.4.2")
+        'datatables.net-buttons-bs4'("2.4.2")
         '@danielfarrell/bootstrap-combobox'('1.1.8', transitive:false)
         'fancybox'('3.0.1')
         "fuelux"("3.17.2", transitive:false)
         "fuse.js"("6.4.6", transitive:false)
         "leaflet"("0.7.7")
-        "select2-theme-bootstrap4"("1.0.0")
+        "select2-theme-bootstrap4"("1.0.2")
         "slickgrid"("2.4.38")
         "slider-pro"("1.6.0", transitive:false)
         "jquery-appear-original"("0.4.1", transitive:false)

forms/bushfires/bushfiresStatesProgressReport.json

@@ -9968,52 +9968,39 @@
                 "name": "sitesTested"
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.areaHa(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "areaTestedHa",
-                "units": "Ha",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*0.9"
-                    }
-                  },
+                "units": "ha",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.areaHa(sitesTested)*1.1"
+                    "condition": "areaTestedChangeHa > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]
               },
               {
-                "defaultValue": {
-                  "type": "computed",
+                "computed": {
                   "expression": "$geom.lengthKm(sitesTested)"
                 },
                 "dataType": "number",
                 "name": "lengthTestedKm",
-                "units": "Km",
-                "validate": [
-                  {
-                    "rule": "min",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*0.9",
-                      "errorMessages": "Please Select"
-                    }
-                  },
+                "units": "km",
+                "decimalPlaces": 3,
+                "behaviour": [
                   {
-                    "rule": "max",
-                    "param": {
-                      "type": "computed",
-                      "expression": "$geom.lengthKm(sitesTested)*1.1"
+                    "condition": "lengthTestedChangeKm > 0",
+                    "type": "conditional_validation",
+                    "value": {
+                      "message": "",
+                      "validate": "required,min[0.0001]"
                     }
                   }
                 ]