ACP2E-1992: Configurable on sale products not visible in products carousel

- configurable products are now visible even if their children aren't

Author: aplapana

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -324,15 +324,26 @@ protected function _beforeToHtml()
      */
     public function createCollection()
     {
-        /** @var $collection Collection */
-        $collection = $this->productCollectionFactory->create();
+        $collection = $this->getBaseCollection();
+
+        $collection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
+
+        return $collection;
+    }
 
+    /**
+     * Prepare and return product collection without visibility filter
+     *
+     * @return Collection
+     * @throws LocalizedException
+     */
+    public function getBaseCollection(): Collection
+    {
+        $collection = $this->productCollectionFactory->create();
         if ($this->getData('store_id') !== null) {
             $collection->setStoreId($this->getData('store_id'));
         }
 
-        $collection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
-
         /**
          * Change sorting attribute to entity_id because created_at can be the same for products fastly created
          * one by one and sorting by created_at is indeterministic in this case.

app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml

@@ -15,7 +15,7 @@ use Magento\Framework\App\Action\Action;
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())): ?>
+<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->count())): ?>
     <?php
     $type = 'widget-product-grid';
 

app/code/Magento/ConfigurableProduct/Plugin/CatalogWidget/Block/Product/ProductsListPlugin.php

@@ -21,22 +21,22 @@ class ProductsListPlugin
     /**
      * @var CollectionFactory
      */
-    protected CollectionFactory $productCollectionFactory;
+    private CollectionFactory $productCollectionFactory;
 
     /**
      * @var Visibility
      */
-    protected Visibility $catalogProductVisibility;
+    private Visibility $catalogProductVisibility;
 
     /**
      * @var ResourceConnection
      */
-    protected ResourceConnection $resource;
+    private ResourceConnection $resource;
 
     /**
      * @var MetadataPool
      */
-    protected MetadataPool $metadataPool;
+    private MetadataPool $metadataPool;
 
     /**
      * @param CollectionFactory $productCollectionFactory
@@ -67,7 +67,10 @@ public function __construct(
      */
     public function afterCreateCollection(ProductsList $subject, Collection $result): Collection
     {
-        if ($result->count()) {
+        $notVisibleCollection = $subject->getBaseCollection();
+        $searchProducts = array_merge($result->getAllIds(), $notVisibleCollection->getAllIds());
+
+        if (!empty($searchProducts)) {
             $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
                 ->getLinkField();
             $connection = $this->resource->getConnection();
@@ -80,7 +83,7 @@ public function afterCreateCollection(ProductsList $subject, Collection $result)
                     'link_table.product_id = e.' . $linkField,
                     []
                 )
-                ->where('link_table.product_id IN (?)', $result->getAllIds())
+                ->where('link_table.product_id IN (?)', $searchProducts)
             );
 
             $configurableProductCollection = $this->productCollectionFactory->create();

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/CatalogWidget/Block/Product/ProductListPluginTest.php

@@ -75,8 +75,11 @@ protected function setUp(): void
     public function testAfterCreateCollectionNoCount(): void
     {
         $subject = $this->createMock(ProductsList::class);
+        $baseCollection = $this->createMock(Collection::class);
+        $baseCollection->expects($this->once())->method('getAllIds')->willReturn([]);
+        $subject->expects($this->once())->method('getBaseCollection')->willReturn($baseCollection);
         $result = $this->createMock(Collection::class);
-        $result->expects($this->once())->method('count')->willReturn(0);
+        $result->expects($this->once())->method('getAllIds')->willReturn([]);
 
         $this->assertSame($result, $this->plugin->afterCreateCollection($subject, $result));
     }
@@ -88,9 +91,12 @@ public function testAfterCreateCollectionNoCount(): void
     public function testAfterCreateCollectionSuccess(): void
     {
         $linkField = 'entity_id';
+        $baseCollection = $this->createMock(Collection::class);
+        $baseCollection->expects($this->once())->method('getAllIds')->willReturn([2]);
         $subject = $this->createMock(ProductsList::class);
+        $subject->expects($this->once())->method('getBaseCollection')->willReturn($baseCollection);
+
         $result = $this->createMock(Collection::class);
-        $result->expects($this->once())->method('count')->willReturn(1);
         $result->expects($this->once())->method('getAllIds')->willReturn([1]);
         $result->expects($this->once())->method('addItem');
         $entity = $this->createMock(EntityMetadataInterface::class);
@@ -112,7 +118,7 @@ public function testAfterCreateCollectionSuccess(): void
                 'link_table.product_id = e.' . $linkField,
                 []
             )->willReturn($select);
-        $select->expects($this->once())->method('where')->with('link_table.product_id IN (?)', [1]);
+        $select->expects($this->once())->method('where')->with('link_table.product_id IN (?)', [1, 2]);
         $connection = $this->createMock(AdapterInterface::class);
         $connection->expects($this->once())->method('select')->willReturn($select);
         $connection->expects($this->once())->method('fetchCol')->willReturn([2]);