🔃 [Magento Community Engineering] Community Contributions - 2.4-develop

Accepted Community Pull Requests: - #32646: MC-41439: 7.3 compatibility fix. (by @engcom-Foxtrot) - #32467: Replace repetitive actions with Action Groups in AdminCreateSimpleProductNegativePriceTest (by @kate-kyzyma) - #32477: Replace repetitive actions with Action Groups in AdminCreateVirtualProductFillingRequiredFieldsOnlyTest (by @kate-kyzyma) - #32524: Replace repetitive actions with Action Groups in AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest (by @kate-kyzyma) - #32517: Removed CliCacheFlushActionGroup usage for Downloadable and other modules (by @sergiy-v) - #32463: Replace repetitive actions with Action Groups in AdminConfigurableProductCreateTest (by @kate-kyzyma) - #32498: Replace repetitive actions with Action Groups in AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest (by @kate-kyzyma) - #32532: Make product SKU not null (by @ihor-sviziev) - #32400: Add WEBP + AVIF Support by default (by @in-session) - #32288: Replace repetitive actions with Action Groups in AdminCreateProductDuplicateUrlkeyTest (by @kate-kyzyma) - #30823: Item resolvers should be optional (by @thomas-kl1) - #32639: Fixes composer.lock file which does not contain web-token/jwt-framewo… (by @hostep) - #32610: Modified the PR template to include README.md update reqirement if necessary (by @bgorski) - #32612: Added missing web-token/jwt-framework dependency to magento/module-jwt-framework-adapter (by @bgorski) - #32448: Update README.md of Google_Analytics module (by @charles-tychons) - #31938: [ReadMe] updated readMe file for Magento_Msrp-Magento_MysqlMq modules (by @ProkopovVitaliy) - #32434: Seperate js out template to avoid render issue (by @mrtuvn) - #32298: Ensure string is returned when applying filter to email template (by @Skullsneeze) - #32254: Removed caching subscription status from plugin (by @engcom-Charlie) - #31080: Add event listeners passive for fotorama lib improves lighthouse metrics (by @mrtuvn) - #30695: Avoid binding magnifier events in duplicate on resize (by @fredden) Fixed GitHub Issues: - #32647: [Issue] MC-41439: 7.3 compatibility fix. (reported by @m2-assistant[bot]) has been fixed in #32646 by @engcom-Foxtrot in 2.4-develop branch Related commits: 1. 5f93692 2. bf6cd90 - #32505: [Issue] Replace repetitive actions with Action Groups in AdminCreateSimpleProductNegativePriceTest (reported by @m2-assistant[bot]) has been fixed in #32467 by @kate-kyzyma in 2.4-develop branch Related commits: 1. ea063e0 2. aacf9a2 - #32504: [Issue] Replace repetitive actions with Action Groups in AdminCreateVirtualProductFillingRequiredFieldsOnlyTest (reported by @m2-assistant[bot]) has been fixed in #32477 by @kate-kyzyma in 2.4-develop branch Related commits: 1. b37d542 - #32583: [Issue] Replace repetitive actions with Action Groups in AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest (reported by @m2-assistant[bot]) has been fixed in #32524 by @kate-kyzyma in 2.4-develop branch Related commits: 1. feaed6b - #32518: [Issue] Removed CliCacheFlushActionGroup usage for Downloadable and other modules (reported by @m2-assistant[bot]) has been fixed in #32517 by @sergiy-v in 2.4-develop branch Related commits: 1. a4d981f - #32507: [Issue] Replace repetitive actions with Action Groups in AdminConfigurableProductCreateTest (reported by @m2-assistant[bot]) has been fixed in #32463 by @kate-kyzyma in 2.4-develop branch Related commits: 1. eb772c1 2. e762b52 3. 8d08e94 - #32569: [Issue] Replace repetitive actions with Action Groups in AdminConfigurableProductCreateTest (reported by @m2-assistant[bot]) has been fixed in #32463 by @kate-kyzyma in 2.4-develop branch Related commits: 1. eb772c1 2. e762b52 3. 8d08e94 - #32502: [Issue] Replace repetitive actions with Action Groups in AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest (reported by @m2-assistant[bot]) has been fixed in #32498 by @kate-kyzyma in 2.4-develop branch Related commits: 1. 920867a 2. 1e4fcb1 - #27411: Table structure issue catalog_product_entity (sku field is allowed nulls) (reported by @stephan-cream) has been fixed in #32532 by @ihor-sviziev in 2.4-develop branch Related commits: 1. a369d5a - #32525: Table structure issue catalog_product_entity (sku field is allowed nulls) (reported by @dverkade) has been fixed in #32532 by @ihor-sviziev in 2.4-develop branch Related commits: 1. a369d5a - #32495: [Issue] Add WEBP + AVIF Support by default (reported by @m2-assistant[bot]) has been fixed in #32400 by @in-session in 2.4-develop branch Related commits: 1. 59a5e8d 2. f578f02 3. 59161f2 4. 81882e7 5. 73f6c3f 6. 7e4e074 7. 760ab36 8. 1e5cf5b 9. c4bc0c1 10. c3f7262 11. 28f539b 12. 27c93ab 13. 8f4e06f 14. 9993844 15. d2bd6cf 16. d265e96 17. 203dbf4 18. 73c94d4 19. c416e6b 20. b877a4a 21. 3530c6c 22. ea1f90a 23. 9c8c61b 24. 8960823 25. 9d778c8 26. 8313833 27. de5c558 28. 5188dcf 29. 22643ae - #32379: [Issue] Replace repetitive actions with Action Groups in AdminCreateProductDuplicateUrlkeyTest (reported by @m2-assistant[bot]) has been fixed in #32288 by @kate-kyzyma in 2.4-develop branch Related commits: 1. 01c8860 - #30860: [Issue] Item resolvers should be optional (reported by @m2-assistant[bot]) has been fixed in #30823 by @thomas-kl1 in 2.4-develop branch Related commits: 1. 8ed5082 2. 8a569ee - #32644: [Issue] Fixes composer.lock file which does not contain web-token/jwt-framewo� (reported by @m2-assistant[bot]) has been fixed in #32639 by @hostep in 2.4-develop branch Related commits: 1. 2cce0aa 2. 8c05b9c 3. d4decea - #32658: [Issue] Modified the PR template to include README.md update reqirement if necessary (reported by @m2-assistant[bot]) has been fixed in #32610 by @bgorski in 2.4-develop branch Related commits: 1. 4a7159e 2. ef7009e - #32578: Missing dependency in Magento/JwtFrameworkAdapter (reported by @fooman) has been fixed in #32612 by @bgorski in 2.4-develop branch Related commits: 1. 7306e85 - #32616: [Issue] Update README.md of Google_Analytics module (reported by @m2-assistant[bot]) has been fixed in #32448 by @charles-tychons in 2.4-develop branch Related commits: 1. f55d9e6 - #4451: Fix for admin shipment, creditmemo, invoice pdf emulation (reported by @ksz2013) has been fixed in #31938 by @ProkopovVitaliy in 2.4-develop branch Related commits: 1. 98e089e 2. 4b0bf14 3. 017de9a 4. 3682d87 5. 67e3881 6. e7b3b4d 7. 8916dee - #32577: [Issue] [ReadMe] updated readMe file for Magento_Msrp-Magento_MysqlMq modules (reported by @m2-assistant[bot]) has been fixed in #31938 by @ProkopovVitaliy in 2.4-develop branch Related commits: 1. 98e089e 2. 4b0bf14 3. 017de9a 4. 3682d87 5. 67e3881 6. e7b3b4d 7. 8916dee - #32454: [Issue] Seperate js out template to avoid render issue (reported by @m2-assistant[bot]) has been fixed in #32434 by @mrtuvn in 2.4-develop branch Related commits: 1. 7e47efd - #32671: [Issue] Ensure string is returned when applying filter to email template (reported by @m2-assistant[bot]) has been fixed in #32298 by @Skullsneeze in 2.4-develop branch Related commits: 1. d6cba47 2. 06412dc 3. 28e0124 4. 4b46634 5. db048d2 - #19345: Incorrect caching subscription status in newsletter plugin (reported by @wojtekn) has been fixed in #32254 by @engcom-Charlie in 2.4-develop branch Related commits: 1. c2b038e 2. 8a90819 3. 6df702e 4. c6e170e 5. b1f9f8e 6. a82f3e9 - #31140: [Issue] Add event listeners passive for fotorama lib improves lighthouse metrics (reported by @m2-assistant[bot]) has been fixed in #31080 by @mrtuvn in 2.4-develop branch Related commits: 1. 67c2c71 - #30788: [Issue] Avoid binding magnifier events in duplicate on resize (reported by @m2-assistant[bot]) has been fixed in #30695 by @fredden in 2.4-develop branch Related commits: 1. 6bec772 2. 693e366 3. 2bb781f
magento · Apr 11, 2021 · c46d9bf · c46d9bf
2 parents 03bd130 + 1164288
commit c46d9bf
Show file tree

