ACP2E-2127: Date filter is not working in admin grid.

 - Fixed the workaround solution.

Author: devarul

app/code/Magento/Ui/Component/Filters/Type/Date.php

@@ -16,19 +16,19 @@
  */
 class Date extends AbstractFilter
 {
-    public const NAME = 'filter_date';
+    const NAME = 'filter_date';
 
-    public const COMPONENT = 'date';
+    const COMPONENT = 'date';
 
     /**
-     * Wrapped component for date grid filter UI Component
+     * Wrapped component
      *
      * @var DataTypeDate
      */
     protected $wrappedComponent;
 
     /**
-     * Date format for date grid filter UI Component
+     * Date format
      *
      * @var string
      * @since 100.1.2
@@ -72,7 +72,6 @@ public function prepare()
      * Apply filter
      *
      * @return void
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function applyFilter()
     {
@@ -85,19 +84,13 @@ protected function applyFilter()
 
             if (is_array($value)) {
                 if (isset($value['from'])) {
-                    if (!$this->getData('config/options/showsTime') && $this->getData('config/dateFormat')) {
-                        $value['from'] = $this->wrappedComponent->convertDateFormat($value['from']);
-                    }
                     $this->applyFilterByType(
                         'gteq',
                         $this->convertDatetime((string)$value['from'])
                     );
                 }
 
                 if (isset($value['to'])) {
-                    if (!$this->getData('config/options/showsTime') && $this->getData('config/dateFormat')) {
-                        $value['to'] = $this->wrappedComponent->convertDateFormat($value['to']);
-                    }
                     $this->applyFilterByType(
                         'lteq',
                         $this->convertDatetime((string)$value['to'], 23, 59, 59)

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -9,15 +9,13 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * UI component date type
  */
 class Date extends AbstractDataType
 {
-    public const NAME = 'date';
+    const NAME = 'date';
 
     /**
      * Current locale
@@ -27,7 +25,7 @@ class Date extends AbstractDataType
     protected $locale;
 
     /**
-     * Wrapped component for date type
+     * Wrapped component
      *
      * @var UiComponentInterface
      */
@@ -38,11 +36,6 @@ class Date extends AbstractDataType
      */
     private $localeDate;
 
-    /**
-     * @var DateFormatterFactory
-     */
-    private $dateFormatterFactory;
-
     /**
      * Constructor
      *
@@ -51,21 +44,17 @@ class Date extends AbstractDataType
      * @param ResolverInterface $localeResolver
      * @param array $components
      * @param array $data
-     * @param DateFormatterFactory|null $dateFormatterFactory
      */
     public function __construct(
         ContextInterface $context,
         TimezoneInterface $localeDate,
         ResolverInterface $localeResolver,
         array $components = [],
-        array $data = [],
-        ?DateFormatterFactory $dateFormatterFactory = null
+        array $data = []
     ) {
         $this->locale = $localeResolver->getLocale();
         $this->localeDate = $localeDate;
         parent::__construct($context, $components, $data);
-        $objectManager = ObjectManager::getInstance();
-        $this->dateFormatterFactory = $dateFormatterFactory ?? $objectManager->get(DateFormatterFactory::class);
     }
 
     /**
@@ -155,29 +144,4 @@ public function convertDatetime(string $date, bool $setUtcTimezone = true): ?\Da
             return null;
         }
     }
-
-    /**
-     * Convert given date to specific date format based on locale
-     *
-     * @param string $date
-     * @return String
-     */
-    public function convertDateFormat(string $date): String
-    {
-        $formatter = $this->dateFormatterFactory->create(
-            $this->getLocale(),
-            \IntlDateFormatter::SHORT,
-            \IntlDateFormatter::NONE,
-            date_default_timezone_get()
-        );
-        $formatter->setLenient(false);
-        if (!$formatter->parse($date)) {
-            $date = $formatter->formatObject(
-                new \DateTime($date),
-                $formatter->getPattern()
-            );
-        }
-        $formatter->setLenient(true);
-        return $date;
-    }
 }

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -196,7 +196,15 @@ public function date($date = null, $locale = null, $useTimezone = true, $include
                     $includeTime ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE,
                     $timezone
                 );
-                $date = $formatter->parse($date) ?: (new \DateTime($date))->getTimestamp();
+                $formatter->setLenient(false);
+                if (!$formatter->parse($date)) {
+                    $date = $formatter->formatObject(
+                        new \DateTime($date),
+                        $formatter->getPattern()
+                    );
+                }
+                $formatter->setLenient(true);
+                $date = $formatter->parse() ?: (new \DateTime($date))->getTimestamp();
                 break;
         }