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

Author: pradeep1819

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

@@ -12,6 +12,8 @@
 interface OutOfStockInterface
 {
     /**
+     * Check if, admin setting for automatic sorting is set to 'move out of stock to bottom'
+     *
      * @param Category $category
      * @param Collection $collection
      * @return bool

app/code/Magento/CatalogSearch/Plugin/Model/ResourceModel/Fulltext/CollectionPlugin.php

@@ -22,6 +22,6 @@
         </arguments>
     </virtualType>
     <type name="Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection">
-        <plugin name="is_salable_filter" type="Magento\CatalogSearch\Plugin\Model\ResourceModel\Fulltext\CollectionPlugin"/>
+        <plugin name="out_of_stock_sorting" type="Magento\InventoryCatalogSearch\Plugin\Model\ResourceModel\Fulltext\CollectionPlugin"/>
     </type>
 </config>

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

@@ -156,16 +156,6 @@ public function getFields(array $context = []): array
             ];
         }
 
-        $isOutOfStockAttribute = $this->attributeAdapterProvider->getByAttributeCode('is_out_of_stock');
-        $groupStockItemKey = $this->fieldNameResolver->getFieldName(
-            $isOutOfStockAttribute,
-            $ctx
-        );
-        $allAttributes[$groupStockItemKey] = [
-            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_INT),
-            'store' => true
-        ];
-
         return $allAttributes;
     }
 }