🔃 [Magento Community Engineering] Community Contributions - 2.4-devel…

…op latest changes

Accepted Community Pull Requests:
 - #30057: #1833: Add ability to disable renditions functionality to stores configuration (by @joweecaquicla)
 - #29794: Fix issue product name in minicart render wrong with special characters (by @mrtuvn)
 - #30034: #1830: Stabilize AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest and AdminMediaGalleryCatalogUiUsedInCategoryFilterTest (by @joweecaquicla)
 - #29814: Fix of Asynchronous opetations status issue (by @nuzil)
 - #29972: Update zip_codes.xml (by @marcostrama)
 - #28818: Improvement PageLayout Config Builder. Added save in cache config files. (by @Knase)
 - #29081: Fix for wildcard section reload being broken by section-config refacor (by @complexthings)
 - #29080: UPS Shipment Tracking: Show "Delivered On" only when package has actually been delivered (by @danbtl)
 - #28164: Prevent side effect on category objects store_id and url_key on save (by @schmengler)
 - #27980: Fix SQL query quoting/casting when type is passed to where function (by @tmotyl)
 - #30095: Added configuration for Stale Issue bot (by @sdzhepa)


Fixed GitHub Issues:
 - #29075: Minicart product name - not covered cases (reported by @Januszpl) has been fixed in #29794 by @mrtuvn in 2.4-develop branch
   Related commits:
     1. 9df9db2

 - #29718: Wrong handling some of asynchronous bulk operations and related mysql queue messages in Magento 2.4.0 (reported by @Neos2007) has been fixed in #29814 by @nuzil in 2.4-develop branch
   Related commits:
     1. 09b63c7
     2. 2450b14
     3. 77d62ef
     4. 4da31ea
     5. a0e65ed
     6. 5c87afe

 - #29984: [Issue] Update zip_codes.xml (reported by @m2-assistant[bot]) has been fixed in #29972 by @marcostrama in 2.4-develop branch
   Related commits:
     1. 1472740
     2. 16b8d6a
     3. 65b5ee4
     4. c336ccc
     5. 2f94846

 - #29546: [Issue] Improvement PageLayout Config Builder. Added save in cache config files. (reported by @m2-assistant[bot]) has been fixed in #28818 by @Knase in 2.4-develop branch
   Related commits:
     1. f2468b5
     2. cc2c5b9
     3. 26b41af
     4. eeecdf7
     5. 2ac6e0c
     6. 276cb1c

 - #28154: [Backward compatibility] Customer section load with one section causes an error (reported by @zhartaunik) has been fixed in #29081 by @complexthings in 2.4-develop branch
   Related commits:
     1. 4f10b5d
     2. 1505a36
     3. ff99146
     4. 8047497
     5. dd862a2
     6. cdfc681
     7. c2e254c
     8. c490073
     9. 176013f
     10. 2922c1c
     11. f7da23e
     12. 3b397e3
     13. 6f9a274
     14. 5de71f6
     15. fd4a2c7
     16. fae1c5c

 - #28428: Customer data not retrieved after executing a custom login controller (reported by @pitbulk) has been fixed in #29081 by @complexthings in 2.4-develop branch
   Related commits:
     1. 4f10b5d
     2. 1505a36
     3. ff99146
     4. 8047497
     5. dd862a2
     6. cdfc681
     7. c2e254c
     8. c490073
     9. 176013f
     10. 2922c1c
     11. f7da23e
     12. 3b397e3
     13. 6f9a274
     14. 5de71f6
     15. fd4a2c7
     16. fae1c5c

 - #29659: [Issue] UPS Shipment Tracking: Show "Delivered On" only when package has actually been delivered (reported by @m2-assistant[bot]) has been fixed in #29080 by @danbtl in 2.4-develop branch
   Related commits:
     1. 5031159
     2. 123a4f0

 - #29585: [Issue] Prevent side effect on category objects store_id and url_key on save (reported by @m2-assistant[bot]) has been fixed in #28164 by @schmengler in 2.4-develop branch
   Related commits:
     1. 7bd5e25
     2. 8bcd2fa
     3. 87c5c60
     4. 31c5963
     5. c051134
     6. 6083a7c

 - #29590: [Issue] Fix SQL query quoting/casting when type is passed to where function (reported by @m2-assistant[bot]) has been fixed in #27980 by @tmotyl in 2.4-develop branch
   Related commits:
     1. 0118d48
     2. b8dd6b3
     3. 6c41578
     4. 4860f31
     5. a103b64

.github/stale.yml

@@ -0,0 +1,68 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+ daysUntilStale: 76
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 14
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - "Priority: P0"
+  - "Priority: P1"
+  - "Priority: P2"
+  - "Progress: dev in progress"
+  - "Progress: PR in progress"
+  - "Progress: done"
+  - "B2B: GraphQL"   
+  - "Progress: PR Created"
+  - "PAP"
+  - "Project: Login as Customer"
+  - "Project: GraphQL"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: "stale issue"
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

app/code/Magento/AsynchronousOperations/etc/db_schema.xml

@@ -34,7 +34,7 @@
     <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Operation ID"/>
