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

@@ -71,6 +71,7 @@ public function prepare()
                 $config['sortOrder'] = ++$columnSortOrder;
                 if ($attribute->getIsFilterableInGrid()) {
                     $config['filter'] = $this->getFilterType($attribute->getFrontendInput());
+                    $config['userDefined'] = $attribute->getIsUserDefined();
                 }
                 $column = $this->columnFactory->create($attribute, $this->getContext(), $config);
                 $column->prepare();

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

@@ -114,10 +114,16 @@ public function update(UiComponentInterface $component)
             }
 
             if (isset($this->filterMap[$filterType]) && !isset($this->columnFilters[$component->getName()])) {
+                $config = (array) $component->getConfig();
+                $userDefined = (bool) ($config['userDefined'] ?? 0);
+
                 $filterComponent = $this->uiComponentFactory->create(
                     $component->getName(),
                     $this->filterMap[$filterType],
-                    ['context' => $this->getContext()]
+                    [
+                        'context'     => $this->getContext(),
+                        'userDefined' => $userDefined,
+                    ]
                 );
                 $filterComponent->setData('config', $component->getConfiguration());
                 $filterComponent->prepare();

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

@@ -6,6 +6,10 @@
 
 namespace Magento\Ui\Component\Filters\Type;
 
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Form\Element\DataType\Date as DataTypeDate;
 
 /**
@@ -31,6 +35,33 @@ class Date extends AbstractFilter
      */
     protected static $dateFormat = 'Y-m-d H:i:s';
 
+    /**
+     * @var bool
+     */
+    private bool $userDefined;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param FilterBuilder $filterBuilder
+     * @param FilterModifier $filterModifier
+     * @param array $components
+     * @param array $data
+     * @param bool $userDefined
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        FilterBuilder $filterBuilder,
+        FilterModifier $filterModifier,
+        array $components = [],
+        array $data = [],
+        bool $userDefined = false
+    ) {
+        $this->userDefined = $userDefined;
+        parent::__construct($context, $uiComponentFactory, $filterBuilder, $filterModifier, $components, $data);
+    }
+
     /**
      * Prepare component configuration
      *
@@ -138,7 +169,8 @@ private function convertDatetime(string $value, int $hour = 0, int $minute = 0,
                 $hour,
                 $minute,
                 $second,
-                !$this->getData('config/skipTimeZoneConversion')
+                !$this->getData('config/skipTimeZoneConversion'),
+                !$this->userDefined
             );
 
         return $value;