Implemented suggestions and fixed tests

Gabriel Galvao da Gama · Gabriel Galvao da Gama · commit c77d81209df9 · 2020-07-02T14:52:53.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@`
`9`	`9`	`<script type="text/x-magento-init">`
`10`	`10`	`{`
`11`	`11`	`"*": {`
`12`		`- "Magento_Ui/js/grid/url-filter-applier": {}`
	`12`	`+ "Magento_Ui/js/grid/url-filter-applier": {`
	`13`	`+ "listingNamespace": "product_listing"`
	`14`	`+ }`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`	`</script>`