From be428f7a4255de6b8ba5ae4668bf27be8ca0a38b Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 30 Jun 2020 10:46:07 +0100
Subject: [PATCH 01/16] Added url filter applier

---
 .../Magento/Ui/Component/UrlFilterApplier.php | 44 +++++++++++++++++
 app/code/Magento/Ui/etc/ui_components.xsd     |  1 +
 app/code/Magento/Ui/etc/ui_configuration.xsd  | 10 ++++
 app/code/Magento/Ui/etc/ui_definition.xsd     |  1 +
 .../base/ui_component/etc/definition.map.xml  |  1 +
 .../view/base/ui_component/etc/definition.xml |  1 +
 .../etc/definition/urlFilterApplier.xsd       | 18 +++++++
 .../base/web/js/grid/url-filter-applier.js    | 47 +++++++++++++++++++
 8 files changed, 123 insertions(+)
 create mode 100644 app/code/Magento/Ui/Component/UrlFilterApplier.php
 create mode 100644 app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
 create mode 100644 app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js

diff --git a/app/code/Magento/Ui/Component/UrlFilterApplier.php b/app/code/Magento/Ui/Component/UrlFilterApplier.php
new file mode 100644
index 0000000000000..ee7397b69e9ff
--- /dev/null
+++ b/app/code/Magento/Ui/Component/UrlFilterApplier.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Component;
+
+/**
+ * UrlFilterApplier component
+ */
+class UrlFilterApplier extends AbstractComponent
+{
+    const NAME = 'urlFilterApplier';
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $filters = is_array($this->getContext()->getRequestParam('filters')) ?
+            $this->getContext()->getRequestParam('filters') : null;
+
+        $this->setData(
+            'config',
+            array_replace_recursive(
+                (array)$this->getData('config'),
+                [
+                    'filters' => $filters,
+                ]
+            )
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getComponentName()
+    {
+        return static::NAME;
+    }
+}
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index eb8cc08f904fd..ed4be78b93aa8 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -62,4 +62,5 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/exportButton.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/listingToolbar.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/dataProvider.xsd"/>
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/urlFilterApplier.xsd"/>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index d45a3d7497637..4d7b8f20e4587 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -107,6 +107,7 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
+            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
     <xs:group name="fieldsetElements">
@@ -206,6 +207,7 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
+            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
 
@@ -824,4 +826,12 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
+    <xs:element name="urlFilterApplier" type="componentUrlFilterApplier">
+        <xs:annotation>
+            <xs:documentation>
+                The Url Filter Applier component retrieves the values from the "filters" GET parameter and applies it
+                to the grid.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_definition.xsd b/app/code/Magento/Ui/etc/ui_definition.xsd
index e86e2654ff629..80aaf1ebeb3c2 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -77,6 +77,7 @@
             <xs:element name="wysiwyg" type="componentWysiwyg"/>
             <xs:element name="inlineEditing" type="componentInlineEditing"/>
             <xs:element name="urlInput" type="componentUrlInput"/>
+            <xs:element name="urlFilterApplier" type="componentUrlFilterApplier" />
         </xs:choice>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
index 8f82b98112f18..89f400f34924f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -499,6 +499,7 @@
             </argument>
         </schema>
     </component>
+    <component name="urlFilterApplier" include="uiElementSettings"/>
     <component name="filterSearch" include="uiElementSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
index f0a5f357f8a92..98870e44bcee7 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -284,4 +284,5 @@
     </dynamicRows>
     <htmlContent class="Magento\Ui\Component\HtmlContent" component="Magento_Ui/js/form/components/html"/>
     <button class="Magento\Ui\Component\Container" component="Magento_Ui/js/form/components/button"/>
+    <urlFilterApplier class="Magento\Ui\Component\UrlFilterApplier" component="Magento_Ui/js/grid/url-filter-applier" />
 </components>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
new file mode 100644
index 0000000000000..ac1dd490ee248
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <!-- Include section -->
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
+
+    <xs:complexType name="componentUrlFilterApplier">
+        <xs:sequence>
+            <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
new file mode 100644
index 0000000000000..16d26e2da984f
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'underscore',
+], function (Component, _) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            filterProvider: 'componentType = filters, ns = ${ $.ns }',
+            filters: null,
+            modules: {
+                filterComponent: '${ $.filterProvider }',
+            }
+        },
+
+        /**
+         * Init component
+         *
+         * @return {exports}
+         */
+        initialize: function () {
+            this._super();
+            this.apply();
+
+            return this;
+        },
+
+        /**
+         * Apply filter
+         */
+        apply: function () {
+            if (_.isUndefined(this.filterComponent())) {
+                setTimeout(function () {this.apply()}.bind(this), 100);
+            } else {
+                if (!_.isNull(this.filters)) {
+                    this.filterComponent().setData(this.filters, false);
+                    this.filterComponent().apply();
+                }
+            }
+        }
+    });
+});

