ACP2E-748: Layered navigation filters don't work when "show out of stock" is enabled

Author: pradeep1819

app/code/Magento/Catalog/Model/OutOfStock.php

@@ -1343,5 +1343,4 @@
             </argument>
         </arguments>
     </type>
-    <preference for="Magento\Catalog\Model\OutOfStockInterface" type="Magento\Catalog\Model\OutOfStock" />
 </config>

app/code/Magento/Catalog/Model/OutOfStockInterface.php

@@ -21,7 +21,4 @@
             <argument name="catalogLayer" xsi:type="object">Magento\Catalog\Model\Layer\Search</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
-        <plugin name="out_of_stock_sorting" type="Magento\InventoryCatalogSearch\Plugin\Model\ResourceModel\Fulltext\CollectionPlugin"/>
-    </type>
 </config>

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

@@ -148,7 +148,6 @@
             <argument name="fieldsProviders" xsi:type="array">
                 <item name="categories" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy</item>
                 <item name="prices" xsi:type="object">Magento\Elasticsearch\Model\Adapter\BatchDataMapper\PriceFieldsProvider</item>
-                <item name="isOutOfStock" xsi:type="object">Magento\InventoryElasticsearch\Model\Adapter\BatchDataMapper\IsOutOfStockFieldsProvider</item>
             </argument>
         </arguments>
     </virtualType>
@@ -370,7 +369,6 @@
                 <item name="price" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
                 <item name="categoryName" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
                 <item name="position" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-                <item name="isOutOfStock" xsi:type="object">\Magento\InventoryElasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\IsOutOfStock</item>
                 <item name="default" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver</item>
             </argument>
         </arguments>
@@ -383,7 +381,6 @@
                 <item name="price" xsi:type="object" sortOrder="30">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
                 <item name="categoryName" xsi:type="object" sortOrder="40">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
                 <item name="position" xsi:type="object" sortOrder="50">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-                <item name="isOutOfStock" xsi:type="object" sortOrder="150">\Magento\InventoryElasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\IsOutOfStock</item>
                 <item name="default" xsi:type="object" sortOrder="100">elasticsearch5FieldNameDefaultResolver</item>
             </argument>
         </arguments>
@@ -575,7 +572,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicField">
-        <plugin name="dynamicFieldPlugin" type="Magento\InventoryElasticsearch\Plugin\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\DynamicFieldPlugin"/>
-    </type>
 </config>

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

@@ -139,7 +139,6 @@
                 <item name="price" xsi:type="object" sortOrder="30">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Price</item>
                 <item name="categoryName" xsi:type="object" sortOrder="40">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CategoryName</item>
                 <item name="position" xsi:type="object" sortOrder="50">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\Position</item>
-                <item name="isOutOfStock" xsi:type="object" sortOrder="150">\Magento\InventoryElasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\IsOutOfStock</item>
                 <item name="default" xsi:type="object" sortOrder="100">Magento\Elasticsearch7\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver</item>
             </argument>
         </arguments>