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

 - Fixed the CR comments.

Author: devarul

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

@@ -86,10 +86,7 @@ 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->getData('config/dateFormat')
-                        );
+                        $value['from'] = $this->wrappedComponent->convertDateFormat($value['from']);
                     }
                     $this->applyFilterByType(
                         'gteq',
@@ -99,10 +96,7 @@ protected function applyFilter()
 
                 if (isset($value['to'])) {
                     if (!$this->getData('config/options/showsTime') && $this->getData('config/dateFormat')) {
-                        $value['to'] = $this->wrappedComponent->convertDateFormat(
-                            $value['to'],
-                            $this->getData('config/dateFormat')
-                        );
+                        $value['to'] = $this->wrappedComponent->convertDateFormat($value['to']);
                     }
                     $this->applyFilterByType(
                         'lteq',

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

@@ -17,8 +17,6 @@ class Date extends AbstractDataType
 {
     public const NAME = 'date';
 
-    public const CUSTOM_DATE_FORMAT = 'Y-MM-dd';
-
     /**
      * Current locale
      *
@@ -151,20 +149,19 @@ public function convertDatetime(string $date, bool $setUtcTimezone = true): ?\Da
      * 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
+    public function convertDateFormat(string $date): String
     {
-        if ($dateFormat === self::CUSTOM_DATE_FORMAT) {
-            $date = $this->localeDate->formatDateTime(
-                $date,
-                null,
-                null,
-                $this->getLocale(),
-                date_default_timezone_get()
-            );
+        if ($this->getLocale() === 'en_GB' && str_contains($date, '/')) {
+            $date = \DateTime::createFromFormat('d/m/Y', $date);
         }
-        return $date;
+        return $this->localeDate->formatDateTime(
+            $date,
+            null,
+            null,
+            $this->getLocale(),
+            date_default_timezone_get()
+        );
     }
 }

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

@@ -180,7 +180,6 @@ public function testConvertDatetime(string $dateStr, bool $setUtcTimeZone, strin
     public function testConvertDateFormat()
     {
         $dateStr = '2023-10-11';
-        $dateFormat = 'Y-MM-dd';
         $this->date = $this->objectManagerHelper->getObject(
             Date::class,
             [
@@ -195,7 +194,7 @@ public function testConvertDateFormat()
             ->willReturn(date_format(date_create($dateStr), 'm/d/Y'));
         $this->assertEquals(
             date_format(date_create($dateStr), 'm/d/Y'),
-            $this->date->convertDateFormat($dateStr, $dateFormat)
+            $this->date->convertDateFormat($dateStr)
         );
     }