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,7 +1548,9 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
     {
         $validTypes = array_keys($this->_productTypeModels);
         $validTypes = array_combine($validTypes, $validTypes);
-        $collection->addFieldToFilter('attribute_code', ['nin' => $this->_bannedAttributes]);
+        if (!empty($this->_bannedAttributes)) {
+            $collection->addFieldToFilter('attribute_code', ['nin' => $this->_bannedAttributes]);
+        }
         foreach (parent::filterAttributeCollection($collection) as $attribute) {
             $attrApplyTo = $attribute->getApplyTo();
             $attrApplyTo = array_combine($attrApplyTo, $attrApplyTo);

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

@@ -429,4 +429,15 @@ public function prepareCollection(\Magento\Framework\Data\Collection $collection
         $this->setCollection($collection);
         return $this->getCollection();
     }
+
+    protected function _prepareCollection()
+    {
+        if ($this->getCollection()) {
+            if ($this->getCollection()->isLoaded()) {
+                $this->getCollection()->clear();
+            }
+        }
+
+        return parent::_prepareCollection();
+    }
 }

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

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

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

@@ -389,7 +389,10 @@ abstract public function export();
      */
     public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection $collection)
     {
-        return $collection->addFieldToFilter('attribute_code', ['nin' => $this->_disabledAttrs]);
+        if (!empty($this->_disabledAttrs)) {
+            $collection->addFieldToFilter('attribute_code', ['nin' => $this->_disabledAttrs]);
+        }
+        return $collection;
     }
 
     /**