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

Author: engcom-Echo

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

@@ -440,6 +440,7 @@ public function prepareCollection(\Magento\Framework\Data\Collection $collection
         $attributeGridCollection = $this->attributeGridCollectionFactory->create();
         $gridCollection = $attributeGridCollection->setItems($collection->getItems());
         $this->setCollection($gridCollection);
+
         return $collection;
     }
 }

app/code/Magento/ImportExport/Model/ResourceModel/Export/AttributeGridCollection.php

@@ -14,6 +14,7 @@
  */
 class AttributeGridCollection extends Collection
 {
+    private const FILTERED_FLAG_NAME = 'agc_filtered';
 
     /**
      * Adding item to collection
@@ -32,8 +33,6 @@ public function setItems(array $items): self
 
     /**
      * @inheritDoc
-     *
-     * @return int
      */
     public function getSize(): int
     {
@@ -42,10 +41,6 @@ public function getSize(): int
 
     /**
      * @inheritDoc
-     *
-     * @param string $field
-     * @param array|int|string $condition
-     * @return $this
      */
     public function addFieldToFilter($field, $condition)
     {
@@ -59,28 +54,48 @@ public function addFieldToFilter($field, $condition)
 
     /**
      * @inheritDoc
+     */
+    public function load($printQuery = false, $logQuery = false)
+    {
+        $this->filterCollection();
+        $this->sortCollectionByAttributeCode();
+
+        return $this;
+    }
+
+    /**
+     * Add filters to collection
      *
-     * @param false $printQuery
-     * @param false $logQuery
      * @return $this
      */
-    public function load($printQuery = false, $logQuery = false)
+    private function filterCollection()
     {
-        if (!$this->getFlag('isFilter') && !empty($this->_filters)) {
+        if (!$this->getFlag(self::FILTERED_FLAG_NAME) && !empty($this->_filters)) {
             foreach ($this->_filters as $filter) {
                 foreach ($this->_items as $item) {
                     $field = $item->getData($filter->getData('field')) ?? '';
                     if (stripos($field, $filter->getData('value')) === false) {
                         $this->removeItemByKey($item->getId());
                     }
                 }
-                $this->setFlag('isFilter', true);
             }
+            $this->setFlag(self::FILTERED_FLAG_NAME, true);
         }
 
+        return $this;
+    }
+
+    /**
+     * Sort collection by attribute code
+     *
+     * @return $this
+     */
+    private function sortCollectionByAttributeCode()
+    {
         $sortOrder = $this->_orders['attribute_code'];
         uasort($this->_items, function ($a, $b) use ($sortOrder) {
             $cmp = strnatcmp($a->getData('attribute_code'), $b->getData('attribute_code'));
+
             return $sortOrder === self::SORT_ORDER_ASC ? $cmp : -$cmp;
         });