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,28 @@ 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($export->getEntityAttributeCollection())
+                    $attrFilterBlock->prepareCollection($collection)
                 );
                 return $resultLayout;
             } catch (\Exception $e) {