Merge branch 'magento-commerce:develop' into extjs-jira-ac-9320

Author: nishant04412

app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist

@@ -0,0 +1,8 @@
+ImageAddImageContentTypeToCMSPageTest
+ImageAddImageIntoPageBuilderStageTest
+ImageInvalidFileTypeValidationTest
+ImageRemoveImageFromStageTest
+PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory
+PageBuilderDeleteTemplate
+PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut
+CanAddVideoToColumnTest

app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed

@@ -0,0 +1,40 @@
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageContentTypeToCMSPageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageIntoPageBuilderStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageInvalidFileTypeValidationTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageRemoveImageFromStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderDeleteTemplate from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut from module(s): magento/module-banner-page-builder, magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CanAddVideoToColumnTest from module(s): magento/module-page-builder

app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php

@@ -14,6 +14,9 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogWidget\Model\Rule;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\Combine;
@@ -53,25 +56,41 @@ class ProductTotals
      */
     private $categoryRepository;
 
+    /**
+     * @var MetadataPool
+     */
+    private MetadataPool $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resource;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Builder $sqlBuilder
      * @param Rule $rule
      * @param Conditions $conditionsHelper
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param MetadataPool|null $metadataPool
+     * @param ResourceConnection|null $resource
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
         Builder $sqlBuilder,
         Rule $rule,
         Conditions $conditionsHelper,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ?MetadataPool $metadataPool = null,
+        ?ResourceConnection $resource = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->sqlBuilder = $sqlBuilder;
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->categoryRepository = $categoryRepository;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->resource = $resource ?: ObjectManager::getInstance()->get(ResourceConnection::class);
     }
 
     /**
@@ -159,37 +178,85 @@ private function getProductCollection(string $conditions, bool $usePriceIndex =
         return $collection;
     }
 
+    /**
+     * Get parent products that don't have stand-alone properties (e.g. price or special price)
+     *
+     * @param Collection $collection
+     * @return Collection|null
+     * @throws \Exception
+     */
+    private function getParentProductsCollection(Collection $collection): ?Collection
+    {
+        $parentProducts = $this->productCollectionFactory->create();
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $connection = $this->resource->getConnection();
+        $productIds = $connection->fetchCol(
+            $connection
+                ->select()
+                ->from(['e' => $collection->getTable('catalog_product_entity')], ['link_table.parent_id'])
+                ->joinInner(
+                    ['link_table' => $collection->getTable('catalog_product_super_link')],
+                    'link_table.product_id = e.' . $linkField,
+                    []
+                )
+                ->where('link_table.product_id IN (?)', $collection->getAllIds())
+        );
+        if ($productIds) {
+            $parentProducts->addIdFilter($productIds);
+            return $parentProducts;
+        }
+
+        return null;
+    }
+
     /**
      * Retrieve count of all enabled products
      *
      * @param string $conditions
      * @return int number of enabled products
+     * @throws LocalizedException
+     * @throws \Exception
      */
     private function getEnabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, true);
         $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($collection->getSize() && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
      * Retrieve count of all disabled products
      *
      * @param string $conditions
      * @return int number of disabled products
+     * @throws \Exception
      */
     private function getDisabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, false);
         $collection->addAttributeToFilter('status', Status::STATUS_DISABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_DISABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
      * Retrieve count of all not visible individually products
      *
      * @param string $conditions
      * @return int number of products not visible individually
+     * @throws \Exception
      */
     private function getNotVisibleCount(string $conditions): int
     {
@@ -202,7 +269,20 @@ private function getNotVisibleCount(string $conditions): int
                 Visibility::VISIBILITY_IN_SEARCH
             ]
         );
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $parentProducts->addAttributeToFilter(
+                'visibility',
+                [
+                    Visibility::VISIBILITY_NOT_VISIBLE,
+                    Visibility::VISIBILITY_IN_SEARCH
+                ]
+            );
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml

@@ -159,7 +159,7 @@
             <argument name="property" value="PageBuilderProductsSortByNewestTop"/>
         </actionGroup>
         <actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel5">
-            <argument name="productsTotals" value="of 1 total"/>
+            <argument name="productsTotals" value="of 7 total"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel5"/>
         <actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage5">

app/code/Magento/PageBuilder/Test/Mftf/test-dependency-allowlist

@@ -0,0 +1,17 @@
+AdminMediaGalleryFolderData
+ImageMetadata
+AdminOpenStandaloneMediaGalleryActionGroup
+AdminMediaGalleryFolderSelectActionGroup
+AdminMediaGalleryOpenNewFolderFormActionGroup
+AdminMediaGalleryCreateNewFolderActionGroup
+AdminEnhancedMediaGalleryUploadImageActionGroup
+AdminMediaGalleryFolderDeleteActionGroup
+AdminMediaGalleryClickImageInGridActionGroup
+AdminMediaGalleryClickAddSelectedActionGroup
+AdminEnhancedMediaGalleryViewImageDetails
+AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup
+CliMediaGalleryEnhancedEnableActionGroup
+BaseConfigurableProduct
+visualSwatchAttribute
+AddVisualSwatchToProductWithStorefrontConfigActionGroup
+AdminEnhancedMediaGalleryMassActionSection