introduce guard to change routing targets if quote cart

feature-libs/cart/base/root/cart-base-root.module.ts

@@ -22,6 +22,7 @@ import {
   MINI_CART_FEATURE,
 } from './feature-name';
 import { ActiveCartOrderEntriesContextToken } from './tokens/context';
+import { QuoteCartGuard } from './guards/quote-cart.guard';
 
 export function defaultCartComponentsConfig() {
   const config = {
@@ -63,7 +64,7 @@ export function defaultCartComponentsConfig() {
       {
         // @ts-ignore
         path: null,
-        canActivate: [CmsPageGuard],
+        canActivate: [CmsPageGuard, QuoteCartGuard],
         component: PageLayoutComponent,
         data: {
           cxRoute: 'cart',

feature-libs/cart/base/root/guards/index.ts

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './quote-cart.service';
+export * from './quote-cart.guard';

feature-libs/cart/base/root/guards/quote-cart.guard.ts

@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { CanActivate, UrlTree } from '@angular/router';
+
+import { Observable, combineLatest } from 'rxjs';
+import { QuoteCartService } from './quote-cart.service';
+import { map } from 'rxjs/operators';
+import { RoutingService } from '@spartacus/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QuoteCartGuard implements CanActivate {
+  constructor(
+    protected routingService: RoutingService,
+    protected quoteCartService: QuoteCartService
+  ) {}
+  canActivate(): Observable<boolean | UrlTree> {
+    return combineLatest([
+      this.quoteCartService.getQuoteCartActive(),
+      this.quoteCartService.getQuoteId(),
+    ]).pipe(
+      map(([isQuoteCartActive, quoteId]) => {
+        if (isQuoteCartActive) {
+          this.routingService.go({
+            cxRoute: 'quoteDetails',
+            params: { quoteId: quoteId },
+          });
+          return false;
+        }
+        return true;
+      })
+    );
+  }
+}

feature-libs/cart/base/root/guards/quote-cart.service.ts

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { Observable, ReplaySubject } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QuoteCartService {
+  private quoteId: Observable<string> = new ReplaySubject<string>(1);
+  private quoteCartActive: Observable<boolean> = new ReplaySubject<boolean>(1);
+
+  constructor() {
+    (this.quoteCartActive as ReplaySubject<boolean>).next(false);
+    (this.quoteId as ReplaySubject<string>).next('');
+  }
+
+  public setQuoteId(quoteId: string): void {
+    (this.quoteId as ReplaySubject<string>).next(quoteId);
+  }
+
+  public getQuoteId(): Observable<string> {
+    return this.quoteId;
+  }
+
+  public setQuoteCartActive(quoteCartActive: boolean): void {
+    (this.quoteCartActive as ReplaySubject<boolean>).next(quoteCartActive);
+  }
+
+  public getQuoteCartActive(): Observable<boolean> {
+    return this.quoteCartActive;
+  }
+}

feature-libs/cart/base/root/public_api.ts

@@ -12,6 +12,7 @@ export * from './facade/index';
 export * from './feature-name';
 export * from './models/index';
 export * from './tokens/index';
+export * from './guards/index';
 
 /** AUGMENTABLE_TYPES_START */
 export { Cart, DeliveryMode, OrderEntry } from './models/cart.model';

feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.module.ts

@@ -11,6 +11,7 @@ import { CartNotEmptyGuard } from '../guards/cart-not-empty.guard';
 import { CheckoutAuthGuard } from '../guards/checkout-auth.guard';
 import { CheckoutGuard } from '../guards/checkout.guard';
 import { CheckoutOrchestratorComponent } from './checkout-orchestrator.component';
+import { QuoteCartGuard } from '@spartacus/cart/base/root';
 
 @NgModule({
   imports: [CommonModule],
@@ -19,7 +20,12 @@ import { CheckoutOrchestratorComponent } from './checkout-orchestrator.component
       cmsComponents: {
         CheckoutOrchestrator: {
           component: CheckoutOrchestratorComponent,
-          guards: [CheckoutAuthGuard, CartNotEmptyGuard, CheckoutGuard],
+          guards: [
+            QuoteCartGuard,
+            CheckoutAuthGuard,
+            CartNotEmptyGuard,
+            CheckoutGuard,
+          ],
         },
       },
     }),

feature-libs/quote/components/quote-actions-by-role/quote-actions-by-role.module.ts

@@ -28,7 +28,11 @@ import { QuoteActionsByRoleComponent } from './quote-actions-by-role.component';
             QuoteActionType.SUBMIT,
           ],
           actionsOrderByState: {
-            BUYER_DRAFT: [QuoteActionType.CANCEL, QuoteActionType.SUBMIT],
+            BUYER_DRAFT: [
+              QuoteActionType.CANCEL,
+              QuoteActionType.EDIT,
+              QuoteActionType.SUBMIT,
+            ],
             BUYER_OFFER: [
               QuoteActionType.CANCEL,
               QuoteActionType.EDIT,

feature-libs/quote/core/event/quote-added-to-cart-event.listener.spec.ts

@@ -0,0 +1,51 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  CartAddEntryFailEvent,
+  CartUiEventAddToCart,
+} from '@spartacus/cart/base/root';
+import { CxEvent, EventService } from '@spartacus/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { QuoteAddedToCartEventListener } from './quote-added-to-cart-event.listener';
+
+const mockEventStream$ = new BehaviorSubject<CxEvent>({});
+
+class MockEventService implements Partial<EventService> {
+  get(): Observable<any> {
+    return mockEventStream$.asObservable();
+  }
+  dispatch() {}
+}
+
+const mockEvent = new CartUiEventAddToCart();
+mockEvent.productCode = 'test';
+mockEvent.quantity = 3;
+mockEvent.numberOfEntriesBeforeAdd = 1;
+mockEvent.pickupStoreName = 'testStore';
+
+const mockFailEvent = new CartAddEntryFailEvent();
+mockFailEvent.error = {};
+
+describe('AddToCartDialogEventListener', () => {
+  let listener: QuoteAddedToCartEventListener;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        QuoteAddedToCartEventListener,
+        {
+          provide: EventService,
+          useClass: MockEventService,
+        },
+      ],
+    });
+
+    listener = TestBed.inject(QuoteAddedToCartEventListener);
+  });
+
+  describe('onAddToCart', () => {
+    it('Should ', () => {
+      expect(listener).toBeDefined();
+      mockEventStream$.next(mockEvent);
+    });
+  });
+});

