Skip to content

Commit 3be843c

Browse files
miluxmilux
authored
Merge pull request #69 from industrial-data-space/angular-update
Updated Angular
2 parents 98882ce + 1ae0656 commit 3be843c

File tree

6 files changed

+2388
-2665
lines changed

6 files changed

+2388
-2665
lines changed

‎ids-webconsole/src/main/angular/angular.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14-
"aot": true,
1514
"outputPath": "dist",
1615
"index": "src/index.html",
1716
"main": "src/main.ts",
@@ -38,7 +37,13 @@
3837
"node_modules/ace-builds/src-min/ace.js",
3938
"node_modules/ace-builds/src-min/theme-eclipse.js",
4039
"node_modules/ace-builds/src-min/mode-xml.js"
41-
]
40+
],
41+
"vendorChunk": true,
42+
"extractLicenses": false,
43+
"buildOptimizer": false,
44+
"sourceMap": true,
45+
"optimization": false,
46+
"namedChunks": true
4247
},
4348
"configurations": {
4449
"production": {
@@ -52,7 +57,6 @@
5257
"outputHashing": "all",
5358
"sourceMap": false,
5459
"namedChunks": false,
55-
"aot": true,
5660
"extractLicenses": true,
5761
"vendorChunk": false,
5862
"buildOptimizer": true,
@@ -63,7 +67,8 @@
6367
}
6468
]
6569
}
66-
}
70+
},
71+
"defaultConfiguration": ""
6772
},
6873
"serve": {
6974
"builder": "@angular-devkit/build-angular:dev-server",

‎ids-webconsole/src/main/angular/package.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"license": "SEE LICENSE IN license.txt",
55
"angular-cli": {},
66
"scripts": {
7-
"bundle": "ng build --prod --no-progress --output-path=\"../../../build/resources/main/www\""
7+
"bundle": "ng build --configuration production --no-progress --output-path=\"../../../build/resources/main/www\""
88
},
99
"private": true,
1010
"dependencies": {
11-
"@angular/animations": "~11.2.13",
12-
"@angular/common": "~11.2.13",
13-
"@angular/core": "~11.2.13",
14-
"@angular/forms": "~11.2.13",
15-
"@angular/platform-browser": "~11.2.13",
16-
"@angular/platform-browser-dynamic": "~11.2.13",
17-
"@angular/platform-server": "~11.2.13",
18-
"@angular/router": "~11.2.13",
11+
"@angular/animations": "~12.1.1",
12+
"@angular/common": "~12.1.1",
13+
"@angular/core": "~12.1.1",
14+
"@angular/forms": "~12.1.1",
15+
"@angular/platform-browser": "~12.1.1",
16+
"@angular/platform-browser-dynamic": "~12.1.1",
17+
"@angular/platform-server": "~12.1.1",
18+
"@angular/router": "~12.1.1",
1919
"bootstrap": "^4.2.1",
2020
"core-js": "^3.6.4",
2121
"deep-equal": "^2.0.1",
@@ -28,27 +28,27 @@
2828
"topojson": "^3.0.2",
2929
"tslib": "^2.0.0",
3030
"viz.js": "^2.1.1",
31-
"zone.js": "^0.11.4"
31+
"zone.js": "~0.11.4"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "~0.1102.12",
35-
"@angular-eslint/builder": "4.2.0",
36-
"@angular-eslint/eslint-plugin": "4.2.0",
37-
"@angular-eslint/eslint-plugin-template": "4.2.0",
38-
"@angular-eslint/schematics": "4.2.0",
39-
"@angular-eslint/template-parser": "4.2.0",
40-
"@angular/cli": "~11.2.12",
41-
"@angular/compiler": "~11.2.13",
42-
"@angular/compiler-cli": "~11.2.13",
34+
"@angular-devkit/build-angular": "^12.1.1",
35+
"@angular-eslint/builder": "^12.2.0",
36+
"@angular-eslint/eslint-plugin": "^12.2.0",
37+
"@angular-eslint/eslint-plugin-template": "^12.2.0",
38+
"@angular-eslint/schematics": "^12.2.0",
39+
"@angular-eslint/template-parser": "^12.2.0",
40+
"@angular/cli": "~12.1.1",
41+
"@angular/compiler": "~12.1.1",
42+
"@angular/compiler-cli": "~12.1.1",
4343
"@types/node": "^15.0.2",
4444
"@types/vis": "^4.21.9",
45-
"@typescript-eslint/eslint-plugin": "4.16.1",
46-
"@typescript-eslint/parser": "4.16.1",
45+
"@typescript-eslint/eslint-plugin": "^4.28.1",
46+
"@typescript-eslint/parser": "^4.28.1",
4747
"eslint": "^7.6.0",
48-
"eslint-plugin-import": "latest",
49-
"eslint-plugin-jsdoc": "latest",
48+
"eslint-plugin-import": "^2.23.4",
49+
"eslint-plugin-jsdoc": "^35.4.1",
5050
"eslint-plugin-prefer-arrow": "latest",
51-
"typescript": "4.0.5",
51+
"typescript": "4.3.5",
5252
"vis": "^4.20.0"
5353
}
54-
}
54+
}

