fix: ensure only one REST call is executed to get eligible shipping/p…

…ayment methods on checkout pages
intershop · Aug 2, 2021 · f19434d · f19434d
1 parent 8e2f66f
commit f19434d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/app/pages/checkout-payment/checkout-payment-page.component.ts b/src/app/pages/checkout-payment/checkout-payment-page.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { filter, first, map, takeUntil, withLatestFrom } from 'rxjs/operators';
+import { filter, first, map, shareReplay, takeUntil, withLatestFrom } from 'rxjs/operators';
 
 import { CheckoutFacade } from 'ish-core/facades/checkout.facade';
 import { BasketView } from 'ish-core/models/basket/basket.model';
@@ -29,7 +29,7 @@ export class CheckoutPaymentPageComponent implements OnInit, OnDestroy {
     this.basketError$ = this.checkoutFacade.basketError$;
     this.loading$ = this.checkoutFacade.basketLoading$;
     this.priceType$ = this.checkoutFacade.priceType$;
-    this.paymentMethods$ = this.checkoutFacade.eligiblePaymentMethods$();
+    this.paymentMethods$ = this.checkoutFacade.eligiblePaymentMethods$().pipe(shareReplay(1));
 
     // if there is only one eligible payment method without parameters, assign it automatically to the basket
     this.paymentMethods$

diff --git a/src/app/pages/checkout-shipping/checkout-shipping-page.component.ts b/src/app/pages/checkout-shipping/checkout-shipping-page.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { Observable, Subject, combineLatest } from 'rxjs';
-import { take, takeUntil } from 'rxjs/operators';
+import { shareReplay, take, takeUntil } from 'rxjs/operators';
 
 import { AccountFacade } from 'ish-core/facades/account.facade';
 import { CheckoutFacade } from 'ish-core/facades/checkout.facade';
@@ -34,7 +34,7 @@ export class CheckoutShippingPageComponent implements OnInit, OnDestroy {
     this.basket$ = this.checkoutFacade.basket$;
     this.loading$ = this.checkoutFacade.basketLoading$;
     this.basketError$ = this.checkoutFacade.basketError$;
-    this.shippingMethods$ = this.checkoutFacade.eligibleShippingMethods$();
+    this.shippingMethods$ = this.checkoutFacade.eligibleShippingMethods$().pipe(shareReplay(1));
     this.isBusinessCustomer$ = this.accountFacade.isBusinessCustomer$;
   }