ACP2E-1299: Search in user roles not working

Author: glo23503

app/code/Magento/User/Block/Role/Grid/User.php

@@ -206,7 +206,16 @@ public function getUsers($json = false)
             if ($json) {
                 return $this->getJSONString($inRoleUser);
             }
-            return $this->escapeJs($this->escapeHtml($inRoleUser));
+            $escapedInRoleUser = $this->escapeHtml($inRoleUser);
+            if (is_array($escapedInRoleUser)) {
+                return array_map(
+                    function ($value) {
+                        return $this->escapeJs($value);
+                    },
+                    $escapedInRoleUser
+                );
+            }
+            return $this->escapeJs($escapedInRoleUser);
         }
         $roleId = $this->getRoleId();
         $users = $this->getUsersFormData();

app/code/Magento/User/Test/Unit/Block/Role/Grid/UserTest.php

@@ -22,6 +22,7 @@
 use Magento\User\Block\Role\Grid\User;
 use Magento\User\Controller\Adminhtml\User\Role\SaveRole;
 use Magento\User\Model\ResourceModel\Role\User\CollectionFactory;
+use Magento\Framework\Escaper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -82,6 +83,11 @@ class UserTest extends TestCase
      */
     protected $filesystemMock;
 
+    /**
+     * @var Escaper|MockObject
+     */
+    protected $escaperMock;
+
     protected function setUp(): void
     {
         $this->backendHelperMock = $this->getMockBuilder(Data::class)
@@ -123,6 +129,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->escaperMock = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $objectManagerHelper = new ObjectManager($this);
         $this->model = $objectManagerHelper->getObject(
             User::class,
@@ -135,7 +145,8 @@ protected function setUp(): void
                 'request' => $this->requestInterfaceMock,
                 'urlBuilder' => $this->urlInterfaceMock,
                 'layout' => $this->layoutMock,
-                'filesystem' => $this->filesystemMock
+                'filesystem' => $this->filesystemMock,
+                'escaper' => $this->escaperMock
             ]
         );
     }
@@ -302,4 +313,14 @@ public function testGetUsersIncorrectInRoleUser(): void
         $this->requestInterfaceMock->expects($this->once())->method('getParam')->with($param)->willReturn($paramValue);
         $this->assertEquals('{}', $this->model->getUsers(true));
     }
+
+    /**
+     * @return void
+     */
+    public function testGetUsers(): void
+    {
+        $paramValue = array("1");
+        $this->requestInterfaceMock->expects($this->once())->method('getParam')->with('in_role_user')->willReturn($paramValue);
+        $this->assertEquals($paramValue, $this->model->getUsers());
+    }
 }