fix typesafety issues on rxjs / typescript 3.5

see ReactiveX/rxjs#4959
SAP · Aug 30, 2019 · c8090ef · c8090ef
1 parent 46b8c65
commit c8090ef
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/projects/core/src/cms/page/content-page-meta.resolver.ts b/projects/core/src/cms/page/content-page-meta.resolver.ts
@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { combineLatest, Observable, of } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
+import { TranslationService } from '../../i18n/translation.service';
+import { PageType } from '../../model/cms.model';
 import { CmsService } from '../facade/cms.service';
 import { Page, PageMeta } from '../model/page.model';
 import { PageMetaResolver } from './page-meta.resolver';
 import { PageBreadcrumbResolver, PageTitleResolver } from './page.resolvers';
-import { PageType } from '../../model/cms.model';
-import { TranslationService } from '../../i18n/translation.service';
 
 @Injectable({
   providedIn: 'root',
@@ -24,7 +24,7 @@ export class ContentPageMetaResolver extends PageMetaResolver
   resolve(): Observable<PageMeta> {
     return this.cms.getCurrentPage().pipe(
       filter(Boolean),
-      switchMap(page =>
+      switchMap((page: Page) =>
         combineLatest([
           this.resolveTitle(page),
           this.resolveBreadcrumbLabel().pipe(

diff --git a/projects/core/src/product/services/category-page-meta.resolver.ts b/projects/core/src/product/services/category-page-meta.resolver.ts
@@ -29,7 +29,7 @@ export class CategoryPageMetaResolver extends PageMetaResolver
   resolve(): Observable<PageMeta> {
     return this.cms.getCurrentPage().pipe(
       filter(Boolean),
-      switchMap(page => {
+      switchMap((page: Page) => {
         // only the existence of a plp component tells us if products
         // are rendered or if this is an ordinary content page
         if (this.hasProductListComponent(page)) {

diff --git a/projects/core/src/product/services/product-page-meta.resolver.ts b/projects/core/src/product/services/product-page-meta.resolver.ts
@@ -38,7 +38,7 @@ export class ProductPageMetaResolver extends PageMetaResolver
   resolve(): Observable<PageMeta> {
     return this.routingService.getRouterState().pipe(
       map(state => state.state.params['productCode']),
-      filter(Boolean),
+      filter(code => !!code),
       switchMap(code => this.productService.get(code)),
       filter(Boolean),
       switchMap((p: Product) =>

diff --git a/projects/core/src/product/services/search-page-meta.resolver.ts b/projects/core/src/product/services/search-page-meta.resolver.ts
@@ -35,7 +35,7 @@ export class SearchPageMetaResolver extends PageMetaResolver
       string
     > = this.routingService.getRouterState().pipe(
       map(state => state.state.params['query']),
-      filter(Boolean)
+      filter(q => !!q)
     );
 
     return combineLatest([total$, query$]).pipe(

diff --git a/projects/storefrontlib/src/cms-components/cart/add-to-cart/add-to-cart.component.ts b/projects/storefrontlib/src/cms-components/cart/add-to-cart/add-to-cart.component.ts
@@ -6,7 +6,7 @@ import {
   OnDestroy,
   OnInit,
 } from '@angular/core';
-import { CartService, OrderEntry } from '@spartacus/core';
+import { CartService, OrderEntry, Product } from '@spartacus/core';
 import { Observable, Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { ModalRef, ModalService } from '../../../shared/components/modal/index';
@@ -48,7 +48,7 @@ export class AddToCartComponent implements OnInit, OnDestroy {
       this.subscription = this.currentProductService
         .getProduct()
         .pipe(filter(Boolean))
-        .subscribe(product => {
+        .subscribe((product: Product) => {
           this.productCode = product.code;
           this.quantity = 1;
 

diff --git a/...efrontlib/src/cms-components/misc/site-context-selector/site-context-component.service.ts b/...efrontlib/src/cms-components/misc/site-context-selector/site-context-component.service.ts
@@ -71,8 +71,8 @@ export class SiteContextComponentService {
     context?: SiteContextType
   ): Observable<SiteContext<any>> {
     return this.getContext(context).pipe(
-      map(ctx => this.getInjectedService(ctx)),
-      filter(Boolean)
+      map((ctx: string) => this.getInjectedService(ctx)),
+      filter(s => !!s)
     );
   }
 

diff --git a/projects/storefrontlib/src/cms-components/navigation/navigation/navigation.service.ts b/projects/storefrontlib/src/cms-components/navigation/navigation/navigation.service.ts
@@ -37,7 +37,7 @@ export class NavigationService {
       return of();
     }
     return data$.pipe(
-      filter(Boolean),
+      filter(data => !!data),
       switchMap(data => {
         const navigation = data.navigationNode ? data.navigationNode : data;
         return this.cmsService.getNavigationEntryItems(navigation.uid).pipe(

diff --git a/...tlib/src/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts b/...tlib/src/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts
@@ -21,7 +21,7 @@ export class ProductReviewsComponent {
   product$: Observable<Product> = this.currentProductService.getProduct();
 
   reviews$: Observable<Review[]> = this.product$.pipe(
-    filter(Boolean),
+    filter(p => !!p),
     switchMap(product => this.reviewService.getByProductCode(product.code)),
     tap(() => {
       this.resetReviewForm();

diff --git a/projects/storefrontlib/src/cms-structure/page/page-layout/page-layout.service.ts b/projects/storefrontlib/src/cms-structure/page/page-layout/page-layout.service.ts
@@ -9,7 +9,7 @@ import {
   LayoutSlotConfig,
   SlotConfig,
 } from '../../../layout/config/layout-config';
-import { PAGE_LAYOUT_HANDLER, PageLayoutHandler } from './page-layout-handler';
+import { PageLayoutHandler, PAGE_LAYOUT_HANDLER } from './page-layout-handler';
 
 @Injectable()
 export class PageLayoutService {
@@ -75,7 +75,7 @@ export class PageLayoutService {
   }
 
   get page$(): Observable<Page> {
-    return this.cms.getCurrentPage().pipe(filter(Boolean));
+    return this.cms.getCurrentPage().pipe(filter(page => !!page));
   }
 
   get templateName$(): Observable<string> {