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

Feature/spa to angular10

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": [
+  "files": [
-    "test.ts",
+    "main.ts",
-    "**/*.spec.ts"
+    "polyfills.ts"
+  ],
+  "include": [
+    "Client/**/*.d.ts"
   ]
 }

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

@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
-    "module": "commonjs",
     "target": "es5",
     "baseUrl": "",
     "types": [

src/Web/WebSPA/Dockerfile

@@ -1,4 +1,4 @@
-ARG NODE_IMAGE=node:8.16
+ARG NODE_IMAGE=node:12.0
 FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
 WORKDIR /app
 EXPOSE 80

src/Web/WebSPA/angular.json

@@ -27,6 +27,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -119,10 +125,13 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

src/Web/WebSPA/appsettings.json

@@ -1,6 +1,6 @@
 {
   "IdentityUrl": "http://localhost:5105",
-  "MarketingUrl": "http://localhost:5110",
+  "MarketingUrl": "http://localhost:5203",
   "CallBackUrl": "http://localhost:5104/",
   "PurchaseUrl": "http://localhost:5202",
   "PurchaseUrlHC": "http://localhost:5202/hc",

src/Web/WebSPA/package.json

@@ -27,17 +27,18 @@
     "lint:ts": "tslint -c tslint.json Client/**/*.ts"
   },
   "dependencies": {
-    "@angular/animations": "8.2.14",
+    "@angular-devkit/schematics": "^11.0.4",
-    "@angular/common": "8.2.14",
+    "@angular/animations": "10.2.3",
-    "@angular/compiler": "8.2.14",
+    "@angular/common": "10.2.3",
-    "@angular/core": "8.2.14",
+    "@angular/compiler": "10.2.3",
-    "@angular/forms": "8.2.14",
+    "@angular/core": "10.2.3",
-    "@angular/platform-browser": "8.2.14",
+    "@angular/forms": "10.2.3",
-    "@angular/platform-browser-dynamic": "8.2.14",
+    "@angular/platform-browser": "10.2.3",
-    "@angular/platform-server": "8.2.14",
+    "@angular/platform-browser-dynamic": "10.2.3",
-    "@angular/router": "8.2.14",
+    "@angular/platform-server": "10.2.3",
+    "@angular/router": "10.2.3",
     "@microsoft/signalr": "3.0.1",
-    "@ng-bootstrap/ng-bootstrap": "5.2.1",
+    "@ng-bootstrap/ng-bootstrap": "^8.0.0",
     "@popperjs/core": "2.0.0",
     "acorn": "^6.4.1",
     "acorn-dynamic-import": "4.0.0",
@@ -47,48 +48,50 @@
     "font-awesome": "4.7.0",
     "isomorphic-fetch": "2.2.1",
     "jquery": "3.5.0",
-    "ngx-toastr": "10.1.0",
+    "ngx-toastr": "^13.2.0",
     "normalize.css": "8.0.0",
     "popper.js": "1.16.1",
-    "rxjs": "~6.4.0",
+    "rxjs": "^6.5.2",
-    "rxjs-compat": "~6.4.0",
+    "rxjs-compat": "^6.5.2",
+    "tslib": "^2.0.0",
     "typedoc": "^0.19.2",
     "webpack-dev-server": "3.1.14",
-    "zone.js": "~0.9.1"
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.803.23",
+    "@angular-devkit/build-angular": "~0.1002.0",
-    "@angular/cli": "8.3.23",
+    "@angular/cli": "10.2.0",
-    "@angular/compiler-cli": "8.2.14",
+    "@angular/compiler-cli": "10.2.3",
-    "@angular/language-service": "8.2.14",
+    "@angular/language-service": "10.2.3",
     "@types/core-js": "2.5.0",
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "^3.5.10",
-    "@types/node": "^11.15.9",
+    "@types/node": "^12.11.1",
     "@types/protractor": "4.0.0",
     "@types/selenium-webdriver": "3.0.10",
-    "codelyzer": "^5.2.2",
+    "codelyzer": "^5.1.2",
     "eslint": "^6.8.0",
     "handlebars": "^4.7.6",
-    "jasmine-core": "^3.5.0",
+    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "^4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "^4.4.1",
+    "karma": "~5.0.0",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "^2.0.0",
-    "karma-jasmine": "^2.0.1",
+    "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.3",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "lodash": "^4.17.19",
     "merge": "1.2.1",
     "npm-watch": "0.5.0",
-    "protractor": "^5.4.3",
+    "protractor": "~7.0.0",
     "rxjs-tslint": "^0.1.7",
     "sass-lint": "1.12.1",
     "ts-helpers": "1.1.2",
     "ts-node": "~7.0.1",
-    "tslint": "^5.14.0",
+    "tslint": "~6.1.0",
     "typedoc": "^0.19.2",
-    "typescript": "3.4.5",
+    "typescript": "4.0.5",
     "url-loader": "1.1.1",
     "webpack": "^4.42.1"
-  }
+  },
+  "peerDependencies": {}
 }

src/Web/WebSPA/tsconfig.json

@@ -8,7 +8,7 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "target": "es2018",
     "typeRoots": [
       "node_modules/@types"
     ],
@@ -16,7 +16,7 @@
       "es2016",
       "dom"
     ],
-    "module": "es2015"
+    "module": "es2020"
   },
   "angularCompilerOptions": {
     "enableIvy": false

src/Web/WebSPA/tslint.json

@@ -49,6 +49,9 @@
             true,
             "check-space"
         ],
+        "deprecation": {
+          "severity": "warning"
+        },
         "indent": [
             true,
             "spaces"