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

Author: engcom-Echo

app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -34,29 +34,9 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $filter = (isset($data['filter']) && $data['filter']) ? $data['filter'] : null;
-                $collection = $export->getEntityAttributeCollection();
-                if (!is_null($filter)) {
-                    $filters = array_reduce(
-                        explode('&', base64_decode($filter)),
-                        function ($filter, $item) {
-                            list($key, $value) = explode('=', $item, 2);
-                            $filter[$key] = $value;
-                            return $filter;
-                        },
-                        []
-                    );
-                    foreach ($filters as $field => $value) {
-                        foreach ($collection as $attribute) {
-                            if (stripos($attribute->getData($field), $value) === false) {
-                                $collection->removeItemByKey($attribute->getId());
-                            }
-                        }
-                    }
-                }
                 $export->filterAttributeCollection(
-                    $attrFilterBlock->prepareCollection($collection)
-                );
+                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                )->clear();
                 return $resultLayout;
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());

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

@@ -1548,12 +1548,8 @@ 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]);
         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;
@@ -1567,7 +1563,7 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
                 }
             } else {
                 // remove attributes of not-supported product types
-                $collection->removeItemByKey($attribute->getId());
+                $collection->addFieldToFilter('attribute_code',['nin' => $attribute->getAttributeCode()]);
             }
         }
         return $collection;

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

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