From 49260befded7829a951168faa36f7dcad9402823 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 24 Sep 2024 14:52:51 +0200 Subject: Update Angular to 16 Issue-ID: PORTALNG-123 Change-Id: I3b5771d98799033c37d16faa3355bc706402c0c2 Signed-off-by: Fiete Ostkamp --- .eslintrc.json | 30 ++++++++++++---- package.json | 50 +++++++++++++------------- src/app/guards/auth.guard.ts | 4 +-- src/app/guards/edit-user.can-activate.guard.ts | 4 +-- src/app/guards/has-permissions.guard.ts | 4 +-- 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index a4c8c1c..fb48546 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,17 +1,29 @@ { "root": true, - "ignorePatterns": ["projects/**/*"], + "ignorePatterns": [ + "projects/**/*" + ], "overrides": [ { - "files": ["*.ts"], + "files": [ + "*.ts" + ], "parserOptions": { - "project": ["tsconfig.json", "e2e/tsconfig.json"], + "project": [ + "tsconfig.json", + "e2e/tsconfig.json" + ], "createDefaultProgram": true }, - "extends": ["plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates"], + "extends": [ + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates" + ], "rules": { "no-unused-vars": "off", - "@typescript-eslint/no-unused-vars": ["error"], + "@typescript-eslint/no-unused-vars": [ + "error" + ], "@angular-eslint/component-selector": [ "error", { @@ -31,8 +43,12 @@ } }, { - "files": ["*.html"], - "extends": ["plugin:@angular-eslint/template/recommended"], + "files": [ + "*.html" + ], + "extends": [ + "plugin:@angular-eslint/template/recommended" + ], "rules": {} } ] diff --git a/package.json b/package.json index b9cdf9d..c6d404e 100644 --- a/package.json +++ b/package.json @@ -21,46 +21,46 @@ }, "private": true, "dependencies": { - "@angular/animations": "15.2.10", - "@angular/cdk": "14.2.7", - "@angular/common": "15.2.10", - "@angular/compiler": "15.2.10", - "@angular/core": "15.2.10", - "@angular/forms": "15.2.10", - "@angular/localize": "15.2.10", - "@angular/platform-browser": "15.2.10", - "@angular/platform-browser-dynamic": "15.2.10", - "@angular/router": "15.2.10", - "@ng-bootstrap/ng-bootstrap": "14.2.0", + "@angular/animations": "16.2.12", + "@angular/cdk": "16.2.14", + "@angular/common": "16.2.12", + "@angular/compiler": "16.2.12", + "@angular/core": "16.2.12", + "@angular/forms": "16.2.12", + "@angular/localize": "16.2.12", + "@angular/platform-browser": "16.2.12", + "@angular/platform-browser-dynamic": "16.2.12", + "@angular/router": "16.2.12", + "@ng-bootstrap/ng-bootstrap": "15.1.2", "@ngx-translate/core": "14.0.0", "@ngx-translate/http-loader": "7.0.0", "@popperjs/core": "^2.11.6", - "angular-oauth2-oidc": "14.0.1", + "angular-oauth2-oidc": "^16.0.0", "bootstrap": "5.2.3", "license-report": "5.0.2", "lodash": "4.17.21", "rxjs": "~7.4.0", "tslib": "2.3.0", - "zone.js": "0.11.5" + "zone.js": "0.13.3" }, "devDependencies": { - "@angular-devkit/build-angular": "15.2.11", - "@angular-eslint/builder": "15.2.1", - "@angular-eslint/eslint-plugin": "15.2.1", - "@angular-eslint/eslint-plugin-template": "15.2.1", - "@angular-eslint/schematics": "15.2.1", - "@angular-eslint/template-parser": "15.2.1", - "@angular/cli": "15.2.11", - "@angular/compiler-cli": "15.2.10", + "@angular-devkit/build-angular": "16.2.16", + "@angular-eslint/builder": "16.3.1", + "@angular-eslint/eslint-plugin": "16.3.1", + "@angular-eslint/eslint-plugin-template": "16.3.1", + "@angular-eslint/schematics": "16.3.1", + "@angular-eslint/template-parser": "16.3.1", + "@angular/cli": "16.2.16", + "@angular/compiler-cli": "16.2.12", "@openapitools/openapi-generator-cli": "^2.6.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "2.0.3", "@types/lodash": "4.14.188", "@types/node": "18.0.0", "@types/uuid": "^8.3.4", - "@typescript-eslint/eslint-plugin": "^5.43.0", - "@typescript-eslint/parser": "^5.43.0", - "eslint": "^8.28.0", + "@typescript-eslint/eslint-plugin": "^5.59.2", + "@typescript-eslint/parser": "^5.59.2", + "eslint": "^8.39.0", "git-format-staged": "3.0.0", "husky": "8.0.1", "jasmine-core": "~4.0.0", @@ -81,7 +81,7 @@ "protractor": "7.0.0", "sonar-scanner": "3.1.0", "ts-node": "10.9.0", - "typescript": "~4.8.0" + "typescript": "~4.9.3" }, "husky": { "hooks": { diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 54ede0f..645819c 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; -import { CanActivate, UrlTree } from '@angular/router'; +import { UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; import { AuthService } from '../services/auth.service'; @@ -28,7 +28,7 @@ import { AuthService } from '../services/auth.service'; @Injectable({ providedIn: 'root', }) -export class AuthGuard implements CanActivate { +export class AuthGuard { roles: string = ''; constructor(private authService: AuthService) {} diff --git a/src/app/guards/edit-user.can-activate.guard.ts b/src/app/guards/edit-user.can-activate.guard.ts index 81fc36e..29c927a 100644 --- a/src/app/guards/edit-user.can-activate.guard.ts +++ b/src/app/guards/edit-user.can-activate.guard.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; +import { ActivatedRouteSnapshot, Router } from '@angular/router'; import { Observable, of } from 'rxjs'; import { UsersService } from '../../../openapi/output'; import { catchError, map } from 'rxjs/operators'; @@ -26,7 +26,7 @@ import { TranslateService } from '@ngx-translate/core'; @Injectable({ providedIn: 'root', }) -export class EditUserCanActivateGuard implements CanActivate { +export class EditUserCanActivateGuard { constructor(private usersService: UsersService, private router: Router, private translateService: TranslateService) {} canActivate(route: ActivatedRouteSnapshot): Observable { const userId = route.paramMap.get('userId'); diff --git a/src/app/guards/has-permissions.guard.ts b/src/app/guards/has-permissions.guard.ts index cc04673..1731a33 100644 --- a/src/app/guards/has-permissions.guard.ts +++ b/src/app/guards/has-permissions.guard.ts @@ -18,7 +18,7 @@ import { Inject, Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, CanActivate, Router, UrlTree } from '@angular/router'; +import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router'; import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { ACL_CONFIG, AclConfig } from '../modules/auth/injection-tokens'; @@ -29,7 +29,7 @@ import { map } from 'rxjs/operators'; @Injectable({ providedIn: 'root', }) -export class HasPermissionsGuard implements CanActivate { +export class HasPermissionsGuard { constructor( private readonly authService: AuthService, private readonly httpClient: HttpClient, -- cgit 1.2.3-korg