Merge pull request dotnet-architecture#1549 from cdemiguel/feature/SPA-to-angular10

Feature/spa to angular10

Author: mvelosop

deploy/k8s/helm/apigwmm/templates/envoy-cm.yaml

@@ -10,5 +10,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  {{ (.Files.Glob "envoy.yaml").AsConfig  | indent 2 }}
+{{ (.Files.Glob "envoy.yaml").AsConfig  | indent 2 }}
 

deploy/k8s/helm/apigwms/templates/envoy-cm.yaml

@@ -10,5 +10,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+{{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
 

deploy/k8s/helm/apigwwm/templates/envoy-cm.yaml

@@ -10,5 +10,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 -}} 
+{{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 -}} 
 

deploy/k8s/helm/apigwws/templates/envoy-cm.yaml

@@ -10,5 +10,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  {{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
+{{ (.Files.Glob "envoy.yaml").AsConfig | indent 2 }}
 

src/Web/WebSPA/Client/modules/basket/basket.module.ts

@@ -14,7 +14,7 @@ import { Header }                from '../shared/components/header/header';
     exports: [BasketStatusComponent]
 })
 export class BasketModule {
-    static forRoot(): ModuleWithProviders {
+    static forRoot(): ModuleWithProviders<BasketModule> {
         return {
             ngModule: BasketModule,
             providers: [

src/Web/WebSPA/Client/modules/campaigns/campaigns.component.ts

@@ -22,14 +22,14 @@ export class CampaignsComponent implements OnInit {
 
     ngOnInit() {
         if (this.configurationService.isReady) {
+            this.isCampaignDetailFunctionEnabled = this.configurationService.serverSettings.activateCampaignDetailFunction;
             this.getCampaigns(9, 0)
         } else {
             this.configurationService.settingsLoaded$.subscribe(x => {
+                this.isCampaignDetailFunctionEnabled = this.configurationService.serverSettings.activateCampaignDetailFunction;
                 this.getCampaigns(9, 0);
             });
         }
-
-        this.isCampaignDetailFunctionEnabled = this.configurationService.serverSettings.activateCampaignDetailFunction;
     }    
 
     onPageChanged(value: any) {

src/Web/WebSPA/Client/modules/catalog/catalog.component.ts

@@ -56,6 +56,9 @@ export class CatalogComponent implements OnInit {
 
     onFilterApplied(event: any) {
         event.preventDefault();
+        
+        this.brandSelected = this.brandSelected && this.brandSelected.toString() != "null" ? this.brandSelected : null;
+        this.typeSelected = this.typeSelected && this.typeSelected.toString() != "null" ? this.typeSelected : null;
         this.getCatalog(this.paginationInfo.itemsPage, this.paginationInfo.actualPage, this.brandSelected, this.typeSelected);
     }
 
@@ -82,6 +85,7 @@ export class CatalogComponent implements OnInit {
 
     getCatalog(pageSize: number, pageIndex: number, brand?: number, type?: number) {
         this.errorReceived = false;
+
         this.service.getCatalog(pageIndex, pageSize, brand, type)
             .pipe(catchError((err) => this.handleError(err)))
             .subscribe(catalog => {

src/Web/WebSPA/Client/modules/shared/components/identity/identity.ts

@@ -29,7 +29,7 @@ export class Identity implements OnInit  {
             this.service.AuthorizedCallback();
         }
 
-        console.log('identity component, checking authorized' + this.service.IsAuthorized);
+        console.log('identity component, checking authorized ' + this.service.IsAuthorized);
         this.authenticated = this.service.IsAuthorized;
 
         if (this.authenticated) {

src/Web/WebSPA/Client/modules/shared/shared.module.ts

@@ -57,7 +57,7 @@ import { UppercasePipe } from './pipes/uppercase.pipe';
     ]
 })
 export class SharedModule {
-    static forRoot(): ModuleWithProviders {
+    static forRoot(): ModuleWithProviders<SharedModule> {
         return {
             ngModule: SharedModule,
             providers: [

src/Web/WebSPA/Client/tsconfig.app.json

@@ -2,12 +2,14 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
-    "module": "es2015",
     "baseUrl": "",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "Client/**/*.d.ts"
   ]
 }