Epic: CXSPA-2897 (#17399)

Co-authored-by: Pawel Fras <[email protected]>
Co-authored-by: kpawelczak <[email protected]>

docs/libs/creating-lib.md

@@ -60,20 +60,15 @@ Just copy paste the following and and make sure to rename `TODO:` to you lib's n
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
-      require('karma-parallel'),
       require('karma-jasmine'),
       require('karma-coverage'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('@angular-devkit/build-angular/plugins/karma'),
       require('karma-junit-reporter'),
     ],
-    parallelOptions: {
-      executors: 2,
-      shardStrategy: 'round-robin',
-    },
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
@@ -220,7 +215,7 @@ Use the following template:
   "peerDependencies": {
     "@angular/common": "^10.1.0",
     "@angular/core": "^10.1.0",
-    "rxjs": "^6.6.0",
+    "rxjs": "^7.8.0",
     "@spartacus/core": "3.0.0-next.0",
     "@spartacus/storefront": "3.0.0-next.0"
   }

feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts

@@ -299,7 +299,9 @@ describe('AsmBindCartComponent', () => {
       it('should alert through global messsages when the bind cart fails', () => {
         const expectedErrorMessage = 'mock-error-message';
         (asmBindCartFacade.bindCart as jasmine.Spy).and.returnValue(
-          throwError({ details: [{ message: expectedErrorMessage }] })
+          throwError(() => ({
+            details: [{ message: expectedErrorMessage }],
+          }))
         );
 
         component.bindCartToCustomer();

feature-libs/asm/karma.conf.js

@@ -4,20 +4,15 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
-      require('karma-parallel'),
       require('karma-jasmine'),
       require('karma-coverage'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('@angular-devkit/build-angular/plugins/karma'),
       require('karma-junit-reporter'),
     ],
-    parallelOptions: {
-      executors: 2,
-      shardStrategy: 'round-robin',
-    },
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
       jasmine: {

feature-libs/asm/occ/adapters/occ-asm.adapter.ts

@@ -29,7 +29,7 @@ import {
   User,
   normalizeHttpError,
 } from '@spartacus/core';
-import { Observable, throwError } from 'rxjs';
+import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
@@ -75,7 +75,9 @@ export class OccAsmAdapter implements AsmAdapter {
     );
 
     return this.http.get<CustomerListsPage>(url, { headers, params }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
+      catchError((error) => {
+        throw normalizeHttpError(error, this.logger);
+      }),
       this.converterService.pipeable(CUSTOMER_LISTS_NORMALIZER)
     );
   }
@@ -123,7 +125,9 @@ export class OccAsmAdapter implements AsmAdapter {
     );
 
     return this.http.get<CustomerSearchPage>(url, { headers, params }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
+      catchError((error) => {
+        throw normalizeHttpError(error, this.logger);
+      }),
       this.converterService.pipeable(CUSTOMER_SEARCH_PAGE_NORMALIZER)
     );
   }
@@ -148,13 +152,11 @@ export class OccAsmAdapter implements AsmAdapter {
       }
     );
 
-    return this.http
-      .post<void>(url, {}, { headers, params })
-      .pipe(
-        catchError((error) =>
-          throwError(normalizeHttpError(error, this.logger))
-        )
-      );
+    return this.http.post<void>(url, {}, { headers, params }).pipe(
+      catchError((error) => {
+        throw normalizeHttpError(error, this.logger);
+      })
+    );
   }
 
   createCustomer(user: CustomerRegistrationForm): Observable<User> {
@@ -172,12 +174,10 @@ export class OccAsmAdapter implements AsmAdapter {
         prefix: false,
       }
     );
-    return this.http
-      .post<User>(url, user, { headers, params })
-      .pipe(
-        catchError((error) =>
-          throwError(normalizeHttpError(error, this.logger))
-        )
-      );
+    return this.http.post<User>(url, user, { headers, params }).pipe(
+      catchError((error) => {
+        throw normalizeHttpError(error, this.logger);
+      })
+    );
   }
 }

feature-libs/asm/package.json

@@ -41,7 +41,7 @@
     "@spartacus/storefront": "6.6.0-1",
     "@spartacus/styles": "6.6.0-1",
     "@spartacus/user": "6.6.0-1",