-        <column xsi:type="int" name="operation_key" padding="10" unsigned="true" nullable="false"
+        <column xsi:type="int" name="operation_key" padding="10" unsigned="true" nullable="true"
                 comment="Operation Key"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <column xsi:type="varchar" name="topic_name" nullable="true" length="255"

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php

@@ -54,6 +54,11 @@ class CategoryUrlRewriteGenerator
      */
     private $mergeDataProviderPrototype;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @var bool
      */
@@ -124,10 +129,11 @@ protected function generateForGlobalScope(
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $categoryId = $category->getId();
         foreach ($category->getStoreIds() as $storeId) {
-            $category->setStoreId($storeId);
             if (!$this->isGlobalScope($storeId)
                 && $this->isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreUrls)
             ) {
+                $category = clone $category; // prevent undesired side effects on original object
+                $category->setStoreId($storeId);
                 $this->updateCategoryUrlForStore($storeId, $category);
                 $mergeDataProvider->merge($this->generateForSpecificStoreView($storeId, $category, $rootCategoryId));
             }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php

@@ -158,6 +158,7 @@ public function testGenerationForGlobalScope()
             ],
             $this->categoryUrlRewriteGenerator->generate($this->category, false, $categoryId)
         );
+        $this->assertEquals(0, $this->category->getStoreId(), 'Store ID should not have been modified');
     }
 
     /**

app/code/Magento/Checkout/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml

@@ -21,7 +21,7 @@
                             </item>
                             <item name="children" xsi:type="array">
                                 <item name="item.renderer" xsi:type="array">
-                                    <item name="component" xsi:type="string">uiComponent</item>
+                                    <item name="component" xsi:type="string">Magento_Checkout/js/view/cart-item-renderer</item>
                                     <item name="config" xsi:type="array">
                                         <item name="displayArea" xsi:type="string">defaultRenderer</item>
                                         <item name="template" xsi:type="string">Magento_Checkout/minicart/item/default</item>

app/code/Magento/Checkout/view/frontend/web/js/view/cart-item-renderer.js

@@ -0,0 +1,34 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent'
+], function (Component) {
+    'use strict';
+
+    return Component.extend({
+        /**
+         * Prepare the product name value to be rendered as HTML
+         *
+         * @param {String} productName
+         * @return {String}
+         */
+        getProductNameUnsanitizedHtml: function (productName) {
+            // product name has already escaped on backend
+            return productName;
+        },
+
+        /**
+         * Prepare the given option value to be rendered as HTML
+         *
+         * @param {String} optionValue
+         * @return {String}
+         */
+        getOptionValueUnsanitizedHtml: function (optionValue) {
+            // option value has already escaped on backend
+            return optionValue;
+        }
+    });
+});

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -24,10 +24,10 @@
         <div class="product-item-details">
             <strong class="product-item-name">
                 <!-- ko if: product_has_url -->
-                <a data-bind="attr: {href: product_url}, html: product_name"></a>
+                <a data-bind="attr: {href: product_url}, html: $parent.getProductNameUnsanitizedHtml(product_name)"></a>
                 <!-- /ko -->
                 <!-- ko ifnot: product_has_url -->
-                    <!-- ko text: product_name --><!-- /ko -->
+                    <span data-bind="html: $parent.getProductNameUnsanitizedHtml(product_name)"></span>
                 <!-- /ko -->
             </strong>
 
@@ -42,10 +42,10 @@
                         <dt class="label"><!-- ko text: option.label --><!-- /ko --></dt>
                         <dd class="values">
                             <!-- ko if: Array.isArray(option.value) -->
-                                <span data-bind="html: option.value.join('<br>')"></span>
+                                <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value.join('<br/>'))"></span>
                             <!-- /ko -->
                             <!-- ko if: (!Array.isArray(option.value) && ['file', 'html'].includes(option.option_type)) -->
