Skip to content

Fix admin grid filter backslash escaping issue #39535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 2.4-develop
Choose a base branch
from
+18 −5
Open

Fix admin grid filter backslash escaping issue #39535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1276bb
Fix admin grid filter backslash escaping issue
wubinworks Jan 11, 2025
959e8f0
Merge branch '2.4-develop' into issues/39513_fix-admin-grid-filter-ba…
engcom-Hotel Jun 24, 2025
478031f
Add Unit Tests to verify backslash handling and fix Static Tests failure
wubinworks Jun 26, 2025
26a7fb7
Fix Static Tests failure
wubinworks Jun 30, 2025
8ff1ce9
Merge branch '2.4-develop' into issues/39513_fix-admin-grid-filter-ba…
engcom-Bravo Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/code/Magento/Ui/Component/Filters/Type/Input.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
namespace Magento\Ui\Component\Filters\Type;

Expand Down Expand Up @@ -74,7 +74,7 @@ protected function applyFilter(): void
$valueExpression = $filterConfig['valueExpression'] ?? null;
}
if ($conditionType === self::CONDITION_LIKE) {
$value = str_replace(['%', '_'], ['\%', '\_'], $value);
$value = str_replace(['\\', '%', '_'], ['\\\\', '\%', '\_'], $value);
$valueExpression = $valueExpression ?? '%%%s%%';
}
if ($valueExpression) {
Expand Down
17 changes: 15 additions & 2 deletions app/code/Magento/Ui/Test/Unit/Component/Filters/Type/InputTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2025 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -172,7 +172,10 @@ public function testPrepare(array $data, array $filterData, ?array $expectedCond
}

/**
* SuppressWarnings was added due to the big size of data provider
*
* @return array
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public static function getPrepareDataProvider(): array
{
Expand Down Expand Up @@ -221,6 +224,16 @@ public static function getPrepareDataProvider(): array
'setValue' => '%\%%',
],
],
[
[
'name' => 'test_date',
],
['test_date' => 'some\\value'],
[
'setConditionType' => 'like',
'setValue' => '%some\\\\value%',
],
],
[
[
'name' => 'text_attr',
Expand Down