‎ids-webconsole/src/main/angular/src/app/apps/app-search-result-card.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ <h2 class="mdl-card__title-text">{{ app.title }}</h2>
1414
</div>
1515
<div class="mdl-cell mdl-cell--2-col">
1616
<div>
17-
<span *ngIf="app.platform == 'windows'" style="padding-right:10px"><em
17+
<span *ngIf="app.platform === 'windows'" style="padding-right:10px"><em
1818
class="fab fa-windows fa-2x"></em></span>
19-
<span *ngIf="app.platform == 'linux'" style="padding-right:10px"><em
19+
<span *ngIf="app.platform === 'linux'" style="padding-right:10px"><em
2020
class="fab fa-linux fa-2x"></em></span>
2121
<span *ngIf="app.privileged" style="padding-right:10px;color:#a04040"><em
2222
class="fas fa-exclamation-triangle fa-2x"></em></span>
23-
<span *ngIf="app.type == 'stack'" style="padding-right:10px"><em
23+
<span *ngIf="app.type === 'stack'" style="padding-right:10px"><em
2424
class="fas fa-cubes fa-2x"></em></span>
25-
<span *ngIf="app.type == 'container'" style="padding-right:10px"><em
25+
<span *ngIf="app.type === 'container'" style="padding-right:10px"><em
2626
class="fas fa-cube fa-2x"></em></span>
2727
</div>
2828
<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>
3434
</div>
3535
<div class="mdl-card__actions mdl-card--border">
3636

37-
<button *ngIf="app.type == 'container'" [attr.id]="'menu_' + app.name"
37+
<button *ngIf="app.type === 'container'" [attr.id]="'menu_' + app.name"
3838
class="mdl-button mdl-js-button mdl-button--colored" (click)="onInstall(app)">Install</button>
39-
<button *ngIf="app.type == 'stack'" [attr.id]="'menu_' + app.name"
39+
<button *ngIf="app.type === 'stack'" [attr.id]="'menu_' + app.name"
4040
class="mdl-button mdl-button--disabled mdl-js-button mdl-button--colored"
4141
(click)="onInstall(app)">Stacks cannot be installed</button>
4242
</div>

‎ids-webconsole/src/main/angular/src/app/connection-report/connection-report.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ <h2 class="mdl-card__title-text">Incoming Connections</h2>
6868
</td>
6969
<td>
7070
<span class="color-warning text-bold">{{ conn.attestationResult.status }}</span> <span
71-
*ngIf="conn.attestationResult.reason != null" style="padding-left:10px;font-style:italic">{{
71+
*ngIf="conn.attestationResult.reason !== null" style="padding-left:10px;font-style:italic">{{
7272
conn.attestationResult.reason }}</span>
7373
</td>
7474
<td>
@@ -104,7 +104,7 @@ <h2 class="mdl-card__title-text">Outgoing Connections</h2>
104104
</td>
105105
<td>
106106
<span class="color-warning text-bold">{{ connOut.attestationResult.status }}</span> <span
107-
*ngIf="connOut.attestationResult.reason != null" style="padding-left:10px;font-style:italic">{{
107+
*ngIf="connOut.attestationResult.reason !== null" style="padding-left:10px;font-style:italic">{{
108108
connOut.attestationResult.reason }}</span>
109109
</td>
110110
<td>

‎ids-webconsole/src/main/angular/src/polyfills.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// This file includes polyfills needed by Angular 2 and is loaded before
22
// the app. You can add your own extra polyfills to this file.
3-
import 'zone.js/dist/zone';
3+
import 'zone.js';

0 commit comments

Comments
 (0)