Merge pull request #69 from industrial-data-space/angular-update

Updated Angular
Fraunhofer-AISEC · Jul 8, 2021 · 3be843c · 3be843c
2 parents 98882ce + 1ae0656
commit 3be843c
Show file tree

Hide file tree

Showing 6 changed files with 2,388 additions and 2,665 deletions.
diff --git a/ids-webconsole/src/main/angular/angular.json b/ids-webconsole/src/main/angular/angular.json
@@ -11,7 +11,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -38,7 +37,13 @@
               "node_modules/ace-builds/src-min/ace.js",
               "node_modules/ace-builds/src-min/theme-eclipse.js",
               "node_modules/ace-builds/src-min/mode-xml.js"
-            ]
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -52,7 +57,6 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -63,7 +67,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",

diff --git a/ids-webconsole/src/main/angular/package.json b/ids-webconsole/src/main/angular/package.json
@@ -4,18 +4,18 @@
   "license": "SEE LICENSE IN license.txt",
   "angular-cli": {},
   "scripts": {
-    "bundle": "ng build --prod --no-progress --output-path=\"../../../build/resources/main/www\""
+    "bundle": "ng build --configuration production --no-progress --output-path=\"../../../build/resources/main/www\""
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.2.13",
-    "@angular/common": "~11.2.13",
-    "@angular/core": "~11.2.13",
-    "@angular/forms": "~11.2.13",
-    "@angular/platform-browser": "~11.2.13",
-    "@angular/platform-browser-dynamic": "~11.2.13",
-    "@angular/platform-server": "~11.2.13",
-    "@angular/router": "~11.2.13",
+    "@angular/animations": "~12.1.1",
+    "@angular/common": "~12.1.1",
+    "@angular/core": "~12.1.1",
+    "@angular/forms": "~12.1.1",
+    "@angular/platform-browser": "~12.1.1",
+    "@angular/platform-browser-dynamic": "~12.1.1",
+    "@angular/platform-server": "~12.1.1",
+    "@angular/router": "~12.1.1",
     "bootstrap": "^4.2.1",
     "core-js": "^3.6.4",
     "deep-equal": "^2.0.1",
@@ -28,27 +28,27 @@
     "topojson": "^3.0.2",
     "tslib": "^2.0.0",
     "viz.js": "^2.1.1",
-    "zone.js": "^0.11.4"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1102.12",
-    "@angular-eslint/builder": "4.2.0",
-    "@angular-eslint/eslint-plugin": "4.2.0",
-    "@angular-eslint/eslint-plugin-template": "4.2.0",
-    "@angular-eslint/schematics": "4.2.0",
-    "@angular-eslint/template-parser": "4.2.0",
-    "@angular/cli": "~11.2.12",
-    "@angular/compiler": "~11.2.13",
-    "@angular/compiler-cli": "~11.2.13",
+    "@angular-devkit/build-angular": "^12.1.1",
+    "@angular-eslint/builder": "^12.2.0",
+    "@angular-eslint/eslint-plugin": "^12.2.0",
+    "@angular-eslint/eslint-plugin-template": "^12.2.0",
+    "@angular-eslint/schematics": "^12.2.0",
+    "@angular-eslint/template-parser": "^12.2.0",
+    "@angular/cli": "~12.1.1",
+    "@angular/compiler": "~12.1.1",
+    "@angular/compiler-cli": "~12.1.1",
     "@types/node": "^15.0.2",
     "@types/vis": "^4.21.9",
-    "@typescript-eslint/eslint-plugin": "4.16.1",
-    "@typescript-eslint/parser": "4.16.1",
+    "@typescript-eslint/eslint-plugin": "^4.28.1",
+    "@typescript-eslint/parser": "^4.28.1",
     "eslint": "^7.6.0",
-    "eslint-plugin-import": "latest",
-    "eslint-plugin-jsdoc": "latest",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jsdoc": "^35.4.1",
     "eslint-plugin-prefer-arrow": "latest",
-    "typescript": "4.0.5",
+    "typescript": "4.3.5",
     "vis": "^4.20.0"
   }
