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,8 +34,8 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $export->filterAttributeCollection(
-                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                $attrFilterBlock->prepareCollection(
+                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
                 );
                 return $resultLayout;
             } catch (\Exception $e) {

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

@@ -7,6 +7,8 @@
 
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\ImportExport\Model\ResourceModel\Export\AttributeGridCollectionFactory;
 
 /**
  * Export filter block
@@ -40,20 +42,29 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
         'updated_at' => \Magento\ImportExport\Model\Export::FILTER_TYPE_DATE,
     ];
 
+    /**
+     * @var AttributeGridCollectionFactory
+     */
+    private $attributeGridCollectionFactory;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
      * @param array $data
+     * @param AttributeGridCollectionFactory|null $attributeGridCollectionFactory
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\ImportExport\Helper\Data $importExportData,
-        array $data = []
+        array $data = [],
+        ?AttributeGridCollectionFactory $attributeGridCollectionFactory = null
     ) {
         $this->_importExportData = $importExportData;
         parent::__construct($context, $backendHelper, $data);
+        $this->attributeGridCollectionFactory = $attributeGridCollectionFactory
+            ?: ObjectManager::getInstance()->get(AttributeGridCollectionFactory::class);
     }
 
     /**
@@ -422,33 +433,13 @@ public function getRowUrl($row)
      * Prepare collection by setting page number, sorting etc..
      *
      * @param \Magento\Framework\Data\Collection $collection
-     * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
+     * @return \Magento\Framework\Data\Collection|\Magento\ImportExport\Model\ResourceModel\Export\AttributeGridCollection
      */
     public function prepareCollection(\Magento\Framework\Data\Collection $collection)
     {
-        $this->setCollection($collection);
+        $attributeGridCollection = $this->attributeGridCollectionFactory->create();
+        $gridCollection = $attributeGridCollection->setItems($collection->getItems());
+        $this->setCollection($gridCollection);
         return $this->getCollection();
     }
-
-    /**
-     * @inheritDoc
-     *
-     * @param \Magento\Backend\Block\Widget\Grid\Column $column
-     * @return $this
-     */
-    protected function _addColumnFilterToCollection($column)
-    {
-        $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 $this;
-    }
 }

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

@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Model\ResourceModel\Export;
+
+use Magento\Framework\Data\Collection;
+
+/**
+ * Class AttributeGridCollection
+ */
+class AttributeGridCollection extends Collection
+{
+
+    /**
+     * Adding item to collection
+     *
+     * @param array $items
+     * @return $this
+     */
+    public function setItems(array $items): self
+    {
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @return int
+     */
+    public function getSize(): int
+    {
+        return count($this->getItems());
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $field
+     * @param array|int|string $condition
+     * @return $this
+     */
+    public function addFieldToFilter($field, $condition)
+    {
+        $value = (string)$condition['like'];
+        $value = trim(trim($value, "'"), "%");
+        foreach ($this->getItems() as $item) {
+            if (stripos($item->getData($field), $value) === false) {
+                $this->removeItemByKey($item->getId());
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add select order
+     *
+     * @param  string $field
+     * @param  string $direction
+     * @return $this
+     */
+    public function setOrder($field, $direction = self::SORT_ORDER_DESC)
+    {
+        $this->_orderField = $field;
+        uasort($this->_items, [$this, 'compareAttributes']);
+
+        if ($direction == self::SORT_ORDER_DESC) {
+            $this->_items = array_reverse($this->_items, true);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Compare two collection items
+     *
+     * @param \Magento\Framework\DataObject $a
+     * @param \Magento\Framework\DataObject $b
+     * @return int
+     */
+    public function compareAttributes(\Magento\Framework\DataObject $a, \Magento\Framework\DataObject $b)
+    {
+        return strnatcmp($a->getData($this->_orderField), $b->getData($this->_orderField));
+    }
+}