From 51e39801796e6c49c97cc721c7b1e797a45a8880 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 1 Aug 2023 14:29:27 +0300 Subject: [PATCH] Update angular to version 16 --- .../communityGuard/connectAdminLoginGuard.guard.ts | 11 ++--------- connect/communityGuard/isCommunity.guard.ts | 12 +++--------- error/isRouteEnabled.guard.ts | 4 ++-- http-interceptor.service.ts | 2 +- login/adminLoginGuard.guard.ts | 11 ++--------- login/freeGuard.guard.ts | 10 ++-------- login/loginGuard.guard.ts | 13 ++----------- utils/can-exit.guard.ts | 4 ++-- utils/piwik/previousRouteRecorder.guard.ts | 4 ++-- 9 files changed, 18 insertions(+), 53 deletions(-) diff --git a/connect/communityGuard/connectAdminLoginGuard.guard.ts b/connect/communityGuard/connectAdminLoginGuard.guard.ts index 2b55ede5..86359230 100644 --- a/connect/communityGuard/connectAdminLoginGuard.guard.ts +++ b/connect/communityGuard/connectAdminLoginGuard.guard.ts @@ -1,20 +1,13 @@ import {filter, map, mergeMap, take} from 'rxjs/operators'; import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable, of} from 'rxjs'; import {Session} from '../../login/utils/helper.class'; import {LoginErrorCodes} from '../../login/utils/guardHelper.class'; import {UserManagementService} from "../../services/user-management.service"; @Injectable() -export class ConnectAdminLoginGuard implements CanActivate, CanActivateChild { +export class ConnectAdminLoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/connect/communityGuard/isCommunity.guard.ts b/connect/communityGuard/isCommunity.guard.ts index 41b737c2..9dd04798 100644 --- a/connect/communityGuard/isCommunity.guard.ts +++ b/connect/communityGuard/isCommunity.guard.ts @@ -1,11 +1,5 @@ -import { Injectable } from '@angular/core'; -import { - Router, - CanActivate, - ActivatedRouteSnapshot, - RouterStateSnapshot, - CanLoad, Route, UrlSegment, CanActivateChild, UrlTree -} from '@angular/router'; +import {Injectable} from '@angular/core'; +import {ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree} from '@angular/router'; import {Observable} from 'rxjs'; import {ConnectHelper} from '../connectHelper'; @@ -14,7 +8,7 @@ import {CommunityService} from "../community/community.service"; import {map} from "rxjs/operators"; @Injectable() -export class IsCommunity implements CanActivate, CanActivateChild { +export class IsCommunity { constructor(private router: Router, private communityService: CommunityService) { diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts index 2c8d704c..2dca90fb 100644 --- a/error/isRouteEnabled.guard.ts +++ b/error/isRouteEnabled.guard.ts @@ -1,13 +1,13 @@ import {Observable} from 'rxjs'; import {take, tap} from 'rxjs/operators'; import {Injectable} from '@angular/core'; -import {ActivatedRouteSnapshot, CanActivate, Data, Router, RouterStateSnapshot, UrlTree} from '@angular/router'; +import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {ConfigurationService} from '../utils/configuration/configuration.service'; import {ConnectHelper} from '../connect/connectHelper'; import {properties} from "../../../environments/environment"; @Injectable() -export class IsRouteEnabled implements CanActivate { +export class IsRouteEnabled { constructor(private router: Router, private config: ConfigurationService) { diff --git a/http-interceptor.service.ts b/http-interceptor.service.ts index 7b0a4104..03b66510 100644 --- a/http-interceptor.service.ts +++ b/http-interceptor.service.ts @@ -2,7 +2,7 @@ import {Injectable, Inject, PLATFORM_ID, Optional} from '@angular/core'; import {HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpResponse, HttpHeaders} from '@angular/common/http'; import {Observable, of} from 'rxjs'; import {tap} from 'rxjs/operators'; -import {TransferState, makeStateKey, StateKey} from '@angular/platform-browser'; +import {TransferState, makeStateKey, StateKey} from '@angular/core'; import {isPlatformServer} from '@angular/common'; import {properties} from "../../environments/environment"; import {REQUEST} from "./utils/tokens"; diff --git a/login/adminLoginGuard.guard.ts b/login/adminLoginGuard.guard.ts index 53b2ec94..ddb800ab 100644 --- a/login/adminLoginGuard.guard.ts +++ b/login/adminLoginGuard.guard.ts @@ -1,12 +1,5 @@ import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, Data, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {Session} from './utils/helper.class'; import {LoginErrorCodes} from './utils/guardHelper.class'; @@ -16,7 +9,7 @@ import {map, tap} from "rxjs/operators"; @Injectable({ providedIn: 'root' }) -export class AdminLoginGuard implements CanActivate, CanActivateChild { +export class AdminLoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/login/freeGuard.guard.ts b/login/freeGuard.guard.ts index c2141a70..13d5941e 100644 --- a/login/freeGuard.guard.ts +++ b/login/freeGuard.guard.ts @@ -1,16 +1,10 @@ import { Injectable } from '@angular/core'; -import { - Router, - CanActivate, - ActivatedRouteSnapshot, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { Router, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {LoginErrorCodes} from './utils/guardHelper.class'; @Injectable() -export class FreeGuard implements CanActivate { +export class FreeGuard { constructor(private router: Router) { } diff --git a/login/loginGuard.guard.ts b/login/loginGuard.guard.ts index 0c9f737c..297f52df 100644 --- a/login/loginGuard.guard.ts +++ b/login/loginGuard.guard.ts @@ -1,14 +1,5 @@ import {Injectable} from '@angular/core'; -import { - ActivatedRouteSnapshot, - CanActivate, - CanActivateChild, - CanLoad, - Route, - Router, - RouterStateSnapshot, - UrlTree -} from '@angular/router'; +import { ActivatedRouteSnapshot, Route, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import {Observable} from 'rxjs'; import {LoginErrorCodes} from './utils/guardHelper.class'; import {map, tap} from "rxjs/operators"; @@ -17,7 +8,7 @@ import {UserManagementService} from "../services/user-management.service"; @Injectable({ providedIn: 'root' }) -export class LoginGuard implements CanActivate, CanLoad, CanActivateChild { +export class LoginGuard { constructor(private router: Router, private userManagementService: UserManagementService) { diff --git a/utils/can-exit.guard.ts b/utils/can-exit.guard.ts index 61947899..692a970f 100644 --- a/utils/can-exit.guard.ts +++ b/utils/can-exit.guard.ts @@ -1,6 +1,6 @@ import {Observable} from 'rxjs'; import {Injectable} from '@angular/core'; -import {CanDeactivate} from '@angular/router'; + export interface IDeactivateComponent { canExit: () => Observable | Promise | boolean; @@ -9,7 +9,7 @@ export interface IDeactivateComponent { @Injectable({ providedIn: 'root' }) -export class CanExitGuard implements CanDeactivate { +export class CanExitGuard { constructor() { } diff --git a/utils/piwik/previousRouteRecorder.guard.ts b/utils/piwik/previousRouteRecorder.guard.ts index e4961b7a..4d050618 100644 --- a/utils/piwik/previousRouteRecorder.guard.ts +++ b/utils/piwik/previousRouteRecorder.guard.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; -import { CanDeactivate, Router} from '@angular/router'; +import { Router } from '@angular/router'; import {Observable} from 'rxjs'; import {properties} from "../../../../environments/environment"; @Injectable({ providedIn: 'root' }) // do not forget to register this class as a provider -export class PreviousRouteRecorder implements CanDeactivate { +export class PreviousRouteRecorder { constructor(private router: Router) { } canDeactivate(component: any): Observable | boolean {