Merge branch '2' into 3.0

Author: github-actions[bot]

client/dist/js/bundle.js

@@ -426,6 +426,7 @@ class UploadField extends Component {
       url: this.props.data.endpoints.createFile.url,
       method: this.props.data.endpoints.createFile.method,
       paramName: 'Upload',
+      parallelUploads: this.props.data.maxParallelUploads,
       maxFiles,
       maxFilesize,
       thumbnailWidth: CONSTANTS.SMALL_THUMBNAIL_WIDTH,

client/src/components/UploadField/UploadField.js

@@ -74,6 +74,11 @@ class UploadField extends FormField implements FileHandleField
      */
     protected $allowedMaxFileNumber = null;
 
+    /**
+     * Set the max amount of parallel uploads
+     */
+    protected int $maxParallelUploads = 2;
+
     protected $inputType = 'file';
 
     protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_CUSTOM;
@@ -117,6 +122,7 @@ public function getSchemaDataDefaults()
 
         $defaults['data']['maxFilesize'] = $this->getAllowedMaxFileSize() / 1024 / 1024;
         $defaults['data']['maxFiles'] = $this->getAllowedMaxFileNumber();
+        $defaults['data']['maxParallelUploads'] = $this->getMaxParallelUploads();
         $defaults['data']['multi'] = $this->getIsMultiUpload();
         $defaults['data']['parentid'] = $this->getFolderID();
         $defaults['data']['canUpload'] = $this->getUploadEnabled();
@@ -361,6 +367,23 @@ public function setUploadEnabled($uploadEnabled)
         return $this;
     }
 
+    /**
+     * Get the amount of max parallel uploads
+     */
+    public function getMaxParallelUploads(): int
+    {
+        return $this->maxParallelUploads;
+    }
+
+    /**
+     * Set amount of max parallel uploads
+     */
+    public function setMaxParallelUploads(int $maxParallelUploads): static
+    {
+        $this->maxParallelUploads = $maxParallelUploads;
+        return $this;
+    }
+
     /**
      * Check if attaching files is enabled
      *

code/Forms/UploadField.php

@@ -142,6 +142,7 @@ public function testSchemaInRenderedField(): void
                 'parentid' => 0,
                 'canUpload' => true,
                 'canAttach' => true,
+                'maxParallelUploads' => 2
             ],
         ];
         $state = [