-                                <span data-bind="html: option.value"></span>
+                                <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value)"></span>
                             <!-- /ko -->
                             <!-- ko if: (!Array.isArray(option.value) && !['file', 'html'].includes(option.option_type)) -->
                             <span data-bind="text: option.value"></span>

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -78,7 +78,7 @@ define([
             var parameters;
 
             sectionNames = sectionConfig.filterClientSideSections(sectionNames);
-            parameters = _.isArray(sectionNames) ? {
+            parameters = _.isArray(sectionNames) && sectionNames.indexOf('*') < 0 ? {
                 sections: sectionNames.join(',')
             } : [];
             parameters['force_new_section_timestamp'] = forceNewSectionTimestamp;

app/code/Magento/Directory/etc/zip_codes.xml

@@ -64,7 +64,7 @@
     </zip>
     <zip countryCode="BR">
         <codes>
-            <code id="pattern_1" active="true" example="12345">^[0-9]{5}$</code>
+            <code id="pattern_1" active="true" example="12345678">^[0-9]{8}$</code>
             <code id="pattern_2" active="true" example="12345-678">^[0-9]{5}\-[0-9]{3}$</code>
         </codes>
     </zip>

app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml

@@ -27,7 +27,7 @@
             <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
                 <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
             </actionGroup>
-            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
             <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
@@ -37,6 +37,8 @@
             <argument name="category" value="$$category$$"/>
         </actionGroup>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGridToDefaultView"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
@@ -50,6 +52,8 @@
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderAgain"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterAgain"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGridToDefaultViewAgain"/>
         <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
             <argument name="filterName" value="Used in Categories"/>

app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml

@@ -29,6 +29,8 @@
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetProductGridToDefaultView"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
@@ -42,6 +44,10 @@
         <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
+            <argument name="name" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
@@ -51,6 +57,8 @@
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
         <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetProductGridToDefaultView"/>
 
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
@@ -64,15 +72,14 @@
         <deleteData createDataKey="product" stepKey="deleteProduct"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
 
-        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
         <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
             <argument name="imageName" value="{{ImageMetadata.title}}"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
-
    </test>
 </tests>

app/code/Magento/MediaGalleryRenditions/Model/Config.php

@@ -18,7 +18,8 @@
 class Config
 {
     private const TABLE_CORE_CONFIG_DATA = 'core_config_data';
-    private const XML_PATH_ENABLED = 'system/media_gallery/enabled';
+    private const XML_PATH_MEDIA_GALLERY_ENABLED = 'system/media_gallery/enabled';
+    private const XML_PATH_ENABLED = 'system/media_gallery_renditions/enabled';
     private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
     private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
 
@@ -49,6 +50,16 @@ public function __construct(
      *
      * @return bool
      */
+    public function isMediaGalleryEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_MEDIA_GALLERY_ENABLED);
+    }
+
+    /**
+     * Should the renditions be inserted in the content instead of original image
+     *
+     * @return bool
+     */
     public function isEnabled(): bool
     {
         return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED);

app/code/Magento/MediaGalleryRenditions/Plugin/SetRenditionPath.php

@@ -91,7 +91,7 @@ public function beforeExecute(
             $storeId
         ];
 
-        if (!$this->config->isEnabled()) {
+        if (!$this->config->isEnabled() || !$this->config->isMediaGalleryEnabled()) {
             return $arguments;
         }
 

app/code/Magento/MediaGalleryRenditions/Plugin/UpdateRenditionsOnConfigChange.php

@@ -8,13 +8,15 @@
 namespace Magento\MediaGalleryRenditions\Plugin;
 
 use Magento\Framework\App\Config\Value;
+use Magento\MediaGalleryRenditions\Model\Config;
 use Magento\MediaGalleryRenditions\Model\Queue\ScheduleRenditionsUpdate;
 
 /**
  * Update renditions if corresponding configuration changes
  */
 class UpdateRenditionsOnConfigChange
 {
+    private const XML_PATH_MEDIA_GALLERY_RENDITIONS_ENABLE_PATH = 'system/media_gallery_renditions/enabled';
     private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
     private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
 
@@ -24,10 +26,17 @@ class UpdateRenditionsOnConfigChange
     private $scheduleRenditionsUpdate;
 
     /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param Config $config
      * @param ScheduleRenditionsUpdate $scheduleRenditionsUpdate
      */
-    public function __construct(ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
+    public function __construct(Config $config, ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
     {
+        $this->config = $config;
         $this->scheduleRenditionsUpdate = $scheduleRenditionsUpdate;
     }
 
@@ -41,7 +50,13 @@ public function __construct(ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
      */
     public function afterSave(Value $config, Value $result): Value
     {
-        if ($this->isRenditionsValue($result) && $result->isValueChanged()) {
+        if ($this->isRenditionsEnabled($result)) {
+            $this->scheduleRenditionsUpdate->execute();
+
+            return $result;
+        }
+
+        if ($this->config->isEnabled() && $this->isRenditionsValue($result) && $result->isValueChanged()) {
             $this->scheduleRenditionsUpdate->execute();
         }
 
@@ -59,4 +74,17 @@ private function isRenditionsValue(Value $value): bool
         return $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH
             || $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH;
     }
+
+    /**
+     * Determine if media gallery renditions is enabled based on configuration value
+     *
+     * @param Value $value
+     * @return bool
+     */
+    private function isRenditionsEnabled(Value $value): bool
+    {
+        return $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_ENABLE_PATH
+            && $value->isValueChanged()
+            && $value->getValue();
+    }
 }

app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml

@@ -10,14 +10,18 @@
         <section id="system">
             <group id="media_gallery_renditions" translate="label" type="text" sortOrder="1010" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Media Gallery Image Optimization</label>
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enable Image Optimization</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <comment>Resize images to improve performance and decrease the file size. When you use an image from Media Gallery on the storefront, the smaller image is generated and placed instead of the original.
                     Changing these settings will update all generated images.</comment>
-                <field id="width" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="width" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Maximum Width</label>
                     <validate>validate-zero-or-greater validate-digits</validate>
                     <comment>Enter the maximum width of an image in pixels.</comment>
                 </field>
-                <field id="height" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="height" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Maximum Height</label>
                     <validate>validate-zero-or-greater validate-digits</validate>
                     <comment>Enter the maximum height of an image in pixels.</comment>