From 35a135b74e0e202f313aeba1106acf1dcccaea38 Mon Sep 17 00:00:00 2001
From: Eden <quocviet312@gmail.com>
Date: Sat, 3 Aug 2019 16:04:24 +0700
Subject: [PATCH 1/2] "Selected Attributes" lost selected value when filter
 issue 23999

---
 .../view/adminhtml/ui_component/product_attributes_listing.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml
index ea80c218516c3..7043d55de571a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml
@@ -55,6 +55,7 @@
         <selectionsColumn name="ids" sortOrder="0">
             <settings>
                 <indexField>attribute_id</indexField>
+                <preserveSelectionsOnFilter>true</preserveSelectionsOnFilter>
             </settings>
         </selectionsColumn>
         <column name="attribute_code">

From 0226f2aeff603cb393a02b5960593aae536d6c8c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 15 Aug 2019 12:26:52 +0300
Subject: [PATCH 2/2] magento/magento2#24000: MFTF test fix.

---
 .../Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
index ccbc587110d16..749d1bee0661a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
@@ -143,6 +143,9 @@
         <reloadPage stepKey="reloadDuplicatedProductPage"/>
         <waitForPageLoad stepKey="waitForDuplicatedProductReload"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="createConfigurationsDuplicatedProduct"/>
+        <waitForElementVisible selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="waitForCreateConfigurationsPageLoad"/>
+        <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminGridSelectRows.multicheckOption('Deselect All')}}" stepKey="DeselectAllAttributes"/>
         <actionGroup ref="createOptionsForAttribute" stepKey="createOptionsForDuplicatedProduct">
             <argument name="attributeName" value="{{productAttributeColor.default_label}}"/>
             <argument name="firstOptionName" value="{{colorConfigurableProductAttribute1.name}}"/>