Epic/b2b commerce quotes

core-libs/setup/tsconfig.spec.json

@@ -409,6 +409,20 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
+      "@spartacus/quote/components": [
+        "../../feature-libs/quote/components/public_api"
+      ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
+      "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
+      "@spartacus/quote": ["../../feature-libs/quote/public_api"],
+      "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
+      "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
       ],

extra-webpack.config.js

@@ -53,6 +53,7 @@ module.exports = {
       '@spartacus/tracking': path.join(__dirname, 'feature-libs/tracking'),
       '@spartacus/cart': path.join(__dirname, 'feature-libs/cart'),
       '@spartacus/order': path.join(__dirname, 'feature-libs/order'),
+      '@spartacus/quote': path.join( __dirname, 'feature-libs/quote'),
       '@spartacus/epd-visualization': path.join(
         __dirname,
         'integration-libs/epd-visualization'

feature-libs/asm/tsconfig.schematics.json

@@ -406,6 +406,20 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/quote/assets": ["../../feature-libs/quote/assets/public_api"],
+      "@spartacus/quote/components/aware": [
+        "../../feature-libs/quote/components/aware/public_api"
+      ],
+      "@spartacus/quote/components": [
+        "../../feature-libs/quote/components/public_api"
+      ],
+      "@spartacus/quote/components/request-button": [
+        "../../feature-libs/quote/components/request-button/public_api"
+      ],
+      "@spartacus/quote/core": ["../../feature-libs/quote/core/public_api"],
+      "@spartacus/quote": ["../../feature-libs/quote/public_api"],
+      "@spartacus/quote/occ": ["../../feature-libs/quote/occ/public_api"],
+      "@spartacus/quote/root": ["../../feature-libs/quote/root/public_api"],
       "@spartacus/requested-delivery-date/assets": [
         "../../feature-libs/requested-delivery-date/assets/public_api"
       ],

feature-libs/cart/base/components/abstract-order-context/abstract-order-context-source.model.ts

@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+
+import { AbstractOrderType } from '@spartacus/cart/base/root';
+import { BehaviorSubject } from 'rxjs';
+import { AbstractOrderContext } from './abstract-order-context.model';
+
+/**
+ * Context source for AbstractOrderContext. Default values represent the context
+ * of an active cart
+ *
+ * AbstractOrderContext should be injected in child components.
+ */
+@Injectable()
+export class AbstractOrderContextSource implements AbstractOrderContext {
+  readonly type$ = new BehaviorSubject<AbstractOrderType>(
+    AbstractOrderType.CART
+  );
+  readonly id$ = new BehaviorSubject<string | undefined>(undefined);
+}

feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.spec.ts

@@ -0,0 +1,92 @@
+import { Component, inject } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { tap } from 'rxjs/operators';
+import { AbstractOrderType } from '../../root/models/cart.model';
+import { AbstractOrderContext } from './abstract-order-context.model';
+import { AbstractOrderContextModule } from './abstract-order-context.module';
+
+const abstractOrderId = '129374';
+
+let emissionCounterId = 0;
+let emissionCounterType = 0;
+
+@Component({
+  selector: 'cx-test-cmp',
+  template: `
+<span [cxAbstractOrderContext]="{id:id, type:type}"><cx-test-cmp-inner/>        
+</span>`,
+})
+class TestComponent {
+  readonly abstractOrderType = AbstractOrderType;
+  id = abstractOrderId;
+  type = AbstractOrderType.CART;
+}
+
+@Component({
+  selector: 'cx-test-cmp-inner',
+  template: `
+    <ng-container *ngIf="myId$ | async as id">
+      {{ id }}
+    </ng-container>
+    <ng-container *ngIf="myType$ | async as type">
+      {{ type }}
+    </ng-container>
+  `,
+})
+class TestInnerComponent {
+  abstractOrderContext = inject(AbstractOrderContext, { optional: true });
+  myId$ = this.abstractOrderContext?.id$.pipe(
+    tap(() => (emissionCounterId = emissionCounterId + 1))
+  );
+  myType$ = this.abstractOrderContext?.type$.pipe(
+    tap(() => (emissionCounterType = emissionCounterType + 1))
+  );
+}
+
+describe('AbstractOrderContextDirective', () => {
+  let fixture: ComponentFixture<TestComponent>;
+  let testOuterComponent: TestComponent;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [TestComponent, TestInnerComponent],
+        imports: [AbstractOrderContextModule],
+        providers: [],
+      }).compileComponents();
+      emissionCounterId = 0;
+      emissionCounterType = 0;
+      fixture = TestBed.createComponent(TestComponent);
+      testOuterComponent = fixture.componentInstance;
+      fixture.detectChanges();
+    })
+  );
+
+  it('should propagate abstract order ID to inner component', () => {
+    expect(fixture.nativeElement.innerHTML).toContain(abstractOrderId);
+  });
+
+  it('should propagate abstract order type to inner component', () => {
+    expect(fixture.nativeElement.innerHTML).toContain(AbstractOrderType.CART);
+  });
+
+  it('should emit changes only if actual value has changed for id', () => {
+    expect(emissionCounterId).toBe(1);
+    expect(emissionCounterType).toBe(1);
+
+    testOuterComponent.type = AbstractOrderType.SAVED_CART;
+    fixture.detectChanges();
+    expect(emissionCounterId).toBe(1);
+    expect(emissionCounterType).toBe(2);
+  });
+
+  it('should should emit changes only if actual value has changed for type', () => {
+    expect(emissionCounterId).toBe(1);
+    expect(emissionCounterType).toBe(1);
+
+    testOuterComponent.id = 'newId';
+    fixture.detectChanges();
+    expect(emissionCounterId).toBe(2);
+    expect(emissionCounterType).toBe(1);
+  });
+});

feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.ts

@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  Directive,
+  Input,
+  OnChanges,
+  SimpleChanges,
+  inject,
+} from '@angular/core';
+
+import { AbstractOrderKey } from '@spartacus/cart/base/root';
+import { AbstractOrderContextSource } from './abstract-order-context-source.model';
+import { AbstractOrderContext } from './abstract-order-context.model';
+
+@Directive({
+  selector: '[cxAbstractOrderContext]',
+  providers: [
+    AbstractOrderContextSource,
+    { provide: AbstractOrderContext, useExisting: AbstractOrderContextSource },
+  ],
+})
+export class AbstractOrderContextDirective implements OnChanges {
+  @Input() cxAbstractOrderContext: AbstractOrderKey;
+
+  protected abstractOrderContextSource = inject(AbstractOrderContextSource);
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.cxAbstractOrderContext) {
+      if (
+        this.cxAbstractOrderContext.id !==
+        this.abstractOrderContextSource.id$.value
+      ) {
+        this.abstractOrderContextSource.id$.next(
+          this.cxAbstractOrderContext.id
+        );
+      }
+      if (
+        this.cxAbstractOrderContext.type !==
+        this.abstractOrderContextSource.type$.value
+      ) {
+        this.abstractOrderContextSource.type$.next(
+          this.cxAbstractOrderContext.type
+        );
+      }
+    }
+  }
+}

feature-libs/cart/base/components/abstract-order-context/abstract-order-context.model.ts

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { AbstractOrderType } from '@spartacus/cart/base/root';
+
+import { Observable } from 'rxjs';
+
+/**
+ * Context for transporting information about an abstract order (active cart, saved cart, order, quote).
+ */
+@Injectable()
+export abstract class AbstractOrderContext {
+  readonly type$: Observable<AbstractOrderType>;
+  readonly id$: Observable<string | undefined>;
+}

feature-libs/cart/base/components/abstract-order-context/abstract-order-context.module.ts

@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { AbstractOrderContextDirective } from './abstract-order-context.directive';
+
+@NgModule({
+  declarations: [AbstractOrderContextDirective],
+  exports: [AbstractOrderContextDirective],
+})
+export class AbstractOrderContextModule {}

feature-libs/cart/base/components/abstract-order-context/index.ts

@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './abstract-order-context-source.model';
+export * from './abstract-order-context.directive';
+export * from './abstract-order-context.model';
+export * from './abstract-order-context.module';

feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.spec.ts