feature-libs/quote/core/event/quote-added-to-cart-event.listener.ts

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable, OnDestroy } from '@angular/core';
+import { CartUiEventAddToCart } from '@spartacus/cart/base/root';
+import { EventService } from '@spartacus/core';
+import { QuoteDetailsReloadQueryEvent } from '@spartacus/quote/root';
+
+import { Subscription } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QuoteAddedToCartEventListener implements OnDestroy {
+  protected subscription = new Subscription();
+
+  constructor(protected eventService: EventService) {
+    this.onAddToCart();
+  }
+
+  protected onAddToCart() {
+    this.subscription.add(
+      this.eventService.get(CartUiEventAddToCart).subscribe(() => {
+        this.eventService.dispatch({}, QuoteDetailsReloadQueryEvent);
+      })
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscription?.unsubscribe();
+  }
+}

feature-libs/quote/core/facade/quote.service.ts

@@ -5,7 +5,11 @@
  */
 
 import { Injectable } from '@angular/core';
-import { ActiveCartFacade, MultiCartFacade } from '@spartacus/cart/base/root';
+import {
+  ActiveCartFacade,
+  MultiCartFacade,
+  QuoteCartService,
+} from '@spartacus/cart/base/root';
 import {
   Comment,
   QuoteFacade,
@@ -86,6 +90,8 @@ export class QuoteService implements QuoteFacade {
               active: true,
             },
           });
+          this.quoteCartService.setQuoteCartActive(true);
+          this.quoteCartService.setQuoteId(quote.code);
           this.eventService.dispatch({}, QuoteDetailsReloadQueryEvent);
         }),
         map(([_, _userId, quote]) => quote)
