MC-33499: Grid Filter not working for Scheduled Export when selected any kind of Entity Type

Author: engcom-Echo

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -1548,10 +1548,12 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
     {
         $validTypes = array_keys($this->_productTypeModels);
         $validTypes = array_combine($validTypes, $validTypes);
-        if (!empty($this->_bannedAttributes)) {
-            $collection->addFieldToFilter('attribute_code', ['nin' => $this->_bannedAttributes]);
-        }
+
         foreach (parent::filterAttributeCollection($collection) as $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->_bannedAttributes)) {
+                $collection->removeItemByKey($attribute->getId());
+                continue;
+            }
             $attrApplyTo = $attribute->getApplyTo();
             $attrApplyTo = array_combine($attrApplyTo, $attrApplyTo);
             $attrApplyTo = $attrApplyTo ? array_intersect_key($attrApplyTo, $validTypes) : $validTypes;
@@ -1565,7 +1567,7 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
                 }
             } else {
                 // remove attributes of not-supported product types
-                $collection->addFieldToFilter('attribute_code',['nin' => $attribute->getAttributeCode()]);
+                $collection->removeItemByKey($attribute->getId());
             }
         }
         return $collection;

app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php

@@ -430,14 +430,25 @@ public function prepareCollection(\Magento\Framework\Data\Collection $collection
         return $this->getCollection();
     }
 
-    protected function _prepareCollection()
+    /**
+     * @inheritDoc
+     *
+     * @param \Magento\Backend\Block\Widget\Grid\Column $column
+     * @return $this
+     */
+    protected function _addColumnFilterToCollection($column)
     {
-        if ($this->getCollection()) {
-            if ($this->getCollection()->isLoaded()) {
-                $this->getCollection()->clear();
+        $collection = $this->getCollection();
+        $field = $column->getFilterIndex() ?? $column->getIndex();
+        $condition = $column->getFilter()->getData('value');
+        if ($field && isset($condition)) {
+            foreach ($this->getCollection() as $attribute) {
+                if (stripos($attribute->getData($field), $condition) === false) {
+                    $collection->removeItemByKey($attribute->getId());
+                }
             }
         }
 
-        return parent::_prepareCollection();
+        return $this;
     }
 }

app/code/Magento/ImportExport/Model/Export/AbstractEntity.php

@@ -378,8 +378,11 @@ public function getAttributeCollection()
      */
     public function filterAttributeCollection(\Magento\Framework\Data\Collection $collection)
     {
-        if (!empty($this->_disabledAttributes)) {
-            $collection->addFieldToFilter('attribute_code', ['nin' => $this->_disabledAttributes]);
+        /** @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
+        foreach ($collection as $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->_disabledAttributes)) {
+                $collection->removeItemByKey($attribute->getId());
+            }
         }
 
         return $collection;

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php

@@ -389,8 +389,12 @@ abstract public function export();
      */
     public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection)
     {
-        if (!empty($this->_disabledAttrs)) {
-            $collection->addFieldToFilter('attribute_code', ['nin' => $this->_disabledAttrs]);
+        $collection->load();
+
+        foreach ($collection as $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->_disabledAttrs)) {
+                $collection->removeItemByKey($attribute->getId());
+            }
         }
         return $collection;
     }