MC-34444: Configurable shows simple products which are no longer assigned to the website

Author: zakdma

app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Filter configurable options by current store plugin.
+ */
+class UsedProductsWebsiteFilter
+{
+    /**
+     * Filter configurable options not assigned to current website.
+     *
+     * @param Configurable $subject
+     * @param ProductInterface $product
+     * @param array|null $requiredAttributeIds
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetUsedProducts(
+        Configurable $subject,
+        ProductInterface $product,
+        array $requiredAttributeIds = null
+    ): void {
+        $subject->setStoreFilter($product->getStore(), $product);
+    }
+}

app/code/Magento/ConfigurableProduct/etc/frontend/di.xml

@@ -12,5 +12,6 @@
     </type>
     <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
         <plugin name="used_products_cache" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
+        <plugin name="used_products_website_filter" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsWebsiteFilter" />
     </type>
 </config>

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php

@@ -19,6 +19,8 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -126,6 +128,29 @@ public function testGetAllowProducts(): void
         }
     }
 
+    /**
+     * Verify configurable option not assigned to current website won't be visible.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_two_websites.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     *
+     * @return void
+     */
+    public function testGetAllowProductsNonDefaultWebsite(): void
+    {
+        // Set current website to non-default.
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore('fixture_second_store');
+        // Un-assign simple product from non-default website.
+        $simple = $this->productRepository->get('simple_Option_1');
+        $simple->setWebsiteIds([1]);
+        $this->productRepository->save($simple);
+        // Verify only one configurable option will be visible.
+        $products = $this->block->getAllowProducts();
+        $this->assertEquals(1, count($products));
+    }
+
     /**
      * @return void
      */