Merge branch '2.4-develop' into fix-for-issue-39640

Author: engcom-Dash

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -16,6 +16,7 @@
             <severity value="MINOR"/>
             <testCaseId value="MC-36869"/>
             <group value="pr_exclude"/>
+            <group value="all_bundled_only"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -59,8 +59,10 @@
         <see selector="{{CatalogSection.successMessage}}" userInput="Configuration changes will be applied by consumer soon." stepKey="seeCustomSuccessMessage"/>
 
         <!--Trigger the Consumer-->
-        <magentoCLI stepKey="EnableAsyncConfig" command="queue:consumers:start saveConfigProcessor --max-messages=1"/>
-
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="EnableAsyncConfig">
+            <argument name="consumerName" value="saveConfigProcessor"/>
+            <argument name="maxMessages" value="1"/>
+        </actionGroup>
         <!--Open Configuration Page Again-->
         <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPageAgain" />
         <waitForPageLoad stepKey="waitForPageLoadAgain"/>

app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml

@@ -1,14 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/************************************************************************
+ *
+ *  ADOBE CONFIDENTIAL
+ *  ___________________
+ *
+ *  Copyright 2025 Adobe
+ *  All Rights Reserved.
+ *
+ *  NOTICE: All information contained herein is, and remains
+ *  the property of Adobe and its suppliers, if any. The intellectual
+ *  and technical concepts contained herein are proprietary to Adobe
+ *  and its suppliers and are protected by all applicable intellectual
+ *  property laws, including trade secret and copyright laws.
+ *  Dissemination of this information or reproduction of this material
+ *  is strictly forbidden unless prior written permission is obtained
+ *  from Adobe.
+ *  ************************************************************************
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="backendDataOne" type="backend">
         <data key="backendConfigName">data</data>
     </entity>
+    <entity name="WebdriverKey">
+        <data key="tabKey">[\Facebook\WebDriver\WebDriverKeys::TAB]</data>
+    </entity>
 </entities>

app/code/Magento/CacheInvalidate/Test/Mftf/Test/AdminValidateEAVTypesAndAttributesConfigurationTest.xml

@@ -20,9 +20,8 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminGoToCacheManagementPageActionGroup" stepKey="goToCacheManagementPage"/>
-            <!--Verify Cache Type EAV Types And Attributes Is ENABLED -->
-            <waitForText selector="{{AdminMessagesSection.assertCacheManagementStatusEnabled('EAV')}}" userInput="ENABLED" stepKey="verifyCacheTypeEAVTypesAndAttributesIsENABLED"/>
+            <comment userInput="BIC Workaround" stepKey="goToCacheManagementPage" />
+            <magentoCLI command="cache:enable" arguments="eav" stepKey="verifyCacheTypeEAVTypesAndAttributesIsENABLED"/>
         </before>
         <after>
             <!--Delete created entity -->

app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php

@@ -1,16 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class for retrieval of all product images
@@ -40,11 +42,13 @@ class Image
     /**
      * @param Generator $generator
      * @param ResourceConnection $resourceConnection
+     * @param MetadataPool $metadataPool
      * @param int $batchSize
      */
     public function __construct(
         Generator $generator,
         ResourceConnection $resourceConnection,
+        private readonly MetadataPool $metadataPool,
         $batchSize = 100
     ) {
         $this->batchQueryGenerator = $generator;
@@ -152,16 +156,32 @@ private function getVisibleImagesSelect(): Select
      */
     private function getUsedImagesSelect(): Select
     {
-        return $this->connection->select()->distinct()
+        $productMetadata =  $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $productMetadata->getLinkField();
+        $identifierField = $productMetadata->getIdentifierField();
+
+        $select = $this->connection->select()->distinct()
             ->from(
                 ['images' => $this->resourceConnection->getTableName(Gallery::GALLERY_TABLE)],
                 'value as filepath'
             )->joinInner(
                 ['image_value' => $this->resourceConnection->getTableName(Gallery::GALLERY_VALUE_TABLE)],
                 'images.value_id = image_value.value_id',
                 []
+            )->joinInner(
+                ['products' => $this->resourceConnection->getTableName('catalog_product_entity')],
+                "image_value.$linkField = products.$linkField",
+                []
+            )->joinInner(
+                ['websites' => $this->resourceConnection->getTableName('catalog_product_website')],
+                "products.$identifierField = websites.product_id",
+                ['GROUP_CONCAT(websites.website_id SEPARATOR \',\') AS website_ids']
             )->where(
                 'images.disabled = 0 AND image_value.disabled = 0'
+            )->group(
+                'websites.product_id'
             );
+
+        return $select;
     }
 }