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

 - Changed the solution based on CR comments.

Author: devarul

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

@@ -84,13 +84,25 @@ protected function applyFilter()
 
             if (is_array($value)) {
                 if (isset($value['from'])) {
+                    if (!$this->getData('config/options/showsTime')) {
+                        $value['from'] = $this->wrappedComponent->convertDateFormat(
+                            $value['from'],
+                            $this->getData('config/dateFormat')
+                        );
+                    }
                     $this->applyFilterByType(
                         'gteq',
                         $this->convertDatetime((string)$value['from'])
                     );
                 }
 
                 if (isset($value['to'])) {
+                    if (!$this->getData('config/options/showsTime')) {
+                        $value['to'] = $this->wrappedComponent->convertDateFormat(
+                            $value['to'],
+                            $this->getData('config/dateFormat')
+                        );
+                    }
                     $this->applyFilterByType(
                         'lteq',
                         $this->convertDatetime((string)$value['to'], 23, 59, 59)

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

@@ -17,6 +17,8 @@ class Date extends AbstractDataType
 {
     public const NAME = 'date';
 
+    public const CUSTOM_DATE_FORMAT = 'Y-MM-dd';
+
     /**
      * Current locale
      *
@@ -111,15 +113,6 @@ public function getComponentName()
     public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
-            if (str_contains($date, '-')) {
-                $date = $this->localeDate->formatDateTime(
-                    $date,
-                    null,
-                    null,
-                    $this->getLocale(),
-                    date_default_timezone_get()
-                );
-            }
             $dateObj = $this->localeDate->date($date, $this->getLocale(), false, false);
             $dateObj->setTime($hour, $minute, $second);
             //convert store date to default date in UTC timezone without DST
@@ -153,4 +146,25 @@ public function convertDatetime(string $date, bool $setUtcTimezone = true): ?\Da
             return null;
         }
     }
+
+    /**
+     * Convert given date to specific date format based on locale
+     *
+     * @param string $date
+     * @param string $dateFormat
+     * @return String
+     */
+    public function convertDateFormat(string $date, string $dateFormat): String
+    {
+        if ($dateFormat === self::CUSTOM_DATE_FORMAT) {
+            $date = $this->localeDate->formatDateTime(
+                $date,
+                null,
+                null,
+                $this->getLocale(),
+                date_default_timezone_get()
+            );
+        }
+        return $date;
+    }
 }

app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Ui\Test\Unit\Component\Form\Element\DataType;
 
-use Exception;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -172,38 +171,6 @@ public function testConvertDatetime(string $dateStr, bool $setUtcTimeZone, strin
         );
     }
 
-    /**
-     * Test to Convert given date to default (UTC) timezone
-     *
-     * @throws Exception
-     */
-    public function testConvertDate()
-    {
-        $dateStr = '2023-10-11';
-        $this->date = $this->objectManagerHelper->getObject(
-            Date::class,
-            [
-                'localeDate' => $this->localeDateMock,
-            ]
-        );
-        $this->localeDateMock->expects($this->once())
-            ->method('formatDateTime')
-            ->with(
-                $dateStr
-            )
-            ->willReturn(date_format(date_create($dateStr), 'd/m/Y'));
-        $this->localeDateMock->expects($this->once())
-            ->method('date')
-            ->willReturn(
-                (new \DateTime('now', new \DateTimeZone('UTC')))
-                    ->setTimestamp(strtotime($dateStr))
-            );
-        $this->assertEquals(
-            $dateStr,
-            $this->date->convertDate($dateStr)->format('Y-m-d')
-        );
-    }
-
     /**
      * @return array
      */