@@ -105,6 +111,7 @@ export class QuoteService implements QuoteFacade {
     (payload) =>
       this.userIdService.takeUserId().pipe(
         take(1),
+
         switchMap((userId) =>
           this.quoteConnector.editQuote(
             userId,
@@ -159,6 +166,13 @@ export class QuoteService implements QuoteFacade {
         tap(() => {
           this.isActionPerforming$.next(false);
           this.eventService.dispatch({}, QuoteDetailsReloadQueryEvent);
+          if (payload.quoteAction === QuoteActionType.SUBMIT) {
+            this.quoteCartService.setQuoteCartActive(false);
+          }
+          if (payload.quoteAction === QuoteActionType.EDIT) {
+            this.quoteCartService.setQuoteCartActive(true);
+            this.quoteCartService.setQuoteId(payload.quoteCode);
+          }
         })
       );
     },
@@ -197,8 +211,25 @@ export class QuoteService implements QuoteFacade {
         this.routingService.getRouterState().pipe(
           withLatestFrom(this.userIdService.takeUserId()),
           switchMap(([{ state }, userId]) =>
-            this.quoteConnector.getQuote(userId, state.params.quoteId)
-          )
+            zip(
+              this.quoteConnector.getQuote(userId, state.params.quoteId),
+              this.quoteCartService.getQuoteCartActive(),
+              this.quoteCartService.getQuoteId(),
+              of(userId)
+            )
+          ),
+          tap(([quote, isActive, quoteId, userId]) => {
+            if (isActive && quote.code === quoteId) {
+              this.multiCartService.loadCart({
+                userId: userId,
+                cartId: quote.cartId as string,
+                extraData: {
+                  active: true,
+                },
+              });
+            }
+          }),
+          map(([quote, _]) => quote)
         ),
       {
         reloadOn: [QuoteDetailsReloadQueryEvent, LoginEvent],
@@ -244,7 +275,8 @@ export class QuoteService implements QuoteFacade {
     protected commandService: CommandService,
     protected activeCartService: ActiveCartFacade,
     protected routingService: RoutingService,
-    protected multiCartService: MultiCartFacade
+    protected multiCartService: MultiCartFacade,
+    protected quoteCartService: QuoteCartService
   ) {}
 
   createQuote(quoteMetadata: QuoteMetadata): Observable<Quote> {

feature-libs/quote/core/quote-core.module.ts

@@ -9,6 +9,7 @@ import { HttpErrorHandler } from '@spartacus/core';
 import { QuoteConnector } from './connectors/quote.connector';
 import { facadeProviders } from './facade/facade-providers';
 import { QuoteBadRequestHandler } from './http-interceptors/quote-bad-request.handler';
+import { QuoteAddedToCartEventListener } from './event/quote-added-to-cart-event.listener';
 
 @NgModule({
   providers: [
@@ -21,4 +22,8 @@ import { QuoteBadRequestHandler } from './http-interceptors/quote-bad-request.ha
     },
   ],
 })
-export class QuoteCoreModule {}
+export class QuoteCoreModule {
+  constructor(_quoteAddedToCartEventListener: QuoteAddedToCartEventListener) {
+    // Intentional empty constructor
+  }
+}

feature-libs/quote/occ/converters/occ-quote-action-normalizer.spec.ts

@@ -6,7 +6,10 @@ import {
   QuoteActionType,
   QuoteState,
 } from '@spartacus/quote/root';
-import { createEmptyQuote } from '../../core/testing/quote-test-utils';
+import {
+  createEmptyQuote,
+  QUOTE_CODE,
+} from '../../core/testing/quote-test-utils';
 import { OccQuoteActionNormalizer } from './occ-quote-action-normalizer';
 
 const SUBMIT_AND_CANCEL_UNORDERED = [
@@ -95,7 +98,8 @@ describe('OccQuoteActionNormalizer', () => {
     it('should return sorted list according to config', () => {
       const orderedActions = service['getOrderedActions'](
         QuoteState.BUYER_DRAFT,
-        SUBMIT_AND_CANCEL_UNORDERED
+        SUBMIT_AND_CANCEL_UNORDERED,
+        QUOTE_CODE
       );
       expect(orderedActions).toEqual([
         QuoteActionType.CANCEL,
@@ -106,15 +110,17 @@ describe('OccQuoteActionNormalizer', () => {
       quoteCoreConfig.quote = undefined;
       const orderedActions = service['getOrderedActions'](
         QuoteState.BUYER_DRAFT,
-        SUBMIT_AND_CANCEL_UNORDERED
+        SUBMIT_AND_CANCEL_UNORDERED,
+        QUOTE_CODE
       );
       expect(orderedActions).toEqual(SUBMIT_AND_CANCEL_UNORDERED);
     });
     it('should return unsorted list if no actions are defined in the config', () => {
       (quoteCoreConfig?.quote ?? {}).actions = undefined;
       const orderedActions = service['getOrderedActions'](
         QuoteState.BUYER_DRAFT,
-        SUBMIT_AND_CANCEL_UNORDERED
+        SUBMIT_AND_CANCEL_UNORDERED,
+        QUOTE_CODE
       );
       expect(orderedActions).toEqual(SUBMIT_AND_CANCEL_UNORDERED);
     });
@@ -123,7 +129,8 @@ describe('OccQuoteActionNormalizer', () => {
       (quoteCoreConfig.quote?.actions ?? {}).actionsOrderByState = undefined;
       const orderedActions = service['getOrderedActions'](
         QuoteState.BUYER_DRAFT,
-        SUBMIT_AND_CANCEL_UNORDERED
+        SUBMIT_AND_CANCEL_UNORDERED,
+        QUOTE_CODE
       );
       expect(orderedActions).toEqual(SUBMIT_AND_CANCEL_UNORDERED);
     });