fix: addToCart takes actual product code into account

feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.spec.ts

@@ -1,19 +1,28 @@
-import { ElementRef, ViewContainerRef } from '@angular/core';
+import { AbstractType, ElementRef, ViewContainerRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import {
   CartAddEntryFailEvent,
+  CartAddEntrySuccessEvent,
   CartUiEventAddToCart,
 } from '@spartacus/cart/base/root';
-import { CxEvent, EventService } from '@spartacus/core';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import { CxEvent, EventService, FeatureConfigService } from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
 import { AddedToCartDialogEventListener } from './added-to-cart-dialog-event.listener';
 
 const mockEventStream$ = new BehaviorSubject<CxEvent>({});
+const mockEventSuccessStream$ = new BehaviorSubject<CxEvent>({});
 
 class MockEventService implements Partial<EventService> {
-  get(): Observable<any> {
-    return mockEventStream$.asObservable();
+  get<T>(eventType: AbstractType<T>): Observable<T> {
+    if (
+      eventType.name === CartUiEventAddToCart.type ||
+      eventType.name === CartAddEntryFailEvent.type
+    ) {
+      return mockEventStream$.asObservable() as Observable<T>;
+    } else {
+      return mockEventSuccessStream$.asObservable() as Observable<T>;
+    }
   }
 }
 
@@ -29,6 +38,7 @@ class MockLaunchDialogService implements Partial<LaunchDialogService> {
 }
 
 const mockEvent = new CartUiEventAddToCart();
+const mockSuccessEvent = new CartAddEntrySuccessEvent();
 mockEvent.productCode = 'test';
 mockEvent.quantity = 3;
 mockEvent.numberOfEntriesBeforeAdd = 1;
@@ -37,9 +47,10 @@ mockEvent.pickupStoreName = 'testStore';
 const mockFailEvent = new CartAddEntryFailEvent();
 mockFailEvent.error = {};
 
-describe('AddToCartDialogEventListener', () => {
+describe('AddedToCartDialogEventListener', () => {
   let listener: AddedToCartDialogEventListener;
   let launchDialogService: LaunchDialogService;
+  let featureConfigService: FeatureConfigService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -56,34 +67,66 @@ describe('AddToCartDialogEventListener', () => {
       ],
     });
 
-    listener = TestBed.inject(AddedToCartDialogEventListener);
+    featureConfigService = TestBed.inject(FeatureConfigService);
     launchDialogService = TestBed.inject(LaunchDialogService);
   });
 
   describe('onAddToCart', () => {
-    it('Should open modal on event', () => {
+    it('should open modal on event CartAddEntrySuccessEvent in case the toggle is active', () => {
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
+      listener = TestBed.inject(AddedToCartDialogEventListener);
+      spyOn(listener as any, 'openModalAfterSuccess').and.stub();
+      mockEventSuccessStream$.next(mockSuccessEvent);
+      expect(listener['openModalAfterSuccess']).toHaveBeenCalledWith(
+        mockSuccessEvent
+      );
+    });
+
+    it('should not open modal on event CartAddEntrySuccessEvent in case the toggle is inactive', () => {
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(false);
+      listener = TestBed.inject(AddedToCartDialogEventListener);
+      spyOn(listener as any, 'openModalAfterSuccess').and.stub();
+      mockEventSuccessStream$.next(mockSuccessEvent);
+      expect(listener['openModalAfterSuccess']).not.toHaveBeenCalled();
+    });
+
+    it('should open modal on event CartUiEventAddToCart in case the toggle is inactive', () => {
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(false);
+      listener = TestBed.inject(AddedToCartDialogEventListener);
       spyOn(listener as any, 'openModal').and.stub();
       mockEventStream$.next(mockEvent);
       expect(listener['openModal']).toHaveBeenCalledWith(mockEvent);
     });
 
-    it('Should close modal on fail event', () => {
+    it('should not open modal on event CartUiEventAddToCart in case the toggle is active', () => {
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(true);
+      listener = TestBed.inject(AddedToCartDialogEventListener);
+      spyOn(listener as any, 'openModal').and.stub();
+      mockEventStream$.next(mockEvent);
+      expect(listener['openModal']).not.toHaveBeenCalled();
+    });
+
+    it('should close modal on fail event in case toggle is inactive', () => {
+      spyOn(featureConfigService, 'isEnabled').and.returnValue(false);
+      listener = TestBed.inject(AddedToCartDialogEventListener);
       spyOn(listener as any, 'closeModal').and.stub();
       mockEventStream$.next(mockFailEvent);
       expect(listener['closeModal']).toHaveBeenCalledWith(mockFailEvent);
     });
   });
 
   describe('openModal', () => {
-    it('Should open the add to cart dialog', () => {
+    it('should open the add to cart dialog', () => {
+      listener = TestBed.inject(AddedToCartDialogEventListener);
       spyOn(launchDialogService, 'openDialog').and.callThrough();
       listener['openModal'](mockEvent);
       expect(launchDialogService.openDialog).toHaveBeenCalled();
     });
   });
 
   describe('closeModal', () => {
-    it('Should close the add to cart dialog', () => {
+    it('should close the add to cart dialog', () => {
+      listener = TestBed.inject(AddedToCartDialogEventListener);
       spyOn(launchDialogService, 'closeDialog').and.stub();
       listener['closeModal']('reason');
       expect(launchDialogService.closeDialog).toHaveBeenCalledWith('reason');

feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts

@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
 import {
   CartAddEntryFailEvent,
+  CartAddEntrySuccessEvent,
   CartUiEventAddToCart,
 } from '@spartacus/cart/base/root';
-import { EventService } from '@spartacus/core';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import { EventService, FeatureConfigService } from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 
@@ -19,6 +20,7 @@ import { take } from 'rxjs/operators';
 })
 export class AddedToCartDialogEventListener implements OnDestroy {
   protected subscription = new Subscription();
+  private featureConfig = inject(FeatureConfigService);
 
   constructor(
     protected eventService: EventService,
@@ -28,19 +30,33 @@ export class AddedToCartDialogEventListener implements OnDestroy {
   }
 
   protected onAddToCart() {
-    this.subscription.add(
-      this.eventService.get(CartUiEventAddToCart).subscribe((event) => {
-        this.openModal(event);
-      })
-    );
-
-    this.subscription.add(
-      this.eventService.get(CartAddEntryFailEvent).subscribe((event) => {
-        this.closeModal(event);
-      })
-    );
+    if (
+      this.featureConfig.isEnabled('adddedToCartDialogDrivenBySuccessEvent')
+    ) {
+      this.subscription.add(
+        this.eventService
+          .get(CartAddEntrySuccessEvent)
+          .subscribe((successEvent) => {
+            this.openModalAfterSuccess(successEvent);
+          })
+      );
+    } else {
+      this.subscription.add(
+        this.eventService.get(CartUiEventAddToCart).subscribe((event) => {
+          this.openModal(event);
+        })
+      );
+      this.subscription.add(
+        this.eventService.get(CartAddEntryFailEvent).subscribe((event) => {
+          this.closeModal(event);
+        })
+      );
+    }
   }
-
+  /**
+   * Opens modal based on CartUiEventAddToCart.
+   * @param event Signals that a product has been added to the cart.
+   */
   protected openModal(event: CartUiEventAddToCart): void {
     const addToCartData = {
       productCode: event.productCode,
@@ -61,6 +77,32 @@ export class AddedToCartDialogEventListener implements OnDestroy {
     }
   }
 
+  /**
+   * Opens modal after addToCart has been successfully performed.
+   * @param successEvent Signals that the backend call succeeded.
+   */
+  protected openModalAfterSuccess(
+    successEvent: CartAddEntrySuccessEvent
+  ): void {
+    const addToCartData = {
+      productCode: successEvent.productCode,
+      quantity: successEvent.quantity,
+      numberOfEntriesBeforeAdd: successEvent.numberOfEntriesBeforeAdd,
+      pickupStoreName: successEvent.pickupStore,
+    };
+
+    const dialog = this.launchDialogService.openDialog(
+      LAUNCH_CALLER.ADDED_TO_CART,
+      undefined,
+      undefined,
+      addToCartData
+    );
+
+    if (dialog) {
+      dialog.pipe(take(1)).subscribe();
+    }
+  }
+
   protected closeModal(reason?: any): void {
     this.launchDialogService.closeDialog(reason);
   }

feature-libs/cart/base/core/facade/active-cart.service.spec.ts

@@ -1,16 +1,16 @@
 import { TestBed } from '@angular/core/testing';
 import { Cart, MultiCartFacade, OrderEntry } from '@spartacus/cart/base/root';
 import {
-  getLastValueSync,
   OCC_CART_ID_CURRENT,
   OCC_USER_ID_ANONYMOUS,
   OCC_USER_ID_CURRENT,
   OCC_USER_ID_GUEST,
   StateUtils,
   UserIdService,
   WindowRef,
+  getLastValueSync,
 } from '@spartacus/core';
-import { BehaviorSubject, EMPTY, Observable, of, Subject } from 'rxjs';
+import { BehaviorSubject, EMPTY, Observable, Subject, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { ActiveCartService } from './active-cart.service';
 
@@ -457,9 +457,10 @@ describe('ActiveCartService', () => {
   });
 
   describe('addEntry', () => {
+    const entries = [{}, {}, {}];
     it('should just add entry after cart is provided', () => {
       spyOn<any>(service, 'requireLoadedCart').and.returnValue(
-        of({ code: 'code', guid: 'guid' })
+        of({ code: 'code', guid: 'guid', entries: entries })
       );
       spyOn(multiCartFacade, 'addEntry').and.callThrough();
       userId$.next(OCC_USER_ID_ANONYMOUS);
@@ -471,13 +472,14 @@ describe('ActiveCartService', () => {
         'guid',
         'productCode',
         2,
-        undefined
+        undefined,
+        3
       );
     });
 
     it('should handle pickup in store', () => {
       spyOn<any>(service, 'requireLoadedCart').and.returnValue(
-        of({ code: 'code', guid: 'guid' })
+        of({ code: 'code', guid: 'guid', entries: entries })
       );
       spyOn(multiCartFacade, 'addEntry').and.callThrough();
       userId$.next(OCC_USER_ID_ANONYMOUS);
@@ -489,7 +491,8 @@ describe('ActiveCartService', () => {
         'guid',
         'productCode',
         2,
-        'pickupStore'
+        'pickupStore',
+        3
       );
     });
   });

feature-libs/cart/base/core/facade/active-cart.service.ts

@@ -441,7 +441,8 @@ export class ActiveCartService implements ActiveCartFacade, OnDestroy {
           getCartIdByUserId(cart, userId),
           productCode,
           quantity,
-          pickupStore
+          pickupStore,
+          cart.entries?.length
         );
       });
   }

feature-libs/cart/base/core/facade/multi-cart.service.spec.ts

@@ -401,12 +401,13 @@ describe('MultiCartService', () => {
           productCode: 'productCode',
           quantity: 2,
           pickupStore: undefined,
+          numberOfEntriesBeforeAdd: undefined,
         })
       );
     });
 
     it('should dispatch addEntry action with pickupStore', () => {
-      service.addEntry('userId', 'cartId', 'productCode', 2, 'pickupStore');
+      service.addEntry('userId', 'cartId', 'productCode', 2, 'pickupStore', 3);
 
       expect(store.dispatch).toHaveBeenCalledWith(
         new CartActions.CartAddEntry({
@@ -415,6 +416,7 @@ describe('MultiCartService', () => {
           productCode: 'productCode',
           quantity: 2,
           pickupStore: 'pickupStore',
+          numberOfEntriesBeforeAdd: 3,
         })
       );
     });

feature-libs/cart/base/core/facade/multi-cart.service.ts

@@ -227,7 +227,8 @@ export class MultiCartService implements MultiCartFacade {
     cartId: string,
     productCode: string,
     quantity: number,
-    pickupStore?: string
+    pickupStore?: string,
+    numberOfEntriesBeforeAdd?: number
   ): void {
     this.store.dispatch(
       new CartActions.CartAddEntry({
@@ -236,6 +237,7 @@ export class MultiCartService implements MultiCartFacade {
         productCode,
         quantity,
         pickupStore,
+        numberOfEntriesBeforeAdd,
       })
     );
   }

feature-libs/cart/base/core/store/actions/cart-entry.action.ts

@@ -28,6 +28,7 @@ export class CartAddEntry extends StateUtils.EntityProcessesIncrementAction {
       productCode: string;
       quantity: number;
       pickupStore?: string;
+      numberOfEntriesBeforeAdd?: number;
     }
   ) {
     super(MULTI_CART_DATA, payload.cartId);
@@ -48,6 +49,7 @@ export class CartAddEntrySuccess extends StateUtils.EntityProcessesDecrementActi
       quantityAdded?: number;
       statusCode?: string;
       statusMessage?: string;
+      numberOfEntriesBeforeAdd?: number;
     }
   ) {
     super(MULTI_CART_DATA, payload.cartId);

feature-libs/cart/base/core/store/effects/cart-entry.effect.spec.ts

@@ -11,6 +11,8 @@ import { CartActions } from '../actions/index';
 import * as fromEffects from './cart-entry.effect';
 import createSpy = jasmine.createSpy;
 
+const replacedProductCode = 'replacedProduct';
+
 const MockOccModuleConfig: OccConfig = {
   backend: {
     occ: {
@@ -31,7 +33,7 @@ describe('Cart effect', () => {
   beforeEach(() => {
     mockCartModification = {
       deliveryModeChanged: true,
-      entry: {},
+      entry: { product: { code: replacedProductCode } },
       quantity: 1,
       quantityAdded: 1,
       statusCode: 'statusCode',
@@ -68,7 +70,7 @@ describe('Cart effect', () => {
       const completion = new CartActions.CartAddEntrySuccess({
         userId,
         cartId,
-        productCode: 'testProductCode',
+        productCode: replacedProductCode,
         ...mockCartModification,
       });
 
@@ -89,7 +91,7 @@ describe('Cart effect', () => {
       const completion = new CartActions.CartAddEntrySuccess({
         userId,
         cartId,
-        productCode: 'testProductCode',
+        productCode: replacedProductCode,
         pickupStore: 'pickupStore',
         ...mockCartModification,
       });