Merge branch 'MC-5184' into cms-team-1-delivery

# Conflicts:
#	app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js

Author: davemacaulay

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader;
+
+use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
+use Magento\Framework\File\Size;
+
+/**
+ * Provides maximum file size for uploader
+ *
+ * Will provide the lower of the following two values:
+ * - upload_max_filesize from php.ini config
+ * - staticFileSize argument passed to constructor
+ */
+class MaxFileSize implements ProviderInterface
+{
+    /**
+     * @var Size
+     */
+    private $fileSize;
+
+    /**
+     * @var int
+     */
+    private $staticFileSize;
+
+    /**
+     * @param Size $fileSize
+     * @param int $staticFileSize
+     */
+    public function __construct(
+        Size $fileSize,
+        $staticFileSize = null
+    ) {
+        $this->fileSize = $fileSize;
+        $this->staticFileSize = $staticFileSize;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(string $itemName) : array
+    {
+        // dynamically set max file size based on the lower of php ini config and static value (if present)
+        $maxFileSize = min(array_filter([
+            $this->staticFileSize ?? 0,
+            $this->fileSize->getMaxFileSize()
+        ]));
+
+        return [
+            $itemName => $maxFileSize
+        ];
+    }
+}

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -537,4 +537,9 @@
             </argument>
         </arguments>
     </virtualType>
+    <virtualType name="ImageMaxFileSizeDesktop" type="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader\MaxFileSize">
+        <arguments>
+            <argument name="staticFileSize" xsi:type="number">4194304</argument>
+        </arguments>
+    </virtualType>
 </config>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml

@@ -284,7 +284,7 @@
             <item name="uploaderConfig" xsi:type="array">
                 <item name="isShowImageUploadInstructions" xsi:type="boolean">false</item>
                 <item name="isShowImageUploadOptions" xsi:type="boolean">true</item>
-                <item name="maxFileSize" xsi:type="string">4194304</item>
+                <item name="maxFileSize" xsi:type="object">ImageMaxFileSizeDesktop</item>
                 <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png</item>
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/element/image-uploader</item>
                 <item name="componentType" xsi:type="string">imageUploader</item>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/image.xml

@@ -78,7 +78,7 @@
         </appearances>
         <additional_data>
             <item name="uploaderConfig" xsi:type="array">
-                <item name="maxFileSize" xsi:type="string">4194304</item>
+                <item name="maxFileSize" xsi:type="object">ImageMaxFileSizeDesktop</item>
                 <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png</item>
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/element/image-uploader</item>
                 <item name="componentType" xsi:type="string">imageUploader</item>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml

@@ -284,7 +284,7 @@
             <item name="uploaderConfig" xsi:type="array">
                 <item name="isShowImageUploadInstructions" xsi:type="boolean">false</item>
                 <item name="isShowImageUploadOptions" xsi:type="boolean">true</item>
-                <item name="maxFileSize" xsi:type="string">4194304</item>
+                <item name="maxFileSize" xsi:type="object">ImageMaxFileSizeDesktop</item>
                 <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png</item>
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/element/image-uploader</item>
                 <item name="componentType" xsi:type="string">imageUploader</item>

docs/configurations/additional-configurations.md

@@ -25,7 +25,7 @@ Use `additional_data` in your `Vendor/ModuleName/view/adminhtml/pagebuilder/cont
 ``` xml
 <additional_data>
     <item name="uploaderConfig" xsi:type="array">
-        <item name="maxFileSize" xsi:type="string">4194304</item>
+        <item name="maxFileSize" xsi:type="object">ImageMaxFileSizeDesktop</item>
         <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png</item>
         <item name="component" xsi:type="string">Magento_PageBuilder/js/form/element/image-uploader</item>
         <item name="componentType" xsi:type="string">imageUploader</item>
@@ -112,4 +112,4 @@ this.uploader = new Uploader(
 );
 ```
 
-<!-- {% endraw %} -->
+<!-- {% endraw %} -->

docs/how-to/how-to-use-image-uploader.md

@@ -23,7 +23,7 @@ Use `additional_data` in your `<YourModule>/view/base/pagebuilder/content_type/<
             <item name="uploaderConfig" xsi:type="array">
                 <item name="isShowImageUploadInstructions" xsi:type="boolean">false</item>
                 <item name="isShowImageUploadOptions" xsi:type="boolean">true</item>
-                <item name="maxFileSize" xsi:type="string">4194304</item>
+                <item name="maxFileSize" xsi:type="object">ImageMaxFileSizeDesktop</item>
                 <item name="allowedExtensions" xsi:type="string">jpg jpeg gif png</item>
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/element/image-uploader</item>
                 <item name="componentType" xsi:type="string">imageUploader</item>