Merge remote-tracking branch 'mainline/2.4-develop' into 2.4.1-develop

Author: slavvka

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup.xml

@@ -0,0 +1,28 @@
+<?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="AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup" extends="GenerateConfigurationsByAttributeCodeActionGroup">
+        <annotations>
+            <description>Selects all Attribute options for the provided Attribute Code and navigates to Options quantity on the Configurable Product creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="price" type="string" defaultValue="100"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton2" stepKey="waitForNextPageOpened"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened" stepKey="clickOnApplySinglePriceToAllSkus"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" after="clickOnApplySinglePriceToAllSkus" stepKey="enterAttributePrice"/>
+
+        <remove keyForRemoval="clickOnApplySingleQuantityToEachSku"/>
+        <remove keyForRemoval="enterAttributeQuantity"/>
+        <remove keyForRemoval="clickOnNextButton3"/>
+        <remove keyForRemoval="clickOnNextButton4"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml

@@ -25,7 +25,13 @@
 
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProductFilteredBySkuAndName">
+                <argument name="sku" value="{{_defaultProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductIndexPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <!-- Create a configurable product via the UI -->

app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml

@@ -49,4 +49,9 @@
         <data key="used_in_product_listing">1</data>
         <data key="used_for_sort_by">0</data>
     </entity>
+    <entity name="TextSwatchProductAttributeForm" extends="VisualSwatchProductAttributeForm">
+        <data key="frontend_label[0]" unique="suffix">TextSwatchAttribute-</data>
+        <data key="frontend_input">swatch_text</data>
+        <data key="attribute_code" unique="suffix">text_swatch_attribute_</data>
+    </entity>
 </entities>

app/code/Magento/Swatches/Test/Mftf/Metadata/SwatchProductAttributeMeta.xml

@@ -11,6 +11,7 @@
     <operation name="CreateSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="create"
                auth="adminFormKey" url="catalog/product_attribute/save" method="POST" successRegex="/messages-message-success/" returnRegex="">
         <contentType>application/x-www-form-urlencoded</contentType>
+        <field key="attribute_id">string</field>
         <field key="frontend_label[0]">string</field>
         <field key="frontend_label[1]">string</field>
         <field key="frontend_input">string</field>
@@ -43,4 +44,7 @@
         <field key="used_in_product_listing">string</field>
         <field key="used_for_sort_by">string</field>
     </operation>
+    <operation name="DeleteSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="delete" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
 </operations>

app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js

@@ -292,6 +292,17 @@ define([
             return _.isArray(products) ? products[0] : null;
         },
 
+        /**
+         * Get chosen product id
+         *
+         * @returns int|null
+         */
+        getProductId: function () {
+            var products = this._CalcProducts();
+
+            return _.isArray(products) && products.length === 1 ? products[0] : null;
+        },
+
         /**
          * @private
          */