fixes

Author: FollowTheFlo

Diff for: integration-libs/punchout/components/punchout-close-session/punchout-close-session.component.html

@@ -1,4 +1,4 @@
-<ng-container *ngIf="(isPunchoutSessionactive$ | async) === true">
+<ng-container *ngIf="(isPunchoutSessionActive$ | async) === true">
   <div class="cx-punchout-close-session" (click)="clickCloseSessionButton()">
     {{ 'punchout.closeSession' | cxTranslate }}
   </div>

Diff for: integration-libs/punchout/components/punchout-close-session/punchout-close-session.component.ts

@@ -20,7 +20,7 @@ export class PunchoutCloseSessionComponent {
   protected authService = inject(AuthService);
   protected punchoutFacade = inject(PunchoutFacade);
 
-  isPunchoutSessionactive$: Observable<boolean> = this.authService
+  isPunchoutSessionActive$: Observable<boolean> = this.authService
     .isUserLoggedIn()
     .pipe(
       switchMap((isLoggedIn) => {

Diff for: integration-libs/punchout/components/punchout-session/punchout-session.component.ts

@@ -12,7 +12,7 @@ import {
 } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { PUNCHOUT_SESSION_KEY, PunchoutFacade } from '@spartacus/punchout/root';
-import { take } from 'rxjs';
+import { switchMap, take } from 'rxjs';
 @Component({
   selector: 'cx-punchout-session',
   template: `<p>Punchout session loading</p> `,
@@ -24,12 +24,16 @@ export class PunchoutSessionComponent implements OnInit {
   protected punchoutFacade = inject(PunchoutFacade);
 
   ngOnInit(): void {
-    this.activatedRoute.queryParams.pipe(take(1)).subscribe((param: Params) => {
-      const punchoutSessionId = param?.[PUNCHOUT_SESSION_KEY];
-      this.punchoutFacade
-        .getPunchoutSession({ punchoutSessionId })
-        .pipe(take(1))
-        .subscribe();
-    });
+    this.activatedRoute.queryParams
+      .pipe(
+        take(1),
+        switchMap((param: Params) =>
+          this.punchoutFacade.getPunchoutSession({
+            punchoutSessionId: param?.[PUNCHOUT_SESSION_KEY],
+          })
+        ),
+        take(1)
+      )
+      .subscribe();
   }
 }

Diff for: integration-libs/punchout/core/facade/punchout.service.ts

@@ -55,7 +55,7 @@ export class PunchoutService implements PunchoutFacade {
    * Logout silently
    * Login silently
    * Load Cart
-   * store of initial cart entries for EDIT mode
+   * Only for EDIT mode: Fetch Requisition to store initial cart in CXML format.
    * Route to target page based on punchout session info
    * Redirect to Punchout Error page if error occurs
    */
@@ -99,8 +99,7 @@ export class PunchoutService implements PunchoutFacade {
             });
             if (
               punchoutSession.punchOutOperation === PunchOutOperation.EDIT &&
-              punchoutSession?.cartId &&
-              !payload?.isPageRefresh
+              punchoutSession?.cartId
             ) {
               this.setPunchoutInitialRequisition();
             }
@@ -169,12 +168,12 @@ export class PunchoutService implements PunchoutFacade {
 
   /**
    * closePunchoutSession workflow:
-   * for EDIT operation:
-   * - initial Requisition is sent to ARIBA
-   * for CREATE operation:
-   * - do same Cancel punchout button
-   * for INSPECT operation:
-   * - do same as 'back to requition' button
+   * For EDIT operation:
+   * - Initial cart snapshot gets sent in CXML, driven by closePunchoutSession flag.
+   * For CREATE operation:
+   * - Empty cart gets sent in CXML, driven by cancelRequisition flag.
+   * For INSPECT operation:
+   * - Current cart gets sent in CXML.
    */
 
   protected closePunchoutSessionCommand: Command<undefined, boolean> =

Diff for: integration-libs/punchout/occ/adapters/occ-punchout.adapter.spec.ts

@@ -31,7 +31,7 @@ const mockSid = 'mockSid';
 const discardCartEntries = false;
 const mockPunchoutSessionResponse: PunchoutSession = {
   customerId: '[email protected]',
-  cartId: 'mockCaPunchoutLevel',
+  cartId: 'mockCartId',
   punchOutLevel: PunchOutLevel.PRODUCT,
   punchOutOperation: PunchOutOperation.EDIT,
   selectedItem: 'mockItemId',

Diff for: integration-libs/punchout/root/services/punchout-store.service.spec.ts

@@ -17,7 +17,7 @@ const INITIAL_STATE: PunchoutState = {
 
 const mockPunchoutSession: PunchoutSession = {
   customerId: '[email protected]',
-  cartId: 'mockCaPunchoutLevel',
+  cartId: 'mockCartId',
   punchOutLevel: PunchOutLevel.PRODUCT,
   punchOutOperation: PunchOutOperation.EDIT,
   selectedItem: 'mockItemId',
@@ -56,9 +56,11 @@ describe('PunchoutStoreService', () => {
   it('should return the current PunchoutStoreService as an observable', (done) => {
     service['punchoutState'].next(mockPunchoutState);
 
-    service.getPunchoutState().subscribe((state) => {
-      expect(state).toEqual(mockPunchoutState);
-      done();
+    service.getPunchoutState().subscribe({
+      next: (state) => {
+        expect(state).toEqual(mockPunchoutState);
+        done();
+      },
     });
   });