#243

- fixes unsorted array comparison
AtlasOfLivingAustralia · Apr 16, 2024 · a180af4 · a180af4
1 parent acd85b5
commit a180af4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -297,6 +297,21 @@ function orEmptyArray(v) {
  };
 
  parser.functions.deepEquals = function(value1, value2) {
+ // Sort arrays in nested objects to ensure that lodash compares arrays correctly
+ function sortArraysInObject(obj) {
+ if (Array.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;
+ }
+
+ sortArraysInObject(value1);
+ sortArraysInObject(value2);
  return _.isEqual(value1, value2);
  };
 

diff --git a/src/test/js/spec/ExpressionSpec.js b/src/test/js/spec/ExpressionSpec.js
@@ -124,4 +124,27 @@ describe("Expression Spec", function () {
 
  });
 
+ it("Should be able to compare two unsorted arrays", function() {
+ var data = {
+ a: [1, 2, 3],
+ b: [3, 2, 1]
+ };
+ var result = ecodata.forms.expressionEvaluator.evaluateBoolean("deepEquals(a, b)", data);
+ expect(result).toEqual(true);
+
+ data = {
+ a: {c: [1, 2, 3]},
+ b: {c: [3, 2, 1]}
+ };
+ var result = ecodata.forms.expressionEvaluator.evaluateBoolean("deepEquals(a, b)", data);
+ expect(result).toEqual(true);
+
+ data = {
+ a: {c: [1, 2]},
+ b: {c: [3, 2, 1]}
+ };
+ var result = ecodata.forms.expressionEvaluator.evaluateBoolean("deepEquals(a, b)", data);
+ expect(result).toEqual(false);
+ })
+
 });