(mvc model) apply defaults on new array items

src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php

@@ -103,12 +103,15 @@ class ArrayField extends BaseField
         );
 
         foreach ($new_record as $key => $node) {
+            // initialize field with new internal id and defined default value
             $node->setInternalReference($container_node->__reference.".".$key);
+            $node->applyDefault();
             $container_node->addChildNode($key, $node);
-            // make sure we have a UUID on repeating child items
-            $container_node->setAttributeValue("uuid", $this->generateUUID());
         }
 
+        // make sure we have a UUID on repeating child items
+        $container_node->setAttributeValue("uuid", $this->generateUUID());
+
         // add node to this object
         $this->addChildNode(null, $container_node);
 

src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php

@@ -55,6 +55,11 @@ abstract class BaseField
      */
     protected $internalValue = "";
 
+    /**
+     * @var null|string node default value
+     */
+    protected $internalDefaultValue = "";
+
     /**
      * @var string direct reference to this field in the model object
      */
@@ -426,6 +431,15 @@ abstract class BaseField
     public function setDefault($value)
     {
         $this->internalValue = $value;
+        $this->internalDefaultValue = $value;
+    }
+
+    /**
+     * (re)Apply default value
+     */
+    public function applyDefault()
+    {
+        $this->internalValue = $this->internalDefaultValue;
     }
 
     /**