MC-19672: Simple product disappearing in the configurable grid after qty set to 0

Author: dhorytskyi

app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsCache.php renamed to app/code/Magento/ConfigurableProduct/Model/Plugin/UsedProductsCache.php

@@ -5,14 +5,15 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
+namespace Magento\ConfigurableProduct\Model\Plugin;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -24,6 +25,11 @@
  */
 class UsedProductsCache
 {
+    /**
+     * @var AppState
+     */
+    private $appState;
+
     /**
      * @var MetadataPool
      */
@@ -50,19 +56,22 @@ class UsedProductsCache
     private $customerSession;
 
     /**
+     * @param AppState $appState
      * @param MetadataPool $metadataPool
      * @param FrontendInterface $cache
      * @param SerializerInterface $serializer
      * @param ProductInterfaceFactory $productFactory
      * @param Session $customerSession
      */
     public function __construct(
+        AppState $appState,
         MetadataPool $metadataPool,
         FrontendInterface $cache,
         SerializerInterface $serializer,
         ProductInterfaceFactory $productFactory,
         Session $customerSession
     ) {
+        $this->appState = $appState;
         $this->metadataPool = $metadataPool;
         $this->cache = $cache;
         $this->serializer = $serializer;
@@ -111,6 +120,7 @@ private function getCacheKey($product, $requiredAttributeIds = null): string
             $product->getData($metadata->getLinkField()),
             $product->getStoreId(),
             $this->customerSession->getCustomerGroupId(),
+            $this->appState->getAreaCode(),
         ];
         if ($requiredAttributeIds !== null) {
             sort($requiredAttributeIds);

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

@@ -262,12 +262,15 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache">
+    <type name="Magento\ConfigurableProduct\Model\Plugin\UsedProductsCache">
         <arguments>
             <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>
         </arguments>
         <arguments>
             <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Json</argument>
         </arguments>
     </type>
+    <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
+        <plugin name="used_products_cache" type="Magento\ConfigurableProduct\Model\Plugin\UsedProductsCache" />
+    </type>
 </config>

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

@@ -10,7 +10,4 @@
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
-    <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
-        <plugin name="used_products_cache" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
-    </type>
 </config>