-}
+}
diff --git a/ids-webconsole/src/main/angular/src/app/apps/app-search-result-card.component.html b/ids-webconsole/src/main/angular/src/app/apps/app-search-result-card.component.html
@@ -14,15 +14,15 @@ <h2 class="mdl-card__title-text">{{ app.title }}</h2>
             </div>
             <div class="mdl-cell mdl-cell--2-col">
                 <div>
-                    <span *ngIf="app.platform == 'windows'" style="padding-right:10px"><em
+                    <span *ngIf="app.platform === 'windows'" style="padding-right:10px"><em
                             class="fab fa-windows fa-2x"></em></span>
-                    <span *ngIf="app.platform == 'linux'" style="padding-right:10px"><em
+                    <span *ngIf="app.platform === 'linux'" style="padding-right:10px"><em
                             class="fab fa-linux fa-2x"></em></span>
                     <span *ngIf="app.privileged" style="padding-right:10px;color:#a04040"><em
                             class="fas fa-exclamation-triangle fa-2x"></em></span>
-                    <span *ngIf="app.type == 'stack'" style="padding-right:10px"><em
+                    <span *ngIf="app.type === 'stack'" style="padding-right:10px"><em
                             class="fas fa-cubes fa-2x"></em></span>
-                    <span *ngIf="app.type == 'container'" style="padding-right:10px"><em
+                    <span *ngIf="app.type === 'container'" style="padding-right:10px"><em
                             class="fas fa-cube fa-2x"></em></span>
                 </div>
                 <div style="margin-top:15px;" *ngFor="let cat of app.categories; trackBy: trackCat">
@@ -34,9 +34,9 @@ <h2 class="mdl-card__title-text">{{ app.title }}</h2>
             </div>
             <div class="mdl-card__actions mdl-card--border">
 
-                <button *ngIf="app.type == 'container'" [attr.id]="'menu_' + app.name"
+                <button *ngIf="app.type === 'container'" [attr.id]="'menu_' + app.name"
                     class="mdl-button mdl-js-button mdl-button--colored" (click)="onInstall(app)">Install</button>
-                <button *ngIf="app.type == 'stack'" [attr.id]="'menu_' + app.name"
+                <button *ngIf="app.type === 'stack'" [attr.id]="'menu_' + app.name"
                     class="mdl-button mdl-button--disabled mdl-js-button mdl-button--colored"
                     (click)="onInstall(app)">Stacks cannot be installed</button>
             </div>

diff --git a/ids-webconsole/src/main/angular/src/app/connection-report/connection-report.component.html b/ids-webconsole/src/main/angular/src/app/connection-report/connection-report.component.html
@@ -68,7 +68,7 @@ <h2 class="mdl-card__title-text">Incoming Connections</h2>
           </td>
           <td>
             <span class="color-warning text-bold">{{ conn.attestationResult.status }}</span> <span
-              *ngIf="conn.attestationResult.reason != null" style="padding-left:10px;font-style:italic">{{
+              *ngIf="conn.attestationResult.reason !== null" style="padding-left:10px;font-style:italic">{{
               conn.attestationResult.reason }}</span>
           </td>
           <td>
@@ -104,7 +104,7 @@ <h2 class="mdl-card__title-text">Outgoing Connections</h2>
           </td>
           <td>
             <span class="color-warning text-bold">{{ connOut.attestationResult.status }}</span> <span
-              *ngIf="connOut.attestationResult.reason != null" style="padding-left:10px;font-style:italic">{{
+              *ngIf="connOut.attestationResult.reason !== null" style="padding-left:10px;font-style:italic">{{
               connOut.attestationResult.reason }}</span>
           </td>
           <td>

diff --git a/ids-webconsole/src/main/angular/src/polyfills.ts b/ids-webconsole/src/main/angular/src/polyfills.ts
@@ -1,3 +1,3 @@
 // This file includes polyfills needed by Angular 2 and is loaded before
 // the app. You can add your own extra polyfills to this file.
-import 'zone.js/dist/zone';
+import 'zone.js';