@@ -422,5 +422,30 @@ describe('CartItemListComponent', () => {
       expect(component.readonly).toEqual(mockContext.readonly);
       expect(setLoading).toHaveBeenCalledWith(mockContext.cartIsLoading);
     });
+
+    it('should mark view for check and force re-creation of item controls when outlet context emits with changed read-only flag', () => {
+      const secondMockContext = structuredClone(mockContext);
+      secondMockContext.readonly = false;
+      const context$ = of(mockContext, secondMockContext);
+      configureTestingModule().overrideProvider(OutletContextData, {
+        useValue: { context$ },
+      });
+      TestBed.compileComponents();
+      stubSeviceAndCreateComponent();
+      const control0 = component.form.get(mockItem0.entryNumber.toString());
+      const control1 = component.form.get(mockItem1.entryNumber.toString());
+      spyOn(component['cd'], 'markForCheck').and.callThrough();
+
+      component.ngOnInit();
+
+      expect(component['cd'].markForCheck).toHaveBeenCalled();
+      expect(control0).not.toBe(
+        component.form.get(mockItem0.entryNumber.toString())
+      );
+      expect(control1).not.toBe(
+        component.form.get(mockItem1.entryNumber.toString())
+      );
+      expect(component['_forceRerender']).toBe(false); // flag reset
+    });
   });
 });

feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.ts

@@ -61,6 +61,7 @@ export class CartItemListComponent implements OnInit, OnDestroy {
   @Input() cartId: string;
 
   protected _items: OrderEntry[] = [];
+  protected _forceRerender: boolean = false;
   form: UntypedFormGroup = new UntypedFormGroup({});
 
   @Input('items')
@@ -107,7 +108,9 @@ export class CartItemListComponent implements OnInit, OnDestroy {
   protected getInputsFromContext(): Subscription | undefined {
     return this.outlet?.context$.subscribe((context) => {
       if (context.readonly !== undefined) {
+        this._forceRerender = this.readonly !== context.readonly;
         this.readonly = context.readonly;
+        this.cd.markForCheck();
       }
       if (context.hasHeader !== undefined) {
         this.hasHeader = context.hasHeader;
@@ -173,6 +176,7 @@ export class CartItemListComponent implements OnInit, OnDestroy {
     ) {
       const index = i - offset;
       if (
+        this._forceRerender ||
         JSON.stringify(this._items?.[index]) !== JSON.stringify(items[index])
       ) {
         if (this._items[index]) {
@@ -186,6 +190,7 @@ export class CartItemListComponent implements OnInit, OnDestroy {
         }
       }
     }
+    this._forceRerender = false;
   }
 
   /**

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

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+export * from './abstract-order-context/index';
 export * from './added-to-cart-dialog/index';
 export * from './cart-base-components.module';
 export * from './cart-coupon/index';

feature-libs/cart/base/occ/adapters/converters/occ-cart-normalizer.spec.ts

@@ -1,9 +1,10 @@
 import { TestBed } from '@angular/core/testing';
 import {
+  Cart,
   ORDER_ENTRY_PROMOTIONS_NORMALIZER,
   PromotionResult,
 } from '@spartacus/cart/base/root';
-import { ConverterService, PRODUCT_NORMALIZER } from '@spartacus/core';
+import { ConverterService, Occ, PRODUCT_NORMALIZER } from '@spartacus/core';
 import { OccCartNormalizer } from './occ-cart-normalizer';
 
 class MockConverterService {
@@ -88,4 +89,23 @@ describe('OccCartNormalizer', () => {
       },
     ]);
   });
+  describe('handleQuoteCode', () => {
+    const quoteCode = '00100092';
+    const source: Occ.Cart = { sapQuote: { code: quoteCode } };
+
+    it('should set quote code if sapQuote is present in OCC response', () => {
+      const target: Cart = {};
+      occCartNormalizer['handleQuoteCode'](source, target);
+      expect(target.quoteCode).toBe(quoteCode);
+    });
+
+    it('should ignore missing sapQuote in OCC response', () => {
+      const target: Cart = {};
+      occCartNormalizer['handleQuoteCode'](
+        { ...source, sapQuote: undefined },
+        target
+      );
+      expect(target.quoteCode).toBe(undefined);
+    });
+  });
 });