Hide file tree

Showing 55 changed files with 1,251 additions and 515 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -43,4 +43,5 @@
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Backend\Block\Store;
 
@@ -114,7 +115,8 @@ protected function _construct()
     {
         parent::_construct();
 
-        $this->setUseConfirm(true);
+        $this->setUseConfirm($this->hasData('use_confirm') ? (bool)$this->getData('use_confirm') : true);
+
         $this->setUseAjax(true);
 
         $this->setShowManageStoresLink(0);

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js b/app/code/Magento/Backend/view/adminhtml/web/js/store-switcher.js
@@ -0,0 +1,127 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    /**
+     * @param {Object} storeSwitchConfig
+     */
+    return function (storeSwitchConfig) {
+        var scopeSwitcherHandler;
+
+        (function () {
+            var storesList = $('[data-role=stores-list]');
+
+            storesList.on('click', '[data-value]', function (event) {
+                var val = $(event.target).data('value'),
+                    role = $(event.target).data('role'),
+                    switcher = $('[data-role=' + role + ']');
+
+                event.preventDefault();
+
+                if (!switcher.val() || val !== switcher.val()) {
+
+                    /* Set the value & trigger event */
+                    switcher.val(val).trigger('change');
+                }
+            });
+        })($);
+
+        /**
+         * Switch store scope
+         *
+         * @param {Object} obj
+         * @return void
+         */
+        function switchScope(obj) {
+            var switcher = $(obj),
+                scopeId = switcher.val(),
+                scopeParams = '',
+                switcherParams = {};
+
+            if (scopeId) {
+                scopeParams = switcher.data('param') + '/' + scopeId + '/';
+            }
+
+            if (obj.switchParams) {
+                scopeParams += obj.switchParams;
+            }
+
+            /**
+             * Reload function for switcher
+             */
+            function reload() {
+                var url;
+
+                if (!storeSwitchConfig.isUsingIframe) {
+
+                    if (storeSwitchConfig.switchUrl && storeSwitchConfig.switchUrl.length > 0) {
+                        url = storeSwitchConfig.switchUrl + scopeParams;
+
+                        /* eslint-disable no-undef */
+                        setLocation(url);
+                    }
+
+                } else {
+                    $('#preview_selected_store').val(scopeId);
+                    $('#preview_form').submit();
+
+                    $('.store-switcher .dropdown-menu li a').each(function () {
+                        var $this = $(this);
+
+                        if ($this.data('role') === 'store-view-id' && $this.data('value') === scopeId) {
+                            $('#store-change-button').html($this.text());
+                        }
+                    });
+
+                    $('#store-change-button').click();
+                }
+            }
+
+            if (typeof scopeSwitcherHandler !== 'undefined') {
+                switcherParams = {
+                    scopeId: scopeId,
+                    scopeParams: scopeParams,
+                    useConfirm: storeSwitchConfig.useConfirm
+                };
+
+                scopeSwitcherHandler(switcherParams);
+            } else if (storeSwitchConfig.useConfirm) {
+                require([
+                    'Magento_Ui/js/modal/confirm',
+                    'mage/translate'
+                ], function (confirm, $t) {
+                    confirm({
+                        content: $t('Please confirm scope switching. All data that hasn\'t been saved will be lost.'),
+                        actions: {
+
+                            /**
+                             * Confirm action
+                             */
+                            confirm: function () {
+                                reload();
+                            },
+
+                            /**
+                             * Cancel action
+                             */
+                            cancel: function () {
+                                obj.value = storeSwitchConfig.storeId ? storeSwitchConfig.storeId : '';
+                            }
+                        }
+                    });
+                });
+            } else {
+                reload();
+            }
+        }
+
+        window.scopeSwitcherHandler = scopeSwitcherHandler;
+        window.switchScope = switchScope;
+    };
+});
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverComposite.php
@@ -16,7 +16,7 @@
 class ItemResolverComposite implements ItemResolverInterface
 {
     /** @var string[] */
-    private $itemResolvers = [];
+    private $itemResolvers;
 
     /** @var ItemResolverInterface[] */
     private $itemResolversInstances = [];

diff --git a/...de/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductNameOnProductFormActionGroup.xml b/...de/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductNameOnProductFormActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminFillProductNameOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Name field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{productName}}" stepKey="fillProductName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...ode/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductQtyOnProductFormActionGroup.xml b/...ode/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductQtyOnProductFormActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminFillProductQtyOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Quantity field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productQty" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...ode/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductSkuOnProductFormActionGroup.xml b/...ode/Magento/Catalog/Test/Mftf/ActionGroup/AdminFillProductSkuOnProductFormActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminFillProductSkuOnProductFormActionGroup">
+        <annotations>
+            <description>Fills in Sku field on the Admin Products creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productSku" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{productSku}}" stepKey="fillProductSku"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml b/...Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -32,13 +32,24 @@
         <actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickAddSimpleProduct">
             <argument name="productType" value="simple"/>
         </actionGroup>
