Skip to content

Commit 2538135

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8211: [Fixed] - resolve issue with filter visibility with column visibility in grid #28385
- Merge Pull Request #28385 from niravkrish/magento2:fixed-filter-visibility-toggle - Merged commits: 1. 0a0c8e4 2. 2f0a4d8 3. 8e4cf84 4. d887e8e 5. 9b2f7ec
2 parents edfbc39 + 9b2f7ec commit 2538135

File tree

16 files changed

+75
-14
lines changed

16 files changed

+75
-14
lines changed

‎app/code/Magento/Bundle/view/adminhtml/ui_component/bundle_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<label translate="true">Store View</label>
6565
<dataScope>store_id</dataScope>
6666
<imports>
67-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
67+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6868
</imports>
6969
</settings>
7070
</filterSelect>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<label translate="true">Store View</label>
7070
<dataScope>store_id</dataScope>
7171
<imports>
72-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
72+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
7373
</imports>
7474
</settings>
7575
</filterSelect>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

‎app/code/Magento/GroupedProduct/view/adminhtml/ui_component/grouped_product_listing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<label translate="true">Status</label>
5959
<dataScope>status</dataScope>
6060
<imports>
61-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
61+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
6262
</imports>
6363
</settings>
6464
</filterSelect>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFieldToColumnActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectFieldToColumnActionGroup">
12+
<annotations>
13+
<description>Select or clear the checkbox to display the column on the Orders grid page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="column" type="string" defaultValue="Purchase Point"/>
17+
</arguments>
18+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="openColumnsDropdown" />
19+
<click selector="{{AdminOrdersGridSection.viewColumnCheckbox(column)}}" stepKey="disableColumn"/>
20+
<click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="closeColumnsDropdown" />
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
1919
<element name="selectStatus" type="select" selector="select[name='status']" timeout="60"/>
2020
<element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
21+
<element name="purchasePoint" type="select" selector=".admin__data-grid-filters select[name='store_id']"/>
2122
<element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
2223
<element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
2324
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyFieldToFilterOnOrdersGridTest.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminVerifyFieldToFilterOnOrdersGridTest">
12+
<annotations>
13+
<features value="Sales"/>
14+
<stories value="Github issue: #28385 Resolve issue with filter visibility with column visibility in grid"/>
15+
<title value="Verify field to filter"/>
16+
<description value="Verify not appear fields to filter on Orders grid if it disables in columns dropdown."/>
17+
<severity value="MAJOR"/>
18+
</annotations>
19+
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin" />
22+
</before>
23+
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout" />
26+
</after>
27+
28+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="goToOrders"/>
29+
<actionGroup ref="AdminSelectFieldToColumnActionGroup" stepKey="unSelectPurchasePoint" />
30+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="openColumnsDropdown" />
31+
<dontSeeElement selector="{{AdminOrdersGridSection.purchasePoint}}" stepKey="dontSeeElement"/>
32+
33+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="closeColumnsDropdown" />
34+
<actionGroup ref="AdminSelectFieldToColumnActionGroup" stepKey="selectPurchasePoint" />
35+
<click selector="{{AdminOrdersGridSection.filters}}" stepKey="openColumnsDropdown2" />
36+
<seeElement selector="{{AdminOrdersGridSection.purchasePoint}}" stepKey="seeElement"/>
37+
</test>
38+
</tests>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<label translate="true">Purchased From</label>
4343
<dataScope>store_id</dataScope>
4444
<imports>
45-
<link name="visible">componentType = column, index = ${ $.index }:visible</link>
45+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
4646
</imports>
4747
</settings>
4848
</filterSelect>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<label translate="true">Purchase Point</label>
5454
<dataScope>store_id</dataScope>
5555
<imports>
56-
<link name="visible">ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible</link>
56+
<link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
5757
</imports>
5858
</settings>
5959
</filterSelect>

0 commit comments

Comments
 (0)