prevent arrayfields from tripping circular reference error since they…

… can be size 0
ambischof · Nov 2, 2020 · 0a280ab · 0a280ab
1 parent 37966a7
commit 0a280ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/js/fields/basic/ArrayField.js b/src/js/fields/basic/ArrayField.js
@@ -658,7 +658,12 @@
                         {
                             if (schemaReferenceId)
                             {
-                                if ((fieldChain[i].schema.id === schemaReferenceId) || (fieldChain[i].schema.id === "#" + schemaReferenceId))
+                                if (fieldChain[i]["type"] === "array")
+                                {
+                                    // we found an array field, which is ok to be circular since it can be size 0
+                                    refCount = 0;
+                                }
+                                else if ((fieldChain[i].schema.id === schemaReferenceId) || (fieldChain[i].schema.id === "#" + schemaReferenceId))
                                 {
                                     refCount++;
                                 }

diff --git a/src/js/fields/basic/ObjectField.js b/src/js/fields/basic/ObjectField.js
@@ -544,7 +544,12 @@
                         {
                             if (fieldChain[i].schema)
                             {
-                                if ( (fieldChain[i].schema.id === propertyReferenceId) || (fieldChain[i].schema.id === "#" + propertyReferenceId))
+                                if (fieldChain[i]["type"] === "array")
+                                {
+                                    // we found an array field, which is ok to be circular since it can be size 0
+                                    refCount = 0;
+                                }
+                                else if ( (fieldChain[i].schema.id === propertyReferenceId) || (fieldChain[i].schema.id === "#" + propertyReferenceId))
                                 {
                                     refCount++;
                                 }