From ab71c101808658554caf10909048cd493c37a163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Pawe=C5=82czak?= <krzysztof.pawelczak@sap.com>
Date: Thu, 22 Jun 2023 14:29:47 +0200
Subject: [PATCH 1/2] feat: pre-fill delivery address for guest users

---
 .../checkout-delivery-address.component.html  |  1 +
 .../checkout-delivery-address.component.ts    | 46 ++++++++++++++++++-
 .../services/checkout-config.service.ts       |  4 ++
 .../base/root/config/checkout-config.ts       |  4 ++
 4 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
index 383b844b7d0..f8fb7919119 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
@@ -78,6 +78,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
         <cx-address-form
           [showTitleCode]="true"
           [setAsDefaultField]="!isGuestCheckout"
+          [addressData]="selectedAddress"
           cancelBtnLabel="{{ backBtnText | cxTranslate }}"
           (backToAddress)="hideNewAddressForm(true)"
           (submitAddress)="addAddress($event)"
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
index 2c37332e983..881819fe6a2 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
 import {
@@ -29,6 +34,7 @@ import {
   tap,
 } from 'rxjs/operators';
 import { CheckoutStepService } from '../services/checkout-step.service';
+import { CheckoutConfigService } from '../services';
 
 export interface CardWithAddress {
   card: Card;
@@ -49,6 +55,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   addressFormOpened = false;
   doneAutoSelect = false;
 
+  selectedAddress?: Address;
+
   get isGuestCheckout(): boolean {
     return !!getLastValueSync(this.activeCartFacade.isGuestCart());
   }
@@ -65,6 +73,30 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     );
   }
 
+  // TODO(CXSPA-): make checkoutConfigService a required dependency
+  constructor(
+    userAddressService: UserAddressService,
+    checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
+    activatedRoute: ActivatedRoute,
+    translationService: TranslationService,
+    activeCartFacade: ActiveCartFacade,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    globalMessageService: GlobalMessageService
+  );
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    userAddressService: UserAddressService,
+    checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
+    activatedRoute: ActivatedRoute,
+    translationService: TranslationService,
+    activeCartFacade: ActiveCartFacade,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    globalMessageService: GlobalMessageService
+  );
   constructor(
     protected userAddressService: UserAddressService,
     protected checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
@@ -73,7 +105,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     protected activeCartFacade: ActiveCartFacade,
     protected checkoutStepService: CheckoutStepService,
     protected checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
-    protected globalMessageService: GlobalMessageService
+    protected globalMessageService: GlobalMessageService,
+    @Optional() protected checkoutConfigService?: CheckoutConfigService
   ) {}
 
   ngOnInit(): void {
@@ -137,6 +170,10 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   }
 
   addAddress(address: Address | undefined): void {
+    if (!address && this.selectedAddress) {
+      this.next();
+    }
+
     if (!address) {
       return;
     }
@@ -242,6 +279,11 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
         this.setAddress(selected);
       }
       this.doneAutoSelect = true;
+    } else if (
+      selected &&
+      this.checkoutConfigService?.shouldUseAddressSavedInCart()
+    ) {
+      this.selectedAddress = selected;
     }
   }
 
diff --git a/feature-libs/checkout/base/components/services/checkout-config.service.ts b/feature-libs/checkout/base/components/services/checkout-config.service.ts
index 223120b8924..b260cb4485e 100644
--- a/feature-libs/checkout/base/components/services/checkout-config.service.ts
+++ b/feature-libs/checkout/base/components/services/checkout-config.service.ts
@@ -76,6 +76,10 @@ export class CheckoutConfigService {
       : this.findMatchingDeliveryMode(deliveryModes, index + 1);
   }
 
+  shouldUseAddressSavedInCart(): boolean {
+    return this.checkoutConfig?.checkout?.guestUseSavedAddress;
+  }
+
   getPreferredDeliveryMode(deliveryModes: DeliveryMode[]): string | undefined {
     deliveryModes.sort(this.compareDeliveryCost);
     return this.findMatchingDeliveryMode(deliveryModes);
diff --git a/feature-libs/checkout/base/root/config/checkout-config.ts b/feature-libs/checkout/base/root/config/checkout-config.ts
index f36231d8fa5..284309c63b9 100644
--- a/feature-libs/checkout/base/root/config/checkout-config.ts
+++ b/feature-libs/checkout/base/root/config/checkout-config.ts
@@ -36,6 +36,10 @@ export abstract class CheckoutConfig {
      * Allow for guest checkout.
      */
     guest?: boolean;
+    /**
+     * Use delivery address saved in cart for pre-filling delivery address form.
+     */
+    guestUseSavedAddress?: boolean;
   };
 }
 

From cc62a108b78e2890a48771905834a95cd23ae87d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Pawe=C5=82czak?= <krzysztof.pawelczak@sap.com>
Date: Thu, 22 Jun 2023 14:49:03 +0200
Subject: [PATCH 2/2] fix ci

---
 .../checkout-delivery-address.component.ts    | 19 +++++++++++++------
 .../services/checkout-config.service.ts       |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
index 881819fe6a2..3c09d17373e 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
@@ -82,7 +82,9 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     activeCartFacade: ActiveCartFacade,
     checkoutStepService: CheckoutStepService,
     checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
-    globalMessageService: GlobalMessageService
+    globalMessageService: GlobalMessageService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    checkoutConfigService: CheckoutConfigService
   );
   /**
    * @deprecated since 6.2
@@ -170,7 +172,11 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   }
 
   addAddress(address: Address | undefined): void {
-    if (!address && this.selectedAddress) {
+    if (
+      !address &&
+      this.shouldUseAddressSavedInCart() &&
+      this.selectedAddress
+    ) {
       this.next();
     }
 
@@ -279,10 +285,7 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
         this.setAddress(selected);
       }
       this.doneAutoSelect = true;
-    } else if (
-      selected &&
-      this.checkoutConfigService?.shouldUseAddressSavedInCart()
-    ) {
+    } else if (selected && this.shouldUseAddressSavedInCart()) {
       this.selectedAddress = selected;
     }
   }
@@ -338,4 +341,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   protected onError(): void {
     this.busy$.next(false);
   }
+
+  protected shouldUseAddressSavedInCart(): boolean {
+    return !!this.checkoutConfigService?.shouldUseAddressSavedInCart();
+  }
 }
diff --git a/feature-libs/checkout/base/components/services/checkout-config.service.ts b/feature-libs/checkout/base/components/services/checkout-config.service.ts
index b260cb4485e..81fdc9f9cf2 100644
--- a/feature-libs/checkout/base/components/services/checkout-config.service.ts
+++ b/feature-libs/checkout/base/components/services/checkout-config.service.ts
@@ -77,7 +77,7 @@ export class CheckoutConfigService {
   }
 
   shouldUseAddressSavedInCart(): boolean {
-    return this.checkoutConfig?.checkout?.guestUseSavedAddress;
+    return !!this.checkoutConfig?.checkout?.guestUseSavedAddress;
   }
 
   getPreferredDeliveryMode(deliveryModes: DeliveryMode[]): string | undefined {