Angular core 16

ui-ngx/.eslintrc.json

@@ -1,68 +1,70 @@
 {
-    "root": true,
+  "root": true,
-    "ignorePatterns": [
+  "ignorePatterns": [
-        "projects/**/*"
+    "projects/**/*"
-    ],
+  ],
-    "overrides": [
+  "overrides": [
-        {
+    {
-            "files": [
+      "files": [
-                "*.ts"
+        "*.ts"
-            ],
+      ],
-            "parserOptions": {
+      "parserOptions": {
-                "project": [
+        "project": [
-                    "tsconfig.json",
+          "tsconfig.json",
-                    "e2e/tsconfig.json"
+          "e2e/tsconfig.json"
-                ],
+        ],
-                "createDefaultProgram": true
+        "createDefaultProgram": true
-            },
+      },
-            "extends": [
+      "extends": [
-                "plugin:@angular-eslint/ng-cli-compat",
+        "plugin:@angular-eslint/ng-cli-compat",
-                "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
-                "plugin:@angular-eslint/template/process-inline-templates"
+        "plugin:@angular-eslint/template/process-inline-templates"
-            ],
+      ],
-            "rules": {
+      "rules": {
-                "@typescript-eslint/explicit-member-accessibility": [
+        "@typescript-eslint/explicit-member-accessibility": [
-                    "off",
+          "off",
-                    {
+          {
-                        "accessibility": "explicit"
+            "accessibility": "explicit"
-                    }
+          }
-                ],
+        ],
-                "arrow-parens": [
+        "arrow-parens": [
-                    "off",
+          "off",
-                    "always"
+          "always"
-                ],
+        ],
-                "@angular-eslint/component-selector": [
+        "@angular-eslint/component-selector": [
-                    "error",
+          "error",
-                    {
+          {
-                        "prefix": [ "tb" ]
+            "prefix": [
-                    }
+              "tb"
-                ],
+            ]
-                "id-blacklist": [
+          }
-                    "error",
+        ],
-                    "any",
+        "id-blacklist": [
-                    "Number",
+          "error",
-                    "String",
+          "any",
-                    "string",
+          "Number",
-                    "Boolean",
+          "String",
-                    "boolean",
+          "string",
-                    "Undefined",
+          "Boolean",
-                    "undefined"
+          "boolean",
-                ],
+          "Undefined",
-                "import/order": "off",
+          "undefined"
-                "@typescript-eslint/member-ordering": "off",
+        ],
-                "no-underscore-dangle": "off",
+        "import/order": "off",
-                "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/member-ordering": "off",
-                "jsdoc/newline-after-description": 0
+        "no-underscore-dangle": "off",
-            }
+        "@typescript-eslint/naming-convention": "off",
-        },
+        "jsdoc/newline-after-description": 0
-        {
+      }
-            "files": [
+    },
-                "*.html"
+    {
-            ],
+      "files": [
-            "extends": [
+        "*.html"
-                "plugin:@angular-eslint/template/recommended"
+      ],
-            ],
+      "extends": [
-            "rules": {}
+        "plugin:@angular-eslint/template/recommended"
-        }
+      ],
-    ]
+      "rules": {}
+    }
+  ]
 }

ui-ngx/package.json

@@ -14,22 +14,22 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.2.10",
+    "@angular/animations": "^16.2.12",
     "@angular/cdk": "^15.2.9",
-    "@angular/common": "^15.2.10",
+    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^15.2.10",
+    "@angular/compiler": "^16.2.12",
-    "@angular/core": "^15.2.10",
+    "@angular/core": "^16.2.12",
     "@angular/flex-layout": "^15.0.0-beta.42",
-    "@angular/forms": "^15.2.10",
+    "@angular/forms": "^16.2.12",
     "@angular/material": "^15.2.9",
-    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser": "^16.2.12",
-    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^16.2.12",
-    "@angular/router": "^15.2.10",
+    "@angular/router": "^16.2.12",
     "@auth0/angular-jwt": "^5.1.2",
     "@date-io/core": "1.3.7",
     "@date-io/date-fns": "1.3.7",
     "@flowjs/flow.js": "^2.14.1",
