ACP2E-4239: Date Filter not working according to store timezone on Credit Memos grid

Author: aplapana

app/code/Magento/Catalog/Ui/Component/Listing/Columns.php

@@ -16,7 +16,7 @@ class Columns extends \Magento\Ui\Component\Listing\Columns
     /**
      * Default columns max order value
      */
-    const DEFAULT_COLUMNS_MAX_ORDER = 100;
+    public const DEFAULT_COLUMNS_MAX_ORDER = 100;
 
     /**
      * @var \Magento\Catalog\Ui\Component\Listing\Attribute\RepositoryInterface

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Ui\Component;
 
@@ -21,7 +21,7 @@
  */
 class Filters extends AbstractComponent implements ObserverInterface
 {
-    const NAME = 'filters';
+    public const NAME = 'filters';
 
     /**
      * Filters created from columns
@@ -114,8 +114,8 @@ public function update(UiComponentInterface $component)
             }
 
             if (isset($this->filterMap[$filterType]) && !isset($this->columnFilters[$component->getName()])) {
-                $config = (array) $component->getConfig();
-                $userDefined = (bool) ($config['userDefined'] ?? 0);
+                $config = (array) $component->getData('config');
+                $userDefined = (bool) ($config['userDefined'] ?? false);
 
                 $filterComponent = $this->uiComponentFactory->create(
                     $component->getName(),

app/code/Magento/Ui/Test/Unit/Component/FiltersTest.php

@@ -63,9 +63,10 @@ protected function setUp(): void
      *
      * @param string $filterType
      * @param string $filterName
+     * @param bool $userDefined
      * @dataProvider updateDataProvider
      */
-    public function testUpdate(string $filterType, string $filterName)
+    public function testUpdate(string $filterType, string $filterName, bool $userDefined)
     {
         $componentName = 'component_name';
         $componentConfig = [0, 1, 2];
@@ -75,8 +76,12 @@ public function testUpdate(string $filterType, string $filterName)
             ->getMockForAbstractClass();
         $columnInterface->expects($this->atLeastOnce())
             ->method('getData')
-            ->with('config/filter')
-            ->willReturn($filterType);
+            ->willReturnOnConsecutiveCalls(
+                $filterType,
+                ['userDefined' => $userDefined],
+                $filterType,
+                ['userDefined' => $userDefined]
+            );
         $columnInterface->expects($this->atLeastOnce())->method('getName')->willReturn($componentName);
         $columnInterface->expects($this->once())->method('getConfiguration')->willReturn($componentConfig);
         $filterComponent = $this->getMockBuilder(UiComponentInterface::class)
@@ -87,7 +92,7 @@ public function testUpdate(string $filterType, string $filterName)
             ->willReturnSelf();
         $filterComponent->expects($this->once())->method('prepare')->willReturnSelf();
         $this->uiComponentFactory->expects($this->once())->method('create')
-            ->with($componentName, $filterName, ['context' => $this->context])
+            ->with($componentName, $filterName, ['context' => $this->context, 'userDefined' => $userDefined])
             ->willReturn($filterComponent);
 
         $this->filters->update($columnInterface);
@@ -101,8 +106,8 @@ public function testUpdate(string $filterType, string $filterName)
     public static function updateDataProvider(): array
     {
         return [
-            ['text', 'filterInput'],
-            ['datetimeRange', 'filterDate'],
+            ['text', 'filterInput', false],
+            ['datetimeRange', 'filterDate', true],
         ];
     }
 }