Merge branch 'ACP2E-227' of https://github.com/magento-l3/magento2ce into L3-PR-20211001

Author: ArtemVasyliev

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddressDeletedStreetAddressRemainsEmptyAfterRefreshTest.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontAddressDeletedStreetAddressRemainsEmptyAfterRefreshTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Guest checkout"/>
+            <title value="Address Street Field Remain Empty when deleted even After Browser Refresh"/>
+            <description value="Address Street Field Remain Empty when deleted even After Browser Refresh"/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-43255"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="simpleProductWithoutCategory" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+        </after>
+        <!--Step 1 Add simple product to the cart -->
+        <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$createSimpleProduct$"/>
+        </actionGroup>
+
+        <!--Step 2 Proceed to Checkout and be on Shipping page -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckout"/>
+
+        <!--Step 3 Select Country as United Kingdom, select address street and Refresh the page-->
+        <selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{UK_Address.country_id}}" stepKey="selectUnitedKingdomCounty"/>
+        <waitForPageLoad stepKey="waitFormToReloadAfterSelectCountry"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="enterAddressStreet"/>
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPageAfterAddressIsAdded"/>
+        <!-- Step 4 Assert Entered details should be retained and delete an address -->
+        <seeInField selector="{{CheckoutShippingSection.street}}" userInput="{{UK_Address.street[0]}}" stepKey="seeAddressStreetUnitedKingdom"/>
+        <clearField selector="{{CheckoutShippingSection.street}}" stepKey="deleteAddressStreet"/>
+        <!-- Assert Entered details should be retained and State/Province field should be displayed as an optional field (without * ) -->
+        <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPageAfterAddressIsDeleted"/>
+        <seeInField selector="{{CheckoutShippingSection.street}}" userInput="" stepKey="seeAddressStreetIsempty"/>
+    </test>
+</tests>

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -120,8 +120,36 @@ define([
                         $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
                     );
                 }
-                checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    if (shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0])) {
+                checkoutProvider.on('shippingAddress', function (shippingAddrsData, changes) {
+                    var isStreetAddressDeleted, isStreetAddressNotEmpty;
+
+                    /**
+                     * In last modifying operation street address was deleted.
+                     * @return {Boolean}
+                     */
+                    isStreetAddressDeleted = function () {
+                        var change;
+
+                        if (!changes || changes.length === 0) {
+                            return false;
+                        }
+
+                        change = changes.pop();
+
+                        if (_.isUndefined(change.value) || _.isUndefined(change.oldValue)) {
+                            return false;
+                        }
+
+                        if (!change.path.startsWith('shippingAddress.street')) {
+                            return false;
+                        }
+
+                        return change.value.length === 0 && change.oldValue.length > 0;
+                    };
+
+                    isStreetAddressNotEmpty = shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0]);
+
+                    if (isStreetAddressNotEmpty || isStreetAddressDeleted()) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
                 });