Merge remote-tracking branch 'magento-l3/ACP2E-2127' into Tier4-Kings-PR-11-08-2023

Author: Sarmistha

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

@@ -5,17 +5,20 @@
  */
 namespace Magento\Ui\Component\Form\Element\DataType;
 
+use Exception;
 use Magento\Framework\Locale\ResolverInterface;
 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
 {
-    const NAME = 'date';
+    public const NAME = 'date';
 
     /**
      * Current locale
@@ -25,7 +28,7 @@ class Date extends AbstractDataType
     protected $locale;
 
     /**
-     * Wrapped component
+     * Wrapped component for date type
      *
      * @var UiComponentInterface
      */
@@ -36,6 +39,11 @@ class Date extends AbstractDataType
      */
     private $localeDate;
 
+    /**
+     * @var DateFormatterFactory
+     */
+    private $dateFormatterFactory;
+
     /**
      * Constructor
      *
@@ -44,17 +52,21 @@ 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 = []
+        array $data = [],
+        ?DateFormatterFactory $dateFormatterFactory = null
     ) {
         $this->locale = $localeResolver->getLocale();
         $this->localeDate = $localeDate;
         parent::__construct($context, $components, $data);
+        $objectManager = ObjectManager::getInstance();
+        $this->dateFormatterFactory = $dateFormatterFactory ?? $objectManager->get(DateFormatterFactory::class);
     }
 
     /**
@@ -111,14 +123,15 @@ public function getComponentName()
     public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
     {
         try {
+            $date = $this->convertDateFormat($date);
             $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
             if ($setUtcTimeZone) {
                 $dateObj->setTimezone(new \DateTimeZone('UTC'));
             }
             return $dateObj;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return null;
         }
     }
@@ -144,4 +157,30 @@ 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
+     * @throws Exception
+     */
+    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()
+            );
+        }
+        return $date;
+    }
 }

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

@@ -7,7 +7,9 @@
 
 namespace Magento\Ui\Test\Unit\Component\Form\Element\DataType;
 
+use Exception;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\Context;
@@ -36,6 +38,11 @@ class DateTest extends TestCase
     /** @var  ObjectManager */
     private $objectManagerHelper;
 
+    /**
+     * @var DateFormatterFactory|MockObject
+     */
+    private $dateFormatterFactoryMock;
+
     /**
      * @inheritdoc
      */
@@ -47,6 +54,7 @@ protected function setUp(): void
         $this->objectManagerHelper = new ObjectManager($this);
         $this->processorMock = $this->createMock(Processor::class);
         $this->contextMock->method('getProcessor')->willReturn($this->processorMock);
+        $this->dateFormatterFactoryMock = $this->getMockForAbstractClass(DateFormatterFactory::class);
     }
 
     /**
@@ -182,4 +190,77 @@ public function convertDatetimeDataProvider(): array
             ['2019-09-30T12:32:00.000Z', true, '2019-09-30 19:32:00'],
         ];
     }
+
+    /**
+     * Run test for convertDateFormat() method
+     *
+     * @param string $date
+     * @param string $locale
+     * @param string $expected
+     * @return void
+     * @dataProvider convertDateFormatDataProvider
+     * @throws Exception
+     */
+    public function testConvertDateFormat(
+        string $date,
+        string $locale,
+        string $expected
+    ): void {
+        $this->localeResolverMock
+            ->expects($this->any())
+            ->method('getLocale')
+            ->willReturn($locale);
+        $this->date = $this->objectManagerHelper->getObject(
+            Date::class,
+            [
+                'localeResolver' => $this->localeResolverMock,
+                'dateFormatterFactory' => $this->dateFormatterFactoryMock
+            ]
+        );
+        $this->assertEquals(
+            $expected,
+            $this->date->convertDateFormat($date)
+        );
+    }
+
+    /**
+     * DataProvider for testConvertDateFormat()
+     *
+     * @return array
+     */
+    public function convertDateFormatDataProvider(): array
+    {
+        return [
+            [
+                '2023-10-15',
+                'en_US',
+                '10/15/2023'
+            ],
+            [
+                '10/15/2023',
+                'en_US',
+                '10/15/2023'
+            ],
+            [
+                '2023-10-15',
+                'en_GB',
+                '15/10/2023'
+            ],
+            [
+                '15/10/2023',
+                'en_GB',
+                '15/10/2023'
+            ],
+            [
+                '2023-10-15',
+                'ja_JP',
+                '2023/10/15'
+            ],
+            [
+                '2023/10/15',
+                'ja_JP',
+                '2023/10/15'
+            ]
+        ];
+    }
 }