-    "@flowjs/ngx-flow": "~0.6.0",
+    "@flowjs/ngx-flow": "~0.7.2",
     "@geoman-io/leaflet-geoman-free": "2.14.2",
     "@iplab/ngx-color-picker": "^15.0.2",
     "@mat-datetimepicker/core": "~11.0.3",
@@ -111,15 +111,15 @@
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "~15.0.0",
-    "@angular-devkit/build-angular": "^15.2.10",
+    "@angular-devkit/build-angular": "^16.2.16",
-    "@angular-eslint/builder": "15.2.1",
+    "@angular-eslint/builder": "16.3.1",
-    "@angular-eslint/eslint-plugin": "15.2.1",
+    "@angular-eslint/eslint-plugin": "16.3.1",
-    "@angular-eslint/eslint-plugin-template": "15.2.1",
+    "@angular-eslint/eslint-plugin-template": "16.3.1",
-    "@angular-eslint/schematics": "15.2.1",
+    "@angular-eslint/schematics": "16.3.1",
-    "@angular-eslint/template-parser": "15.2.1",
+    "@angular-eslint/template-parser": "16.3.1",
-    "@angular/cli": "^15.2.10",
+    "@angular/cli": "^16.2.16",
-    "@angular/compiler-cli": "^15.2.10",
+    "@angular/compiler-cli": "^16.2.12",
-    "@angular/language-service": "^15.2.10",
+    "@angular/language-service": "^16.2.12",
     "@ngtools/webpack": "15.2.10",
     "@types/ace-diff": "^2.1.1",
     "@types/canvas-gauges": "^2.1.4",
@@ -143,11 +143,11 @@
     "@types/systemjs": "6.13.1",
     "@types/tinycolor2": "^1.4.3",
     "@types/tooltipster": "^0.0.31",
-    "@typescript-eslint/eslint-plugin": "5.57.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "5.57.0",
+    "@typescript-eslint/parser": "^5.59.2",
     "compression-webpack-plugin": "^10.0.0",
     "directory-tree": "^3.5.1",
-    "eslint": "^8.37.0",
+    "eslint": "^8.39.0",
     "eslint-plugin-import": "latest",
     "eslint-plugin-jsdoc": "latest",
     "eslint-plugin-prefer-arrow": "latest",

ui-ngx/src/app/core/guards/auth.guard.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgZone } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
 import { AuthService } from '../auth/auth.service';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '../core.state';
@@ -34,7 +34,7 @@ import { MobileService } from '@core/services/mobile.service';
 @Injectable({
   providedIn: 'root'
 })
