🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #21175: Added translation for comment tag (by @yogeshsuhagiya)
 - #21301: span tag for more swatches link (by @mageho)
 - #21265: Backend Module Manager disable icon fix. (by @speedy008)
 - #20971: Cast attribute ID to integer - Fixes #20969 (by @k4emic)


Fixed GitHub Issues:
 - #20969: Poor performance for some layered navigation queries (reported by @k4emic) has been fixed in #20971 by @k4emic in 2.3-develop branch
   Related commits:
     1. c5c5e41
     2. 77b0ae8

Author: magento-engcom-team

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php

@@ -74,6 +74,8 @@ public function __construct(
     }
 
     /**
+     * Build select for attribute search
+     *
      * @param Select $select
      * @param AbstractAttribute $attribute
      * @param int $currentScope
@@ -101,7 +103,7 @@ public function build(Select $select, AbstractAttribute $attribute, int $current
             $subSelect = $select;
             $subSelect->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
                 ->distinct()
-                ->where('main_table.attribute_id = ?', $attribute->getAttributeId())
+                ->where('main_table.attribute_id = ?', (int) $attribute->getAttributeId())
                 ->where('main_table.store_id = ? ', $currentScopeId);
             if ($this->isAddStockFilter()) {
                 $subSelect = $this->applyStockConditionToSelect->execute($subSelect);
@@ -116,6 +118,8 @@ public function build(Select $select, AbstractAttribute $attribute, int $current
     }
 
     /**
+     * Is add stock filter
+     *
      * @return bool
      */
     private function isAddStockFilter()

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

@@ -10,7 +10,7 @@
         <section id="sales">
             <group id="msrp" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Minimum Advertised Price</label>
-                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Enable MAP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>

app/code/Magento/Msrp/i18n/en_US.csv

@@ -13,6 +13,7 @@ Price,Price
 "Add to Cart","Add to Cart"
 "Minimum Advertised Price","Minimum Advertised Price"
 "Enable MAP","Enable MAP"
+"<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
 "Display Actual Price","Display Actual Price"
 "Default Popup Text Message","Default Popup Text Message"
 "Default ""What's This"" Text Message","Default ""What's This"" Text Message"

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -511,7 +511,7 @@ define([
 
                 // Add more button
                 if (moreLimit === countAttributes++) {
-                    html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
+                    html += '<a href="#" class="' + moreClass + '"><span>' + moreText + '</span></a>';
                 }
 
                 id = this.id;