🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #22069: [Backport] Add argument to show filter text in URL rewrite grid after click on back button (by @amol2jcommerce)
 - #22039: [Backport] Added custom_options file upload directory to .gitignore. (by @amol2jcommerce)
 - #21813: [Backport] #21734 Error in JS validation rule (by @kisroman)
 - #21118: [Backport] Fixed issue 20790 wishlist icons (by @amol2jcommerce)
 - #21892: [Backport] Advanced Search layout not proper (by @amol2jcommerce)
 - #19488: [Backport] Fix DHL Quotes for Domestic Shipments when Content Type is set to Non-Document (by @gwharton)


Fixed GitHub Issues:
 - #21805: Filter in url rewrites table in backend isn't being remembered (reported by @hostep) has been fixed in #22069 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. d6c12e5
     2. 646200a
     3. 2a39dd3
     4. c126f39

 - #21734: Error in JS validation rule (reported by @avgust1111) has been fixed in #21813 by @kisroman in 2.2-develop branch
   Related commits:
     1. 6bb24ef
     2. 0add8b7

 - #20790: Luma theme My Wish List page Edit and Remove icons consistency design improvement  (reported by @abrarpathan19) has been fixed in #21118 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. b24df57
     2. a353566
     3. abc1d24
     4. 330d202

 - #20809: Advanced Search layout not proper (reported by @amol2jcommerce) has been fixed in #21892 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 67b732c
     2. af75c5a

 - #19485: DHL Shipping Quotes fail for Domestic Shipments when Content Mode is "Non Documents" (reported by @gwharton) has been fixed in #19488 by @gwharton in 2.2-develop branch
   Related commits:
     1. e6b279b
     2. ce7b560
     3. 49e26db
     4. a497c95
     5. 5557b9d

Author: magento-engcom-team

.gitignore

@@ -49,6 +49,8 @@ atlassian*
 /pub/media/import/*
 !/pub/media/import/.htaccess
 /pub/media/logo/*
+/pub/media/custom_options/*
+!/pub/media/custom_options/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

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

@@ -56,7 +56,7 @@
                 <field id="grid_per_page_values" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </field>
                 <field id="grid_per_page" translate="label comment" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on Grid Default Value</label>
@@ -66,7 +66,7 @@
                 <field id="list_per_page_values" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Allowed Values</label>
                     <comment>Comma-separated.</comment>
-                    <validate>validate-per-page-value-list</validate>
+                    <validate>validate-per-page-value-list required-entry</validate>
                 </field>
                 <field id="list_per_page" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Products per Page on List Default Value</label>

app/code/Magento/Dhl/Model/Carrier.php

@@ -1968,8 +1968,6 @@ protected function isDutiable($origCountryId, $destCountryId)
     {
         $this->_checkDomesticStatus($origCountryId, $destCountryId);
 
-        return
-            self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
-            || !$this->_isDomestic;
+        return !$this->_isDomestic;
     }
 }