From 8a242e9dafc5112504c28a3ceba9f7d225b852ab Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Thu, 18 Apr 2024 12:19:53 +1000
Subject: [PATCH 1/2] Fix for allowRowDelete #242

---
 .../org/ala/ecodata/forms/ModelTagLib.groovy  | 10 ++++++---
 .../ala/ecodata/forms/ModelTagLibSpec.groovy  | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelTagLib.groovy
index fb1b73db..d962d3fa 100644
--- a/grails-app/taglib/au/org/ala/ecodata/forms/ModelTagLib.groovy
+++ b/grails-app/taglib/au/org/ala/ecodata/forms/ModelTagLib.groovy
@@ -1009,8 +1009,12 @@ class ModelTagLib {
     }
 
     static boolean getAllowRowDelete(attrs, name, context) {
-        def ard = getAttribute(attrs, name, context, 'allowRowDelete') ?: 'true'
-        return ard.toBoolean()
+        Map dataModel = getAttribute(attrs.model.dataModel, name)
+        def allowRowDelete = true
+        if (dataModel?.allowRowDelete != null) {
+            allowRowDelete = Boolean.valueOf(dataModel.allowRowDelete)
+        }
+        allowRowDelete
     }
 
 
@@ -1031,7 +1035,7 @@ class ModelTagLib {
         return target ? target[attribute] : null
     }
 
-    def getAttribute(model, name) {
+    static def getAttribute(Collection model, String name) {
         return model.findResult( {
 
             if (it.name == name) {
diff --git a/src/test/groovy/au/org/ala/ecodata/forms/ModelTagLibSpec.groovy b/src/test/groovy/au/org/ala/ecodata/forms/ModelTagLibSpec.groovy
index ab181cf2..a95e6380 100644
--- a/src/test/groovy/au/org/ala/ecodata/forms/ModelTagLibSpec.groovy
+++ b/src/test/groovy/au/org/ala/ecodata/forms/ModelTagLibSpec.groovy
@@ -147,4 +147,26 @@ class ModelTagLibSpec extends Specification implements TagLibUnitTest<ModelTagLi
 
     }
 
+    def "The allowRowDelete method supports nested tables"() {
+        setup:
+        Map attrs = [model:[dataModel:[
+                [dataType:'list', name:"test", columns:[], allowRowDelete:true],
+                [dataType:'list', name:"test2", columns:[], allowRowDelete:"true"],
+                [dataType:'list', name:"test3", columns:[], allowRowDelete:"false"],
+                [dataType:'list', name:"test4", columns:[], allowRowDelete:false],
+
+                [dataType:'list', name:"test5", columns:[
+                        [dataType:'list', name:"test6", allowRowDelete: false]
+                ]]
+        ]]]
+
+        expect:
+        ModelTagLib.getAllowRowDelete(attrs, "test", null) == true
+        ModelTagLib.getAllowRowDelete(attrs, "test2", null) == true
+        ModelTagLib.getAllowRowDelete(attrs, "test3", null) == false
+        ModelTagLib.getAllowRowDelete(attrs, "test4", null) == false
+        ModelTagLib.getAllowRowDelete(attrs, "test5", null) == true // default is true
+        ModelTagLib.getAllowRowDelete(attrs, "test6", null) == false
+    }
+
 }

From 48c2a3cac105d8d66496aeb3c799ed26f8f75628 Mon Sep 17 00:00:00 2001
From: chrisala <chris.godwin.ala@gmail.com>
Date: Thu, 18 Apr 2024 12:33:08 +1000
Subject: [PATCH 2/2] npm audit fix #242

---
 package-lock.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ec760bd..31d441dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@turf/convex": "^6.0.2",
         "@turf/length": "^6.0.2",
         "@turf/simplify": "^5.1.5",
-        "chromedriver": "123.0.0",
+        "chromedriver": "123.0.1",
         "geojson2svg": "^1.2.3",
         "handlebars": "^4.7.7",
         "jasmine-ajax": "^4.0.0",
@@ -1339,9 +1339,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "123.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.0.tgz",
-      "integrity": "sha512-OE9mpxXwbFy5LncAisqXm1aEzuLPtEMORIxyYIn9uT7N8rquJWyoip6w9Rytub3o2gnynW9+PFOTPVTldaYrtw==",
+      "version": "123.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.1.tgz",
+      "integrity": "sha512-YQUIP/zdlzDIRCZNCv6rEVDSY4RAxo/tDL0OiGPPuai+z8unRNqJr/9V6XTBypVFyDheXNalKt9QxEqdMPuLAQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -2071,9 +2071,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -5785,9 +5785,9 @@
       }
     },
     "chromedriver": {
-      "version": "123.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.0.tgz",
-      "integrity": "sha512-OE9mpxXwbFy5LncAisqXm1aEzuLPtEMORIxyYIn9uT7N8rquJWyoip6w9Rytub3o2gnynW9+PFOTPVTldaYrtw==",
+      "version": "123.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-123.0.1.tgz",
+      "integrity": "sha512-YQUIP/zdlzDIRCZNCv6rEVDSY4RAxo/tDL0OiGPPuai+z8unRNqJr/9V6XTBypVFyDheXNalKt9QxEqdMPuLAQ==",
       "dev": true,
       "requires": {
         "@testim/chrome-version": "^1.1.4",
@@ -6392,9 +6392,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
     "form-data": {