-export class AuthGuard implements CanActivate, CanActivateChild {
+export class AuthGuard  {
 
   constructor(private store: Store<AppState>,
               private router: Router,

ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot } from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { UntypedFormGroup } from '@angular/forms';
 import { select, Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -39,7 +39,7 @@ export interface HasDirtyFlag {
 @Injectable({
   providedIn: 'root'
 })
-export class ConfirmOnExitGuard implements CanDeactivate<HasConfirmForm & HasDirtyFlag> {
+export class ConfirmOnExitGuard  {
 
   constructor(private store: Store<AppState>,
               private dialogService: DialogService,

ui-ngx/src/app/modules/dashboard/dashboard-pages.routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterModule, Routes } from '@angular/router';
+import { ActivatedRouteSnapshot, RouterModule, Routes } from '@angular/router';
 
 import { Authority } from '@shared/models/authority.enum';
 import { DashboardPageComponent } from '@home/components/dashboard-page/dashboard-page.component';
@@ -28,7 +28,7 @@ import { Widget } from '@app/shared/models/widget.models';
 import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
 
 @Injectable()
-export class WidgetEditorDashboardResolver implements Resolve<Dashboard> {
+export class WidgetEditorDashboardResolver  {
 
   constructor(private dashboardService: DashboardService,
               private dashboardUtils: DashboardUtilsService,

ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts

@@ -15,15 +15,7 @@
 ///
 
 import { inject, NgModule } from '@angular/core';
-import {
+import { ActivatedRouteSnapshot, ResolveFn, Router, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
-  ActivatedRouteSnapshot,
-  Resolve,
-  ResolveFn,
-  Router,
-  RouterModule,
-  RouterStateSnapshot,
-  Routes
-} from '@angular/router';
 
 import { MailServerComponent } from '@modules/home/pages/admin/mail-server.component';
 import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';

ui-ngx/src/app/modules/home/pages/admin/oauth2/clients/clients-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { Resolve } from '@angular/router';
+
 import {
   DateEntityTableColumn,
   EntityTableColumn,
@@ -37,7 +37,7 @@ import { Direction } from '@shared/models/page/sort-order';
 import { PageLink } from '@shared/models/page/page-link';
 
 @Injectable()
-export class ClientsTableConfigResolver implements Resolve<EntityTableConfig<OAuth2Client, PageLink, OAuth2ClientInfo>> {
+export class ClientsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<OAuth2Client, PageLink, OAuth2ClientInfo> =
     new EntityTableConfig<OAuth2Client, PageLink, OAuth2ClientInfo>();

ui-ngx/src/app/modules/home/pages/admin/oauth2/domains/domain-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import {
   DateEntityTableColumn,
   EntityActionTableColumn,
@@ -36,7 +36,7 @@ import { Direction } from '@app/shared/models/page/sort-order';
 import { map, Observable, of, mergeMap } from 'rxjs';
 
 @Injectable()
-export class DomainTableConfigResolver implements Resolve<EntityTableConfig<DomainInfo>> {
+export class DomainTableConfigResolver  {
 
   private readonly config: EntityTableConfig<DomainInfo> = new EntityTableConfig<DomainInfo>();
 

ui-ngx/src/app/modules/home/pages/admin/oauth2/mobile-apps/mobile-app-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import {
   CellActionDescriptorType,
   DateEntityTableColumn,
@@ -36,7 +36,7 @@ import { MobileAppTableHeaderComponent } from '@home/pages/admin/oauth2/mobile-a
 import { map, Observable, of, mergeMap } from 'rxjs';
 
 @Injectable()
-export class MobileAppTableConfigResolver implements Resolve<EntityTableConfig<MobileAppInfo>> {
+export class MobileAppTableConfigResolver  {
 
   private readonly config: EntityTableConfig<MobileAppInfo> = new EntityTableConfig<MobileAppInfo>();
 

ui-ngx/src/app/modules/home/pages/admin/oauth2/oauth2-routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { Resolve, RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 import { RouterTabsComponent } from '@home/components/router-tabs.component';
 import { Authority } from '@shared/models/authority.enum';
 import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
@@ -30,7 +30,7 @@ import { MobileAppTableConfigResolver } from '@home/pages/admin/oauth2/mobile-ap
 import { MenuId } from '@core/services/menu.models';
 
 @Injectable()
-export class OAuth2LoginProcessingUrlResolver implements Resolve<string> {
+export class OAuth2LoginProcessingUrlResolver  {
 
   constructor(private oauth2Service: OAuth2Service) {
   }

ui-ngx/src/app/modules/home/pages/admin/queue/queues-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import { EntityTableColumn, EntityTableConfig } from '@home/models/entity/entities-table-config.models';
 import {
   QueueInfo,
@@ -39,7 +39,7 @@ import { selectAuthUser } from '@core/auth/auth.selectors';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 
 @Injectable()
-export class QueuesTableConfigResolver implements Resolve<EntityTableConfig<QueueInfo>> {
+export class QueuesTableConfigResolver  {
 
   readonly queueType = ServiceType.TB_RULE_ENGINE;
 

ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts

@@ -21,7 +21,7 @@ import {
   EntityTableColumn,
   EntityTableConfig
 } from '@home/models/entity/entities-table-config.models';
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { Resource, ResourceInfo, ResourceType, ResourceTypeTranslationMap } from '@shared/models/resource.models';
 import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
@@ -39,7 +39,7 @@ import { map } from 'rxjs/operators';
 import { ResourcesTableHeaderComponent } from '@home/pages/admin/resource/resources-table-header.component';
 
 @Injectable()
-export class ResourcesLibraryTableConfigResolver implements Resolve<EntityTableConfig<Resource, PageLink, ResourceInfo>> {
+export class ResourcesLibraryTableConfigResolver  {
 
   private readonly config: EntityTableConfig<Resource, PageLink, ResourceInfo> = new EntityTableConfig<Resource, PageLink, ResourceInfo>();
   private readonly resourceTypesTranslationMap = ResourceTypeTranslationMap;

ui-ngx/src/app/modules/home/pages/alarm/alarm-routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { Resolve, RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 import { Authority } from '@shared/models/authority.enum';
 import { Observable } from 'rxjs';
 import { OAuth2Service } from '@core/http/oauth2.service';
@@ -24,7 +24,7 @@ import { AlarmsMode } from '@shared/models/alarm.models';
 import { MenuId } from '@core/services/menu.models';
 
 @Injectable()
-export class OAuth2LoginProcessingUrlResolver implements Resolve<string> {
+export class OAuth2LoginProcessingUrlResolver  {
 
   constructor(private oauth2Service: OAuth2Service) {
   }

ui-ngx/src/app/modules/home/pages/asset-profile/asset-profiles-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   checkBoxCell,
   DateEntityTableColumn,
@@ -37,7 +37,7 @@ import { AssetProfileComponent } from '@home/components/profile/asset-profile.co
 import { AssetProfileTabsComponent } from './asset-profile-tabs.component';
 
 @Injectable()
-export class AssetProfilesTableConfigResolver implements Resolve<EntityTableConfig<AssetProfile>> {
+export class AssetProfilesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<AssetProfile> = new EntityTableConfig<AssetProfile>();
 

ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -65,7 +65,7 @@ import {
 } from '@home/dialogs/add-entities-to-edge-dialog.component';
 
 @Injectable()
-export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<AssetInfo>> {
+export class AssetsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<AssetInfo> = new EntityTableConfig<AssetInfo>();
 

ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 
 import {
   DateEntityTableColumn,
@@ -37,7 +37,7 @@ import { AppState } from '@core/core.state';
 import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
 
 @Injectable()
-export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<Customer>> {
+export class CustomersTableConfigResolver  {
 
   private readonly config: EntityTableConfig<Customer> = new EntityTableConfig<Customer>();
 

ui-ngx/src/app/modules/home/pages/dashboard/dashboard-routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterModule, Routes } from '@angular/router';
+import { ActivatedRouteSnapshot, RouterModule, Routes } from '@angular/router';
 
 import { EntitiesTableComponent } from '../../components/entity/entities-table.component';
 import { Authority } from '@shared/models/authority.enum';
@@ -36,7 +36,7 @@ import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
 import { MenuId } from '@core/services/menu.models';
 
 @Injectable()
-export class DashboardResolver implements Resolve<Dashboard> {
+export class DashboardResolver  {
 
   constructor(private store: Store<AppState>,
               private dashboardService: DashboardService,

ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -79,7 +79,7 @@ import {
 } from '@home/components/alias/entity-aliases-dialog.component';
 
 @Injectable()
-export class DashboardsTableConfigResolver implements Resolve<EntityTableConfig<DashboardInfo | Dashboard>> {
+export class DashboardsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<DashboardInfo | Dashboard> = new EntityTableConfig<DashboardInfo | Dashboard>();
 

ui-ngx/src/app/modules/home/pages/device-profile/device-profiles-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   checkBoxCell,
   DateEntityTableColumn,
@@ -45,7 +45,7 @@ import { ImportExportService } from '@shared/import-export/import-export.service
 import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
 
 @Injectable()
-export class DeviceProfilesTableConfigResolver implements Resolve<EntityTableConfig<DeviceProfile>> {
+export class DeviceProfilesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<DeviceProfile> = new EntityTableConfig<DeviceProfile>();
 

ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRoute, ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -91,7 +91,7 @@ interface DevicePageQueryParams extends PageQueryParam {
 }
 
 @Injectable()
-export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<DeviceInfo>> {
+export class DevicesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<DeviceInfo> = new EntityTableConfig<DeviceInfo>();
 

ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -65,7 +65,7 @@ import {
 import { AddEntityDialogComponent } from '@home/components/entity/add-entity-dialog.component';
 
 @Injectable()
-export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeInfo>> {
+export class EdgesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<EdgeInfo> = new EntityTableConfig<EdgeInfo>();
   private customerId: string;

ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -63,7 +63,7 @@ import {
 } from '@home/dialogs/add-entities-to-edge-dialog.component';
 
 @Injectable()
-export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig<EntityViewInfo>> {
+export class EntityViewsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<EntityViewInfo> = new EntityTableConfig<EntityViewInfo>();
 

ui-ngx/src/app/modules/home/pages/notification/inbox/inbox-table-config.resolver.ts

@@ -38,11 +38,11 @@ import {
   InboxNotificationDialogData
 } from '@home/pages/notification/inbox/inbox-notification-dialog.component';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { UtilsService } from '@core/services/utils.service';
 
 @Injectable()
-export class InboxTableConfigResolver implements Resolve<EntityTableConfig<Notification>> {
+export class InboxTableConfigResolver  {
 
   private readonly config: EntityTableConfig<Notification> = new EntityTableConfig<Notification>();
 

ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-table-config.resolver.ts

@@ -32,12 +32,12 @@ import {
 import { MatDialog } from '@angular/material/dialog';
 import { EntityAction } from '@home/models/entity/entity-component.models';
 import { RecipientTableHeaderComponent } from '@home/pages/notification/recipient/recipient-table-header.component';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
 import { DatePipe } from '@angular/common';
 
 @Injectable()
-export class RecipientTableConfigResolver implements Resolve<EntityTableConfig<NotificationTarget>> {
+export class RecipientTableConfigResolver  {
 
   private readonly config: EntityTableConfig<NotificationTarget> = new EntityTableConfig<NotificationTarget>();
 

ui-ngx/src/app/modules/home/pages/notification/rule/rule-table-config.resolver.ts

@@ -32,12 +32,12 @@ import {
   RuleNotificationDialogComponent,
   RuleNotificationDialogData
 } from '@home/pages/notification/rule/rule-notification-dialog.component';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
 import { DatePipe } from '@angular/common';
 
 @Injectable()
-export class RuleTableConfigResolver implements Resolve<EntityTableConfig<NotificationRule>> {
+export class RuleTableConfigResolver  {
 
   private readonly config: EntityTableConfig<NotificationRule> = new EntityTableConfig<NotificationRule>();
 

ui-ngx/src/app/modules/home/pages/notification/sent/sent-table-config.resolver.ts

@@ -45,11 +45,11 @@ import {
   NotificationRequestErrorDialogData,
   SentErrorDialogComponent
 } from '@home/pages/notification/sent/sent-error-dialog.component';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
 
 @Injectable()
-export class SentTableConfigResolver implements Resolve<EntityTableConfig<NotificationRequest, PageLink, NotificationRequestInfo>> {
+export class SentTableConfigResolver  {
 
   private readonly config: EntityTableConfig<NotificationRequest, PageLink, NotificationRequestInfo> =
     new EntityTableConfig<NotificationRequest, PageLink, NotificationRequestInfo>();

ui-ngx/src/app/modules/home/pages/notification/template/template-table-config.resolver.ts

@@ -33,11 +33,11 @@ import {
 import { TranslateService } from '@ngx-translate/core';
 import { TemplateTableHeaderComponent } from '@home/pages/notification/template/template-table-header.component';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { DatePipe } from '@angular/common';
 
 @Injectable()
-export class TemplateTableConfigResolver implements Resolve<EntityTableConfig<NotificationTemplate>> {
+export class TemplateTableConfigResolver  {
 
   private readonly config: EntityTableConfig<NotificationTemplate> = new EntityTableConfig<NotificationTemplate>();
 

ui-ngx/src/app/modules/home/pages/ota-update/ota-update-table-config.resolve.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   CellActionDescriptorType,
   DateEntityTableColumn,
@@ -40,7 +40,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 
 @Injectable()
-export class OtaUpdateTableConfigResolve implements Resolve<EntityTableConfig<OtaPackage, PageLink, OtaPackageInfo>> {
+export class OtaUpdateTableConfigResolve  {
 
   private readonly config: EntityTableConfig<OtaPackage, PageLink, OtaPackageInfo> =
     new EntityTableConfig<OtaPackage, PageLink, OtaPackageInfo>();

ui-ngx/src/app/modules/home/pages/profile/profile-routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { Resolve, RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 import { ProfileComponent } from './profile.component';
 import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
@@ -28,7 +28,7 @@ import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { Observable } from 'rxjs';
 
 @Injectable()
-export class UserProfileResolver implements Resolve<User> {
+export class UserProfileResolver  {
 
   constructor(private store: Store<AppState>,
               private userService: UserService) {

ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts

@@ -15,16 +15,7 @@
 ///
 
 import { Inject, Injectable, NgModule, Optional } from '@angular/core';
-import {
+import { ActivatedRouteSnapshot, Router, RouterModule, RouterStateSnapshot, Routes, UrlTree } from '@angular/router';
-  ActivatedRouteSnapshot,
-  CanActivate,
-  Resolve,
-  Router,
-  RouterModule,
-  RouterStateSnapshot,
-  Routes,
-  UrlTree
-} from '@angular/router';
 
 import { EntitiesTableComponent } from '../../components/entity/entities-table.component';
 import { Authority } from '@shared/models/authority.enum';
@@ -44,7 +35,7 @@ import { MODULES_MAP } from '@shared/public-api';
 import { IModulesMap } from '@modules/common/modules-map.models';
 
 @Injectable()
-export class RuleChainResolver implements Resolve<RuleChain> {
+export class RuleChainResolver  {
 
   constructor(private ruleChainService: RuleChainService) {
   }
@@ -56,7 +47,7 @@ export class RuleChainResolver implements Resolve<RuleChain> {
 }
 
 @Injectable()
-export class RuleChainMetaDataResolver implements Resolve<RuleChainMetaData> {
+export class RuleChainMetaDataResolver  {
 
   constructor(private ruleChainService: RuleChainService) {
   }
@@ -68,7 +59,7 @@ export class RuleChainMetaDataResolver implements Resolve<RuleChainMetaData> {
 }
 
 @Injectable()
-export class RuleNodeComponentsResolver implements Resolve<Array<RuleNodeComponentDescriptor>> {
+export class RuleNodeComponentsResolver  {
 
   constructor(private ruleChainService: RuleChainService,
               @Optional() @Inject(MODULES_MAP) private modulesMap: IModulesMap) {
@@ -80,7 +71,7 @@ export class RuleNodeComponentsResolver implements Resolve<Array<RuleNodeCompone
 }
 
 @Injectable()
-export class TooltipsterResolver implements Resolve<any> {
+export class TooltipsterResolver  {
 
   constructor() {
   }
@@ -91,7 +82,7 @@ export class TooltipsterResolver implements Resolve<any> {
 }
 
 @Injectable()
-export class RuleChainImportGuard implements CanActivate {
+export class RuleChainImportGuard  {
 
   constructor(private itembuffer: ItemBufferService,
               private router: Router) {

ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   CellActionDescriptor,
   checkBoxCell,
@@ -53,7 +53,7 @@ import { PageData } from '@shared/models/page/page-data';
 import { HomeDialogsService } from '@home/dialogs/home-dialogs.service';
 
 @Injectable()
-export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> {
+export class RuleChainsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<RuleChain> = new EntityTableConfig<RuleChain>();
   private edge: Edge;

ui-ngx/src/app/modules/home/pages/security/security-routing.module.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable, NgModule } from '@angular/core';
-import { Resolve, RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 import { SecurityComponent } from './security.component';
 import { ConfirmOnExitGuard } from '@core/guards/confirm-on-exit.guard';
@@ -30,7 +30,7 @@ import { TwoFactorAuthProviderType } from '@shared/models/two-factor-auth.models
 import { TwoFactorAuthenticationService } from '@core/http/two-factor-authentication.service';
 
 @Injectable()
-export class UserProfileResolver implements Resolve<User> {
+export class UserProfileResolver  {
 
   constructor(private store: Store<AppState>,
               private userService: UserService) {
@@ -43,7 +43,7 @@ export class UserProfileResolver implements Resolve<User> {
 }
 
 @Injectable()
-export class UserTwoFAProvidersResolver implements Resolve<Array<TwoFactorAuthProviderType>> {
+export class UserTwoFAProvidersResolver  {
 
   constructor(private twoFactorAuthService: TwoFactorAuthenticationService) {
   }

ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts

@@ -15,7 +15,7 @@
 ///
 
 import { Injectable } from '@angular/core';
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { TenantProfile } from '@shared/models/tenant.model';
 import {
   checkBoxCell,
@@ -35,7 +35,7 @@ import { DialogService } from '@core/services/dialog.service';
 import { ImportExportService } from '@shared/import-export/import-export.service';
 
 @Injectable()
-export class TenantProfilesTableConfigResolver implements Resolve<EntityTableConfig<TenantProfile>> {
+export class TenantProfilesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<TenantProfile> = new EntityTableConfig<TenantProfile>();
 

ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 
 import { TenantInfo } from '@shared/models/tenant.model';
 import {
@@ -34,7 +34,7 @@ import { TenantTabsComponent } from '@home/pages/tenant/tenant-tabs.component';
 import { mergeMap } from 'rxjs/operators';
 
 @Injectable()
-export class TenantsTableConfigResolver implements Resolve<EntityTableConfig<TenantInfo>> {
+export class TenantsTableConfigResolver  {
 
   private readonly config: EntityTableConfig<TenantInfo> = new EntityTableConfig<TenantInfo>();
 

ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
 import {
   DateEntityTableColumn,
   EntityTableColumn,
@@ -57,7 +57,7 @@ export interface UsersTableRouteData {
 }
 
 @Injectable()
-export class UsersTableConfigResolver implements Resolve<EntityTableConfig<User>> {
+export class UsersTableConfigResolver  {
 
   private readonly config: EntityTableConfig<User> = new EntityTableConfig<User>();
 

ui-ngx/src/app/modules/home/pages/widget/widget-types-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   checkBoxCell,
   DateEntityTableColumn,
@@ -48,7 +48,7 @@ import { SelectWidgetTypeDialogComponent } from '@home/pages/widget/select-widge
 import { MatDialog } from '@angular/material/dialog';
 
 @Injectable()
-export class WidgetTypesTableConfigResolver implements Resolve<EntityTableConfig<WidgetTypeInfo | WidgetTypeDetails>> {
+export class WidgetTypesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<WidgetTypeInfo | WidgetTypeDetails> =
     new EntityTableConfig<WidgetTypeInfo | WidgetTypeDetails>();

ui-ngx/src/app/modules/home/pages/widget/widgets-bundles-table-config.resolver.ts

@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 
-import { Resolve, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import {
   checkBoxCell,
   DateEntityTableColumn,
@@ -41,7 +41,7 @@ import { Direction } from '@shared/models/page/sort-order';
 import { WidgetsBundleTabsComponent } from '@home/pages/widget/widgets-bundle-tabs.component';
 
 @Injectable()
-export class WidgetsBundlesTableConfigResolver implements Resolve<EntityTableConfig<WidgetsBundle>> {
+export class WidgetsBundlesTableConfigResolver  {
 
   private readonly config: EntityTableConfig<WidgetsBundle> = new EntityTableConfig<WidgetsBundle>();