MC-5373: Product couldn't be pulled to CMS Page when it was assigned to a specific website

Remove temporal coupling by immediately setting store_id first on collection if it is available

Author: danmooney2

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

@@ -7,33 +7,25 @@
 
 namespace Magento\PageBuilder\Ui\DataProvider\Product;
 
+use Magento\Store\Model\Store;
+
 /**
  * PageBuilder ProductCollection class for allowing store-agnostic collections
  */
 class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
-    /**
-     * Set store id even if it's equal to \Magento\Store\Model\Store::DEFAULT_STORE_ID to prevent inadvertent resetting
-     * {@inheritdoc}
-     */
-    public function addStoreFilter($store = null)
-    {
-        if ($store !== null && (int) $store === 0) {
-            $this->setStoreId($store);
-        }
-
-        return parent::addStoreFilter($store);
-    }
-
     /**
      * Prevent usage of catalog index for querying visibility, as it relies on a specific store id.
-     * Visibility condition is to be added later in plugin.
-     * @see \Magento\PageBuilder\Plugin\CatalogWidget\Block\Product\ProductsListPlugin::aroundGetData
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * {@inheritdoc}
      */
     public function setVisibility($visibility)
     {
+        if ($this->getStoreId() === Store::DEFAULT_STORE_ID) {
+            $this->addAttributeToFilter('visibility', $visibility);
+        } else {
+            parent::setVisibility($visibility);
+        }
+
         return $this;
     }
 
@@ -43,7 +35,7 @@ public function setVisibility($visibility)
      */
     protected function _productLimitationJoinPrice()
     {
-        $this->_productLimitationFilters->setUsePriceIndex(false);
+        $this->_productLimitationFilters->setUsePriceIndex($this->getStoreId() !== Store::DEFAULT_STORE_ID);
         return $this->_productLimitationPrice(false);
     }
 }

app/code/Magento/PageBuilder/Ui/DataProvider/Product/ProductCollection.php

@@ -556,7 +556,6 @@
         </arguments>
     </virtualType>
     <type name="Magento\CatalogWidget\Block\Product\ProductsList">
-        <plugin name="website_agnostic" type="Magento\PageBuilder\Plugin\CatalogWidget\Block\Product\ProductsListPlugin"/>
         <arguments>
             <argument name="productCollectionFactory" xsi:type="object">pageBuilderProductCollectionFactory</argument>
         </arguments>