ENGCOM-8211: [Fixed] - resolve issue with filter visibility with column visibility in grid #28385

Author: sidolov

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

@@ -58,7 +58,7 @@
                     <label translate="true">Status</label>
                     <dataScope>status</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -64,6 +64,13 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
                     'attribute_label' => 'a.frontend_label',
                 ]
             )
+            ->joinLeft(
+                ['attribute_label' => $this->resourceConnection->getTableName('eav_attribute_label')],
+                "a.attribute_id = attribute_label.attribute_id AND attribute_label.store_id = {$storeId}",
+                [
+                    'attribute_store_label' => 'attribute_label.value',
+                ]
+            )
             ->joinLeft(
                 ['options' => $this->resourceConnection->getTableName('eav_attribute_option')],
                 'a.attribute_id = options.attribute_id',
@@ -119,7 +126,8 @@ private function formatResult(\Magento\Framework\DB\Select $select): array
                 $result[$option['attribute_code']] = [
                     'attribute_id' => $option['attribute_id'],
                     'attribute_code' => $option['attribute_code'],
-                    'attribute_label' => $option['attribute_label'],
+                    'attribute_label' => $option['attribute_store_label']
+                        ? $option['attribute_store_label'] : $option['attribute_label'],
                     'options' => [],
                 ];
             }

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

@@ -64,7 +64,7 @@
                     <label translate="true">Store View</label>
                     <dataScope>store_id</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

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

@@ -69,7 +69,7 @@
                     <label translate="true">Store View</label>
                     <dataScope>store_id</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

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

@@ -58,7 +58,7 @@
                     <label translate="true">Status</label>
                     <dataScope>status</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml

@@ -13,8 +13,9 @@
         <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
         <element name="multicheckTick" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>input"/>
         <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
-        <element name="actions" type="text" selector=".action-select"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
+        <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml

@@ -58,7 +58,7 @@
                     <label translate="true">Status</label>
                     <dataScope>status</dataScope>
                     <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                        <link name="visible">ns = ${ $.ns }, index = ${ $.index }:visible</link>
                     </imports>
                 </settings>
             </filterSelect>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSelectFieldToColumnActionGroup">
+        <annotations>
+            <description>Select or clear the checkbox to display the column on the Orders grid page.</description>
+        </annotations>
+        <arguments>
+            <argument name="column" type="string" defaultValue="Purchase Point"/>
+        </arguments>
+        <click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="openColumnsDropdown" />
+        <click selector="{{AdminOrdersGridSection.viewColumnCheckbox(column)}}" stepKey="disableColumn"/>
+        <click selector="{{AdminOrdersGridSection.columnsDropdown}}" stepKey="closeColumnsDropdown" />
+    </actionGroup>
+</actionGroups>

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

@@ -18,6 +18,7 @@
         <element name="idFilter" type="input" selector=".admin__data-grid-filters input[name='increment_id']"/>
         <element name="selectStatus" type="select" selector="select[name='status']" timeout="60"/>
         <element name="billToNameFilter" type="input" selector=".admin__data-grid-filters input[name='billing_name']"/>
+        <element name="purchasePoint" type="select" selector=".admin__data-grid-filters select[name='store_id']"/>
         <element name="enabledFilters" type="block" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>