MC-5184: Missing validation message when uploading big image

Add ImageMaxFileSizeDesktop

Author: danmooney2

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

@@ -13,6 +13,10 @@
 
 /**
  * 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
 {
@@ -21,21 +25,36 @@ class MaxFileSize implements ProviderInterface
      */
     private $fileSize;
 
+    /**
+     * @var int
+     */
+    private $staticFileSize;
+
     /**
      * @param Size $fileSize
+     * @param int $staticFileSize
      */
-    public function __construct(Size $fileSize)
-    {
+    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 => $this->fileSize->getMaxFileSize()
+            $itemName => $maxFileSize
         ];
     }
 }

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

@@ -536,4 +536,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="object">Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader\MaxFileSize</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="object">Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader\MaxFileSize</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="object">Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Uploader\MaxFileSize</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>