feat: display loading overlay for basket merge

intershop · Apr 21, 2022 · 811b540 · 811b540
1 parent 722e760
commit 811b540
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/app/core/store/customer/basket/basket.actions.ts b/src/app/core/store/customer/basket/basket.actions.ts
@@ -86,6 +86,8 @@ export const addItemsToBasketSuccess = createAction(
   payload<{ info: BasketInfo[]; items: SkuQuantityType[] }>()
 );
 
+export const mergeBasketInProgress = createAction('[Basket API] Merge two baskets in progress');
+
 export const mergeBasketFail = createAction('[Basket API] Merge two baskets Fail', httpError());
 
 export const mergeBasketSuccess = createAction('[Basket API] Merge two baskets Success', payload<{ basket: Basket }>());

diff --git a/src/app/core/store/customer/basket/basket.effects.ts b/src/app/core/store/customer/basket/basket.effects.ts
@@ -42,6 +42,7 @@ import {
   loadBasketSuccess,
   loadBasketWithId,
   mergeBasketFail,
+  mergeBasketInProgress,
   mergeBasketSuccess,
   resetBasketErrors,
   setBasketAttribute,
@@ -278,7 +279,8 @@ export class BasketEffects {
                     .mergeBasket(sourceBasketId, sourceApiToken, newOrCurrentUserBasket.id)
                     .pipe(map(basket => mergeBasketSuccess({ basket })))
                 ),
-                mapErrorToAction(mergeBasketFail)
+                mapErrorToAction(mergeBasketFail),
+                startWith(mergeBasketInProgress())
               );
             } else if (baskets.length) {
               // no anonymous basket exists and user already has a basket -> load it

diff --git a/src/app/core/store/customer/basket/basket.reducer.ts b/src/app/core/store/customer/basket/basket.reducer.ts
@@ -46,6 +46,7 @@ import {
   loadBasketSuccess,
   loadBasketWithId,
   mergeBasketFail,
+  mergeBasketInProgress,
   mergeBasketSuccess,
   removePromotionCodeFromBasket,
   removePromotionCodeFromBasketFail,
@@ -134,7 +135,8 @@ export const basketReducer = createReducer(
     deleteBasketPayment,
     submitBasket,
     updateConcardisCvcLastUpdated,
-    startCheckout
+    startCheckout,
+    mergeBasketInProgress
   ),
   unsetLoadingOn(addPromotionCodeToBasketSuccess, addPromotionCodeToBasketFail),
   unsetLoadingAndErrorOn(

diff --git a/src/app/core/store/customer/customer-store.spec.ts b/src/app/core/store/customer/customer-store.spec.ts
@@ -29,7 +29,7 @@ import { UserService } from 'ish-core/services/user/user.service';
 import { CoreStoreModule } from 'ish-core/store/core/core-store.module';
 import { CustomerStoreModule } from 'ish-core/store/customer/customer-store.module';
 import { loadProductSuccess } from 'ish-core/store/shopping/products';
-import { SHOPPING_STORE_CONFIG, ShoppingStoreModule } from 'ish-core/store/shopping/shopping-store.module';
+import { ShoppingStoreModule } from 'ish-core/store/shopping/shopping-store.module';
 import { CookiesService } from 'ish-core/utils/cookies/cookies.service';
 import { StoreWithSnapshots, provideStoreSnapshots } from 'ish-core/utils/dev/ngrx-testing';
 import { categoryTree } from 'ish-core/utils/dev/test-data-utils';
@@ -179,7 +179,6 @@ describe('Customer Store', () => {
         { provide: PricesService, useFactory: () => instance(productPriceServiceMock) },
         { provide: ProductsService, useFactory: () => instance(productsServiceMock) },
         { provide: PromotionsService, useFactory: () => instance(promotionsServiceMock) },
-        { provide: SHOPPING_STORE_CONFIG, useValue: {} },
         { provide: SuggestService, useFactory: () => instance(mock(SuggestService)) },
         { provide: UserService, useFactory: () => instance(userServiceMock) },
         provideStoreSnapshots(),
@@ -225,6 +224,7 @@ describe('Customer Store', () => {
           [User API] Login User Success:
             customer: {"isBusinessCustomer":false,"customerNo":"test"}
             user: {"title":"","firstName":"test","lastName":"test","phoneHome"...
+          [Basket API] Merge two baskets in progress
           [Basket API] Merge two baskets Success:
             basket: {"id":"test","lineItems":[1]}
         `);