-    "rxjs": "^6.6.0"
+    "rxjs": "^7.8.0"
   },
   "publishConfig": {
     "access": "public"

feature-libs/asm/root/services/asm-auth.service.ts

@@ -19,7 +19,7 @@ import {
   StateWithClientAuth,
   UserIdService,
 } from '@spartacus/core';
-import { combineLatest, from, Observable, of } from 'rxjs';
+import { combineLatest, from, lastValueFrom, Observable, of } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { AsmAuthStorageService, TokenTarget } from './asm-auth-storage.service';
 
@@ -109,9 +109,8 @@ export class AsmAuthService extends AuthService {
    * To perform logout it is best to use `logout` method. Use this method with caution.
    */
   coreLogout(): Promise<any> {
-    return this.userIdService
-      .isEmulated()
-      .pipe(
+    return lastValueFrom(
+      this.userIdService.isEmulated().pipe(
         take(1),
         switchMap((isEmulated) => {
           if (isEmulated) {
@@ -124,7 +123,7 @@ export class AsmAuthService extends AuthService {
           }
         })
       )
-      .toPromise();
+    );
   }
 
   /**

feature-libs/cart/base/core/cart-persistence.module.ts

@@ -5,30 +5,29 @@
  */
 
 import { NgModule } from '@angular/core';
-import { Action, ActionReducer, MetaReducer, META_REDUCERS } from '@ngrx/store';
+import { Action, ActionReducer, META_REDUCERS, MetaReducer } from '@ngrx/store';
 import { CartType } from '@spartacus/cart/base/root';
 import {
   Config,
   ConfigInitializerService,
   MODULE_INITIALIZER,
 } from '@spartacus/core';
+import { lastValueFrom } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { MultiCartStatePersistenceService } from './services/multi-cart-state-persistence.service';
 
 export function cartStatePersistenceFactory(
   cartStatePersistenceService: MultiCartStatePersistenceService,
   configInit: ConfigInitializerService
 ): () => Promise<Config> {
-  const result = () =>
-    configInit
-      .getStable('context')
-      .pipe(
+  return () =>
+    lastValueFrom(
+      configInit.getStable('context').pipe(
         tap(() => {
           cartStatePersistenceService.initSync();
         })
       )
-      .toPromise();
-  return result;
+    );
 }
 
 /**

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

@@ -13,7 +13,7 @@ import {
   OrderEntry,
 } from '@spartacus/cart/base/root';
 import { isNotUndefined, StateUtils, UserIdService } from '@spartacus/core';
-import { EMPTY, Observable, timer } from 'rxjs';
+import { Observable, of, timer } from 'rxjs';
 import {
   debounce,
   distinctUntilChanged,
@@ -76,7 +76,7 @@ export class MultiCartService implements MultiCartFacade {
       // This flickering should only be avoided when switching from false to true
       // Start of loading should be showed instantly (no debounce)
       // Extra actions are only dispatched after some loading
-      debounce((isStable) => (isStable ? timer(0) : EMPTY)),
+      debounce((isStable) => (isStable ? timer(0) : of(undefined))),
       distinctUntilChanged()
     );
   }

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

@@ -82,7 +82,9 @@ describe('Cart Voucher effect', () => {
 
     it('should fail', () => {
       const error = new HttpErrorResponse({ error: 'error' });
-      cartVoucherConnector.add = createSpy().and.returnValue(throwError(error));
+      cartVoucherConnector.add = createSpy().and.returnValue(
+        throwError(() => error)
+      );
       const action = new CartActions.CartAddVoucher({
         userId,
         cartId,

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

@@ -165,13 +165,13 @@ describe('Cart effect', () => {
         extraData: { active: true },
       });
       loadMock.and.returnValue(
-        throwError({
+        throwError(() => ({
           error: {
             errors: [
               { reason: 'notFound', subjectType: 'cart', subject: '123456' },
             ],
           },
-        })
+        }))
       );
       const removeCartCompletion = new CartActions.RemoveCart({ cartId });
       actions$ = hot('-a', { a: action });
@@ -199,7 +199,7 @@ describe('Cart effect', () => {
         },
       });
       const action = new CartActions.LoadCart(payload);
-      loadMock.and.returnValue(throwError(httpError));
+      loadMock.and.returnValue(throwError(() => httpError));
       const removeCartCompletion = new CartActions.LoadCartFail({
         ...payload,
         error: normalizeHttpError(httpError),

feature-libs/cart/base/occ/adapters/occ-cart-validation.adapter.ts

@@ -17,7 +17,7 @@ import {
   OccEndpointsService,
   normalizeHttpError,
 } from '@spartacus/core';
-import { Observable, throwError } from 'rxjs';
+import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
@@ -36,7 +36,9 @@ export class OccCartValidationAdapter implements CartValidationAdapter {
     });
 
     return this.http.post<any>(url, null).pipe(
-      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
+      catchError((error) => {
+        throw normalizeHttpError(error, this.logger);
+      }),
       this.converter.pipeable(CART_VALIDATION_NORMALIZER)
     );
   }

feature-libs/cart/base/occ/adapters/occ-cart-voucher.adapter.ts

@@ -5,21 +5,25 @@
  */
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { CartVoucherAdapter } from '@spartacus/cart/base/core';
 import { CART_VOUCHER_NORMALIZER } from '@spartacus/cart/base/root';
 import {
   ConverterService,
   InterceptorUtil,
-  OccEndpointsService,
+  LoggerService,
   OCC_USER_ID_ANONYMOUS,
+  OccEndpointsService,
   USE_CLIENT_TOKEN,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { Observable, throwError } from 'rxjs';
+import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccCartVoucherAdapter implements CartVoucherAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -54,7 +58,9 @@ export class OccCartVoucherAdapter implements CartVoucherAdapter {
     const headers = this.getHeaders(userId);
 
     return this.http.post(url, toAdd, { headers, params }).pipe(
-      catchError((error: any) => throwError(error)),
+      catchError((error: any) => {
+        throw normalizeHttpError(error, this.logger);
+      }),
       this.converter.pipeable(CART_VOUCHER_NORMALIZER)
     );
   }
@@ -67,8 +73,10 @@ export class OccCartVoucherAdapter implements CartVoucherAdapter {
 
     const headers = this.getHeaders(userId);
 
-    return this.http
-      .delete(url, { headers })
-      .pipe(catchError((error: any) => throwError(error)));
+    return this.http.delete(url, { headers }).pipe(
+      catchError((error: any) => {
+        throw normalizeHttpError(error, this.logger);
+      })
+    );
   }
 }

feature-libs/cart/package.json

@@ -43,7 +43,7 @@
     "@spartacus/styles": "6.6.0-1",
     "@spartacus/user": "6.6.0-1",
     "bootstrap": "^4.6.2",
-    "rxjs": "^6.6.0"
+    "rxjs": "^7.8.0"
   },
   "publishConfig": {
     "access": "public"

feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.spec.ts

@@ -204,11 +204,11 @@ describe('QuickOrderOrderEntriesContext', () => {
     it('should catch unknown identifier error', () => {
       canAdd$.next(true);
       productConnector.get = createSpy().and.returnValue(
-        throwError({
+        throwError(() => ({
           error: {
             errors: [{ type: 'UnknownIdentifierError' }],
           },
-        })
+        }))
       );
 
       const unableToAddProductsData: ProductData[] = [
@@ -240,7 +240,9 @@ describe('QuickOrderOrderEntriesContext', () => {
 
     it('should catch unknown errors', () => {
       canAdd$.next(true);
-      productConnector.get = createSpy().and.returnValue(throwError({}));
+      productConnector.get = createSpy().and.returnValue(
+        throwError(() => ({}))
+      );
 
       const unableToAddProductsData: ProductData[] = [
         { productCode: unhandledItemErrorId, quantity: 1 },

feature-libs/checkout/b2b/occ/adapters/occ-checkout-cost-center.adapter.spec.ts

@@ -103,7 +103,9 @@ describe(`OccCheckoutCostCenterAdapter`, () => {
 
     describe(`back-off`, () => {
       it(`should unsuccessfully backOff on Jalo error`, fakeAsync(() => {
-        spyOn(httpClient, 'put').and.returnValue(throwError(mockJaloError));
+        spyOn(httpClient, 'put').and.returnValue(
+          throwError(() => mockJaloError)
+        );
 
         let result: HttpErrorModel | undefined;
         const subscription = service
@@ -127,7 +129,7 @@ describe(`OccCheckoutCostCenterAdapter`, () => {
             if (calledTimes === 3) {
               return of(cartData);
             }
-            return throwError(mockJaloError);
+            return throwError(() => mockJaloError);
           })
         );