-        <fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
-        <fillField userInput="$$simpleProduct.sku$$new" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
-        <fillField userInput="$$simpleProduct.price$$" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
-        <fillField userInput="$$simpleProduct.quantity$$" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
+        <actionGroup ref="AdminFillProductNameOnProductFormActionGroup" stepKey="fillName">
+            <argument name="productName" value="$$simpleProduct.name$$new"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductSkuOnProductFormActionGroup" stepKey="fillSKU">
+            <argument name="productSku" value="$$simpleProduct.sku$$new"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductPriceFieldAndPressEnterOnProductEditPageActionGroup" stepKey="fillPrice">
+            <argument name="price" value="$$simpleProduct.price$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillProductQtyOnProductFormActionGroup" stepKey="fillQuantity">
+            <argument name="productQty" value="$$simpleProduct.quantity$$"/>
+        </actionGroup>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="$$simpleProduct.custom_attributes[url_key]$$" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
-        <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The value specified in the URL Key field would generate a URL that already exists"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/...Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml b/...Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
@@ -18,11 +18,20 @@
             <group value="product"/>
         </annotations>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminProductCreatePage.url(SimpleProduct.visibility, SimpleProduct.type_id)}}" stepKey="goToCreateProduct"/>
-        <waitForPageLoad stepKey="wait1"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="-42" stepKey="fillPrice"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="goToCreateProduct"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="wait1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillName"/>
+        <actionGroup ref="FillMainProductFormByStringActionGroup" stepKey="fillPrice">
+            <argument name="productName" value="{{SimpleProduct.name}}"/>
+            <argument name="productSku" value="{{SimpleProduct.sku}}"/>
+            <argument name="productPrice" value="-42"/>
+            <argument name="productQuantity" value="{{SimpleProduct.quantity}}"/>
+            <argument name="productStatus" value="{{SimpleProduct.status}}"/>
+            <argument name="productWeight" value="{{SimpleProduct.weight}}"/>
+        </actionGroup>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
-        <see selector="{{AdminProductFormSection.priceFieldError}}" userInput="Please enter a number 0 or greater in this field." stepKey="seePriceValidationError"/>
+        <actionGroup ref="AssertAdminValidationErrorAppearedForPriceFieldOnProductEditPageActionGroup" stepKey="seePriceValidationError">
+            <argument name="errorMessage" value="Please enter a number 0 or greater in this field."/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/...Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/...Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -25,31 +25,54 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
-        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility" stepKey="clickAddProductToggle"/>
-        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility" stepKey="waitForProductToggleToSelectProduct"/>
-        <actionGroup ref="AdminClickAddProductToggleAndSelectProductTypeActionGroup" stepKey="clickVirtualProduct">
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="openProductCatalogPage"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="clickAddProductToggle"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="waitForProductToggleToSelectProduct"/>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="clickVirtualProduct">
             <argument name="productType" value="virtual"/>
         </actionGroup>
 
         <!-- Create virtual product with required fields only -->
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
+        <actionGroup ref="FillProductNameAndSkuInProductFormActionGroup" stepKey="fillProductName">
+            <argument name="product" value="virtualProductWithRequiredFields"/>
+        </actionGroup>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="fillProductSku"/>
+        <actionGroup ref="AdminFillProductPriceFieldAndPressEnterOnProductEditPageActionGroup" stepKey="fillProductPrice">
+            <argument name="price" value="{{virtualProductWithRequiredFields.price}}"/>
+        </actionGroup>
         <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
-        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeAssertVirtualProductSuccessMessage">
+            <argument name="message" value="You saved the product."/>
+        </actionGroup>
 
         <!-- Verify we see created virtual product(from the above step) on the product grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
-        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
-        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
-        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillVirtualProductSku"/>
-        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch2"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
-        <seeInField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="seeVirtualProductName"/>
-        <seeInField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="seeVirtualProductSku"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="clickSelector"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="clickFilter"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="fillProductName1"/>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="fillVirtualProductSku"/>
+        <actionGroup ref="FilterProductGridBySkuAndNameActionGroup" stepKey="clickSearch2">
+            <argument name="product" value="virtualProductWithRequiredFields"/>
+        </actionGroup>
+        <comment userInput="Adding the comment to replace clickAddProductToggle action for preserving Backward Compatibility"
+                 stepKey="waitForProductSearch"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeVirtualProductName">
+            <argument name="column" value="Name"/>
+            <argument name="value" value="{{virtualProductWithRequiredFields.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="{{virtualProductWithRequiredFields.sku}}"/>
+        </actionGroup>
     </test>
 </tests>