From 984dab1cf1c475ed2b60d12e98358fc69ede9dc0 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 30 Jun 2020 14:40:19 +0100
Subject: [PATCH 02/16] Simplified PR to a JS only approach

---
 .../Magento/Ui/Component/UrlFilterApplier.php | 44 -------------------
 app/code/Magento/Ui/etc/ui_components.xsd     |  1 -
 app/code/Magento/Ui/etc/ui_configuration.xsd  | 10 -----
 app/code/Magento/Ui/etc/ui_definition.xsd     |  1 -
 .../base/ui_component/etc/definition.map.xml  |  1 -
 .../view/base/ui_component/etc/definition.xml |  1 -
 .../etc/definition/urlFilterApplier.xsd       | 18 --------
 .../base/web/js/grid/url-filter-applier.js    | 36 ++++++++++++---
 8 files changed, 31 insertions(+), 81 deletions(-)
 delete mode 100644 app/code/Magento/Ui/Component/UrlFilterApplier.php
 delete mode 100644 app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd

diff --git a/app/code/Magento/Ui/Component/UrlFilterApplier.php b/app/code/Magento/Ui/Component/UrlFilterApplier.php
deleted file mode 100644
index ee7397b69e9ff..0000000000000
--- a/app/code/Magento/Ui/Component/UrlFilterApplier.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Ui\Component;
-
-/**
- * UrlFilterApplier component
- */
-class UrlFilterApplier extends AbstractComponent
-{
-    const NAME = 'urlFilterApplier';
-
-    /**
-     * @inheritdoc
-     */
-    public function prepare(): void
-    {
-        parent::prepare();
-        $filters = is_array($this->getContext()->getRequestParam('filters')) ?
-            $this->getContext()->getRequestParam('filters') : null;
-
-        $this->setData(
-            'config',
-            array_replace_recursive(
-                (array)$this->getData('config'),
-                [
-                    'filters' => $filters,
-                ]
-            )
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getComponentName()
-    {
-        return static::NAME;
-    }
-}
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index ed4be78b93aa8..eb8cc08f904fd 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -62,5 +62,4 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/exportButton.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/listingToolbar.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/dataProvider.xsd"/>
-    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/urlFilterApplier.xsd"/>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 4d7b8f20e4587..d45a3d7497637 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -107,7 +107,6 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
-            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
     <xs:group name="fieldsetElements">
@@ -207,7 +206,6 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
-            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
 
@@ -826,12 +824,4 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
-    <xs:element name="urlFilterApplier" type="componentUrlFilterApplier">
-        <xs:annotation>
-            <xs:documentation>
-                The Url Filter Applier component retrieves the values from the "filters" GET parameter and applies it
-                to the grid.
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_definition.xsd b/app/code/Magento/Ui/etc/ui_definition.xsd
index 80aaf1ebeb3c2..e86e2654ff629 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -77,7 +77,6 @@
             <xs:element name="wysiwyg" type="componentWysiwyg"/>
             <xs:element name="inlineEditing" type="componentInlineEditing"/>
             <xs:element name="urlInput" type="componentUrlInput"/>
-            <xs:element name="urlFilterApplier" type="componentUrlFilterApplier" />
         </xs:choice>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
index 89f400f34924f..8f82b98112f18 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -499,7 +499,6 @@
             </argument>
         </schema>
     </component>
-    <component name="urlFilterApplier" include="uiElementSettings"/>
     <component name="filterSearch" include="uiElementSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
index 98870e44bcee7..f0a5f357f8a92 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -284,5 +284,4 @@
     </dynamicRows>
     <htmlContent class="Magento\Ui\Component\HtmlContent" component="Magento_Ui/js/form/components/html"/>
     <button class="Magento\Ui\Component\Container" component="Magento_Ui/js/form/components/button"/>
-    <urlFilterApplier class="Magento\Ui\Component\UrlFilterApplier" component="Magento_Ui/js/grid/url-filter-applier" />
 </components>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
deleted file mode 100644
index ac1dd490ee248..0000000000000
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <!-- Include section -->
-    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
-
-    <xs:complexType name="componentUrlFilterApplier">
-        <xs:sequence>
-            <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attributeGroup ref="ui_element_attributes"/>
-    </xs:complexType>
-</xs:schema>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index 16d26e2da984f..d379d2611aba4 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -12,7 +12,7 @@ define([
     return Component.extend({
         defaults: {
             filterProvider: 'componentType = filters, ns = ${ $.ns }',
-            filters: null,
+            filterKey: 'filters',
             modules: {
                 filterComponent: '${ $.filterProvider }',
             }
@@ -34,14 +34,40 @@ define([
          * Apply filter
          */
         apply: function () {
+            var urlFilter = this.getFilterParam();
+
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {this.apply()}.bind(this), 100);
             } else {
-                if (!_.isNull(this.filters)) {
-                    this.filterComponent().setData(this.filters, false);
-                    this.filterComponent().apply();
-                }
+                 if (Object.keys(urlFilter).length) {
+                     this.filterComponent().setData(urlFilter, false);
+                     this.filterComponent().apply();
+                 }
             }
+        },
+
+        /**
+         * Get filter param from url
+         *
+         * @returns {Object}
+         */
+        getFilterParam: function () {
+            var searchString = decodeURI(location.search);
+
+            return _.chain(searchString.slice(1).split('&'))
+                .map(function (item) {
+                    if (item && item.search(this.filterKey) !== -1) {
+                        var itemArray = item.split('=');
+
+                        itemArray[0] = itemArray[0].replace(this.filterKey, '')
+                                .replace(/[\[\]]/g, '');
+
+                        return itemArray
+                    }
+                }.bind(this))
+                .compact()
+                .object()
+                .value();
         }
     });
 });

From 5531f50ff1ba3ad3812ddef4c886c8bae6b5b8cd Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 11:56:53 +0100
Subject: [PATCH 03/16] Added jasmine tests

---
 .../base/web/js/grid/url-filter-applier.js    | 11 ++--
 .../base/js/grid/url-filter-applier.test.js   | 65 +++++++++++++++++++
 2 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index d379d2611aba4..f9f6e9d7a73de 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -11,8 +11,9 @@ define([
 
     return Component.extend({
         defaults: {
-            filterProvider: 'componentType = filters, ns = ${ $.ns }',
+            filterProvider: 'componentType = filters',
             filterKey: 'filters',
+            searchString: location.search,
             modules: {
                 filterComponent: '${ $.filterProvider }',
             }
@@ -34,12 +35,12 @@ define([
          * Apply filter
          */
         apply: function () {
-            var urlFilter = this.getFilterParam();
+            var urlFilter = this.getFilterParam(this.searchString);
 
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {this.apply()}.bind(this), 100);
             } else {
-                 if (Object.keys(urlFilter).length) {
+                if (Object.keys(urlFilter).length) {
                      this.filterComponent().setData(urlFilter, false);
                      this.filterComponent().apply();
                  }
@@ -51,8 +52,8 @@ define([
          *
          * @returns {Object}
          */
-        getFilterParam: function () {
-            var searchString = decodeURI(location.search);
+        getFilterParam: function (url) {
+            var searchString = decodeURI(url);
 
             return _.chain(searchString.slice(1).split('&'))
                 .map(function (item) {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
new file mode 100644
index 0000000000000..03bf5300e8ded
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define([
+    'Magento_Ui/js/grid/url-filter-applier'
+], function (UrlFilterApplier) {
+    'use strict';
+
+    describe('Magento_Ui/js/grid/url-filter-applier', function () {
+        var urlFilterApplierObj,
+            filterComponentMock = {
+                setData: jasmine.createSpy(),
+                apply: jasmine.createSpy()
+            };
+
+        beforeEach(function () {
+            urlFilterApplierObj = new UrlFilterApplier({});
+            urlFilterApplierObj.filterComponent = jasmine.createSpy().and.returnValue(filterComponentMock);
+        });
+
+        describe('"getFilterParam" method', function () {
+            it('return object from url with a simple filters parameter', function () {
+                var urlSearch = '?filters[name]=test';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({'name': 'test'});
+            });
+            it('return object from url with multiple filters parameter', function () {
+                var urlSearch = '?filters[name]=test&filters[qty]=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                        'name': 'test',
+                        'qty': '1'
+                    });
+            });
+            it('return object from url with multiple filters parameter and another parameter', function () {
+                var urlSearch = '?filters[name]=test&filters[qty]=1&anotherparam=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                    'name': 'test',
+                    'qty': '1'
+                });
+            });
+            it('return object from url with another parameter', function () {
+                var urlSearch = '?anotherparam=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({});
+            });
+        });
+
+        describe('"apply" method', function () {
+            it('applies url filter on filter component', function () {
+                urlFilterApplierObj.searchString = '?filters[name]=test&filters[qty]=1';
+                urlFilterApplierObj.apply();
+                expect(urlFilterApplierObj.filterComponent().setData).toHaveBeenCalledWith({
+                    'name': 'test',
+                    'qty': '1'
+                }, false);
+                expect(urlFilterApplierObj.filterComponent().apply).toHaveBeenCalled();
+            });
+        });
+    });
+});

From 1574740ad1c71f1b74212bfd1449881212f25fc3 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 11:57:38 +0100
Subject: [PATCH 04/16] Added url filter applier to product grid

---
 .../adminhtml/layout/catalog_product_index.xml    |  1 +
 .../product/grid/url_filter_applier.phtml         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml

diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
index c503196cc8647..75391ede7f261 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
@@ -21,6 +21,7 @@
         <referenceContainer name="content">
             <uiComponent name="product_listing"/>
             <block class="Magento\Catalog\Block\Adminhtml\Product" name="products_list"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
new file mode 100644
index 0000000000000..a09b0944b68e5
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $block \Magento\Backend\Block\Template */
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/grid/url-filter-applier": {}
+        }
+    }
+</script>

From 607aed6ff371c7aba0e78f41974196458b112937 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 12:10:33 +0100
Subject: [PATCH 05/16] Added url filter applier to cms grids

---
 .../Cms/view/adminhtml/layout/cms_block_index.xml |  1 +
 .../Cms/view/adminhtml/layout/cms_page_index.xml  |  1 +
 .../adminhtml/templates/url_filter_applier.phtml  | 15 +++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml

diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index d22eaf504e703..fb73b4caf5b20 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,6 +9,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index bf78b1cd49448..a6e4960c9d892 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,6 +10,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
new file mode 100644
index 0000000000000..a09b0944b68e5
--- /dev/null
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $block \Magento\Backend\Block\Template */
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/grid/url-filter-applier": {}
+        }
+    }
+</script>

From 22c2be9dbccfea3fbc4ebae5a0f47626f7d41f6c Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:01:45 +0100
Subject: [PATCH 06/16] Added mftf for product grid

---
 .../AdminProductGridUrlFilterApplierTest.xml  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..0d0ba22a37e0b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductGridUrlFilterApplierTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Filter product using GET URL parameter"/>
+            <title value="Verify that filter is applied when filters parameter is set on url"/>
+            <description value="Accessing product grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$$createSimpleProduct.name$$" stepKey="navigateToProductGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
+        <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From 58158aafc3614d5d918fcd3382b35702eaeefaa3 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:25:59 +0100
Subject: [PATCH 07/16] Added cms page mftf tests

---
 .../AdminProductGridUrlFilterApplierTest.xml  |  2 +-
 .../Section/CmsPagesPageActionsSection.xml    |  2 +
 .../AdminCmsPageGridUrlFilterApplierTest.xml  | 37 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 0d0ba22a37e0b..605457f5d7575 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="Catalog"/>
             <stories value="Filter product using GET URL parameter"/>
-            <title value="Verify that filter is applied when filters parameter is set on url"/>
+            <title value="Verify that filter is applied on product grid when filters parameter is set on url"/>
             <description value="Accessing product grid url with filters parameter"/>
             <severity value="MAJOR"/>
             <testCaseId value="to-be-added"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index ebf024490cce6..0d618cf82ce6d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -19,6 +19,7 @@
         <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
         <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
         <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>
         <element name="firstItemSelectButton" type="button" selector=".data-grid .action-select-wrap button.action-select"/>
@@ -31,5 +32,6 @@
         <element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[contains(@class, 'action-select')]" />
         <element name="massActionsOption" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//span[contains(@class, 'action-menu-item') and .= '{{action}}']" parameterized="true"/>
         <element name="gridDataRow" type="input" selector=".data-row .data-grid-cell-content"/>
+        <element name="pagesGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..0cfae38123e90
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCmsPageGridUrlFilterApplierTest">
+        <annotations>
+            <features value="CmsPage"/>
+            <stories value="Filter CMS page using GET URL parameter"/>
+            <title value="Verify that filter is applied on page grid when filters parameter is set on url"/>
+            <description value="Accessing page grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCmsPage" stepKey="createPage"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPage" stepKey="deletePage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{CmsPagesPage.url}}?filters[title]=$$createPage.title$$" stepKey="navigateToPageGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForPageGrid"/>
+        <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
+        <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
+        <click selector="{{CmsPagesPageActionsSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From 1467c6ef93b6dab35210429090657d840a8ed4bf Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:32:35 +0100
Subject: [PATCH 08/16] Added mftf block test

---
 .../Mftf/Section/BlockPageActionsSection.xml  |  3 ++
 .../AdminCmsBlockGridUrlFilterApplierTest.xml | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
index d487517269c01..4f69801e4b648 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -15,8 +15,11 @@
         <element name="idColumn" type="button" selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]"/>
         <element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
+        <element name="activeFilterDiv" type="button" selector="(//div[contains(@class, 'admin__data-grid-filters-current') and contains(@class, '_show')])[1]"/>
         <element name="FilterBtn" type="input" selector="//button[text()='Filters']"/>
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
         <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
+        <element name="blockGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..2af33312ef18d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCmsBlockGridUrlFilterApplierTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Filter CMS block using GET URL parameter"/>
+            <title value="Verify that filter is applied on block grid when filters parameter is set on url"/>
+            <description value="Accessing block grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="Sales25offBlock" stepKey="createBlock"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createBlock" stepKey="deletePage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{CmsBlocksPage.url}}?filters[title]=$$createBlock.title$$" stepKey="navigateToBlockGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForBlockGrid"/>
+        <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
+        <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
+        <click selector="{{BlockPageActionsSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From 273607c41173302aadfea916569e404c1abe73ba Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 17:21:11 +0100
Subject: [PATCH 09/16] Using existing action group

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml    | 3 +--
 .../Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml  | 1 -
 .../Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml   | 3 +--
 .../Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml    | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 605457f5d7575..f912060a4ba48 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
-        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
index 4f69801e4b648..ac9c66fe82c74 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -20,6 +20,5 @@
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
         <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
         <element name="blockGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
-        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 2af33312ef18d..10e9781134c31 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
         <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
         <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
-        <click selector="{{BlockPageActionsSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index 0cfae38123e90..2063b402266f9 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
         <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
         <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
-        <click selector="{{CmsPagesPageActionsSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>

From 8660c73416c732b9772eb0b4aedb293ab088015d Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 10:19:09 +0100
Subject: [PATCH 10/16] Fixed static tests

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js | 14 ++++++++------
 .../Ui/base/js/grid/url-filter-applier.test.js     |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index f9f6e9d7a73de..a33f2c30e21fc 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -5,7 +5,7 @@
 
 define([
     'uiComponent',
-    'underscore',
+    'underscore'
 ], function (Component, _) {
     'use strict';
 
@@ -15,7 +15,7 @@ define([
             filterKey: 'filters',
             searchString: location.search,
             modules: {
-                filterComponent: '${ $.filterProvider }',
+                filterComponent: '${ $.filterProvider }'
             }
         },
 
@@ -38,12 +38,14 @@ define([
             var urlFilter = this.getFilterParam(this.searchString);
 
             if (_.isUndefined(this.filterComponent())) {
-                setTimeout(function () {this.apply()}.bind(this), 100);
+                setTimeout(function () {
+                    this.apply();
+                }.bind(this), 100);
             } else {
                 if (Object.keys(urlFilter).length) {
-                     this.filterComponent().setData(urlFilter, false);
-                     this.filterComponent().apply();
-                 }
+                    this.filterComponent().setData(urlFilter, false);
+                    this.filterComponent().apply();
+                }
             }
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
index 03bf5300e8ded..fb37c73abdd41 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
@@ -25,7 +25,9 @@ define([
             it('return object from url with a simple filters parameter', function () {
                 var urlSearch = '?filters[name]=test';
 
-                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({'name': 'test'});
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                    'name': 'test'
+                });
             });
             it('return object from url with multiple filters parameter', function () {
                 var urlSearch = '?filters[name]=test&filters[qty]=1';

From a8c3f67a063244dacd8f289bfb7295c6149294d7 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 10:29:53 +0100
Subject: [PATCH 11/16] Fixed static tests

---
 .../base/web/js/grid/url-filter-applier.js     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index a33f2c30e21fc..62e5b292615f9 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -41,11 +41,12 @@ define([
                 setTimeout(function () {
                     this.apply();
                 }.bind(this), 100);
-            } else {
-                if (Object.keys(urlFilter).length) {
-                    this.filterComponent().setData(urlFilter, false);
-                    this.filterComponent().apply();
-                }
+
+                return;
+            }
+            if (Object.keys(urlFilter).length) {
+                this.filterComponent().setData(urlFilter, false);
+                this.filterComponent().apply();
             }
         },
 
@@ -55,17 +56,18 @@ define([
          * @returns {Object}
          */
         getFilterParam: function (url) {
-            var searchString = decodeURI(url);
+            var searchString = decodeURI(url),
+                itemArray;
 
             return _.chain(searchString.slice(1).split('&'))
                 .map(function (item) {
                     if (item && item.search(this.filterKey) !== -1) {
-                        var itemArray = item.split('=');
+                        itemArray = item.split('=');
 
                         itemArray[0] = itemArray[0].replace(this.filterKey, '')
                                 .replace(/[\[\]]/g, '');
 
-                        return itemArray
+                        return itemArray;
                     }
                 }.bind(this))
                 .compact()

From 96e67524c5637c2a634b80375948fb42b26d1a87 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 12:42:27 +0100
Subject: [PATCH 12/16] Added block names

---
 .../Catalog/view/adminhtml/layout/catalog_product_index.xml     | 2 +-
 app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml  | 2 +-
 app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
index 75391ede7f261..89f34a21415d3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
@@ -21,7 +21,7 @@
         <referenceContainer name="content">
             <uiComponent name="product_listing"/>
             <block class="Magento\Catalog\Block\Adminhtml\Product" name="products_list"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" name="product_list_url_filter_applier" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index fb73b4caf5b20..c85302ae341f4 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,7 +9,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier" />
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index a6e4960c9d892..68843c77e82c7 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier" />
         </referenceContainer>
     </body>
 </page>

From c77d81209df9023ba925157728e7edb133e44c81 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 14:52:53 +0100
Subject: [PATCH 13/16] Implemented suggestions and fixed tests

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml | 2 +-
 .../templates/product/grid/url_filter_applier.phtml         | 4 +++-
 .../Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml | 2 +-
 .../Magento/Cms/view/adminhtml/layout/cms_block_index.xml   | 6 +++++-
 .../Magento/Cms/view/adminhtml/layout/cms_page_index.xml    | 6 +++++-
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml   | 4 +++-
 .../Magento/Ui/view/base/web/js/grid/url-filter-applier.js  | 4 +++-
 8 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index f912060a4ba48..2055a7599b4b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index a09b0944b68e5..3e00503a882db 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -9,7 +9,9 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Ui/js/grid/url-filter-applier": {}
+            "Magento_Ui/js/grid/url-filter-applier": {
+                "listingNamespace": "product_listing"
+            }
         }
     }
 </script>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 10e9781134c31..817460e97a645 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="Sales25offBlock" stepKey="createBlock"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createBlock" stepKey="deletePage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
         <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
         <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index 2063b402266f9..b2f0912369fff 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="_defaultCmsPage" stepKey="createPage"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createPage" stepKey="deletePage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
         <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
         <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index c85302ae341f4..4a8002d89726d 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,7 +9,11 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier">
+                <arguments>
+                    <argument name="listing_namespace" xsi:type="string">cms_block_listing</argument>
+                </arguments>
+            </block>
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index 68843c77e82c7..1256751e65742 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,7 +10,11 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier">
+                <arguments>
+                    <argument name="listing_namespace" xsi:type="string">cms_page_listing</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index a09b0944b68e5..4467035278bdd 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -9,7 +9,9 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Ui/js/grid/url-filter-applier": {}
+            "Magento_Ui/js/grid/url-filter-applier": {
+                "listingNamespace": "<?php echo $block->getListingNamespace() ?>"
+            }
         }
     }
 </script>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index 62e5b292615f9..83220028a72df 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -11,7 +11,8 @@ define([
 
     return Component.extend({
         defaults: {
-            filterProvider: 'componentType = filters',
+            listingNamespace: null,
+            filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
             searchString: location.search,
             modules: {
@@ -44,6 +45,7 @@ define([
 
                 return;
             }
+
             if (Object.keys(urlFilter).length) {
                 this.filterComponent().setData(urlFilter, false);
                 this.filterComponent().apply();

From 03b3ef5183f2e383b070004400ab9790d3c0eb04 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 15:48:34 +0100
Subject: [PATCH 14/16] Fix static test

---
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 4467035278bdd..18f48c3ebb108 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -10,7 +10,7 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?php echo $block->getListingNamespace() ?>"
+                "listingNamespace": "<?= $block->getListingNamespace() ?>"
             }
         }
     }

From b4b16fff64ee2bdc4d57b1e9b9ac9f6d738d7698 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 16:45:41 +0100
Subject: [PATCH 15/16] Added escape for block argument

---
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 18f48c3ebb108..a4918e86715a8 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -5,12 +5,13 @@
  */
 
 /** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?= $block->getListingNamespace() ?>"
+                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>"
             }
         }
     }

From 8af0f46e1404a30f155b37ab19ba045048532f42 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 6 Jul 2020 14:17:41 +0300
Subject: [PATCH 16/16] add testCaseId

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml    | 2 +-
 .../Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 2055a7599b4b4..0565f2d08cc1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on product grid when filters parameter is set on url"/>
             <description value="Accessing product grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="product"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 817460e97a645..e2cf9c20627f8 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on block grid when filters parameter is set on url"/>
             <description value="Accessing block grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="Cms"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index b2f0912369fff..1f1f1c98d507b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on page grid when filters parameter is set on url"/>
             <description value="Accessing page grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="Cms"/>
         </annotations>
         <before>