Merge branch 'master' into feature/cognito

AtlasOfLivingAustralia · May 10, 2024 · 3abb1c3 · 3abb1c3
2 parents e5a6433 + 4d39719
commit 3abb1c3
Show file tree

Hide file tree

Showing 7 changed files with 859 additions and 45 deletions.
diff --git a/grails-app/assets/javascripts/forms-knockout-bindings.js b/grails-app/assets/javascripts/forms-knockout-bindings.js
@@ -1259,9 +1259,7 @@
         'init': function (element, valueAccessor, allBindings, viewModel, bindingContext) {
             var dataModelItem = valueAccessor();
             var behaviours = dataModelItem.get('behaviour');
-            for (var i = 0; i < behaviours.length; i++) {
-                var behaviour = behaviours[i];
-
+            behaviours && behaviours.forEach(function(behaviour) {
                 if (behaviour.type == 'pre_populate') {
                     var config = behaviour.config;
                     var dataLoaderContext = dataModelItem.context;
@@ -1274,6 +1272,8 @@
                             propTarget.loadData(value);
                         } else if (_.isFunction(propTarget.load)) {
                             propTarget.load(value);
+                        } else if (propTarget && propTarget.listParent && _.isFunction(propTarget.listParent["load" + propTarget.listName])) {
+                            propTarget.listParent["load" + propTarget.listName](value);
                         } else if (ko.isObservable(propTarget)) {
                             propTarget(value);
                         } else {
@@ -1324,8 +1324,7 @@
                         }); // This is a computed rather than a pureComputed as it has a side effect.
                     });
                 }
-            }
-
+            });
         }
     };
 

diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -296,7 +296,27 @@ function orEmptyArray(v) {
             return _.findWhere(list, obj);
         };
 
-        parser.functions.deepEquals = function(value1, value2) {
+        parser.functions.deepEquals = function(value1, value2, isSortArray) {
+            // set isSortArray to true if content of array is important and not the order i.e. [1,2,3] == [3,2,1]
+            isSortArray = isSortArray || false;
+            // Sort arrays in nested objects to ensure that lodash compares arrays correctly
+            function sortArraysInObject(obj) {
+                if (_.isArray(obj)) {
+                    obj.sort();
+                } else if (typeof obj === 'object' && obj !== null) {
+                    for (var key in obj) {
+                        sortArraysInObject(obj[key]); // Recursively call to sort arrays in nested objects
+                    }
+                }
+
+                return obj;
+            }
+
+            if (isSortArray) {
+                sortArraysInObject(value1);
+                sortArraysInObject(value2);
+            }
+
             return _.isEqual(value1, value2);
         };
 
@@ -1084,6 +1104,7 @@ function orEmptyArray(v) {
         var listName = context.listName;
         var modelName = context.outputModel.name;
 
+        self.listParent = context.parent;
         self.listName = listName;
         self.addRow = function (data) {
             var newItem = self.newItem(data, self.rowCount());

diff --git 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) {