From cf9be1f98b477fad8143e9a77317c0af2bd4ae9f Mon Sep 17 00:00:00 2001
From: Vladyslav Prykhodko <vlad.pryhodko@icloud.com>
Date: Sat, 15 Jan 2022 10:48:53 +0200
Subject: [PATCH] UI: Fixed generate url for entity details page

---
 .../admin/resource/resources-library-table-config.resolve.ts   | 3 ++-
 .../modules/home/pages/asset/assets-table-config.resolver.ts   | 2 +-
 .../home/pages/customer/customers-table-config.resolver.ts     | 2 +-
 .../modules/home/pages/device/devices-table-config.resolver.ts | 2 +-
 .../app/modules/home/pages/edge/edges-table-config.resolver.ts | 2 +-
 .../pages/entity-view/entity-views-table-config.resolver.ts    | 2 +-
 .../tenant-profile/tenant-profiles-table-config.resolver.ts    | 2 +-
 .../modules/home/pages/tenant/tenants-table-config.resolver.ts | 2 +-
 .../app/modules/home/pages/user/users-table-config.resolver.ts | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
index 106898f9a5..a3e0779c1d 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
@@ -123,7 +123,8 @@ export class ResourcesLibraryTableConfigResolver implements Resolve<EntityTableC
     if ($event) {
       $event.stopPropagation();
     }
-    this.router.navigateByUrl(`settings/resources-library/${resourceInfo.id.id}`);
+    const url = this.router.createUrlTree(['settings', 'resources-library', resourceInfo.id.id]);
+    this.router.navigateByUrl(url);
   }
 
   downloadResource($event: Event, resource: ResourceInfo) {
diff --git a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
index 93b0aef495..92c77a9f67 100644
--- a/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
@@ -341,7 +341,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([asset.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([asset.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
index fafa5bb4f2..71b7b63e97 100644
--- a/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
@@ -141,7 +141,7 @@ export class CustomersTableConfigResolver implements Resolve<EntityTableConfig<C
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([customer.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([customer.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
index 78985ab115..5082ecd2fb 100644
--- a/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
@@ -375,7 +375,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([device.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([device.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
index 00b1bf2f26..e25db704ff 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
@@ -374,7 +374,7 @@ export class EdgesTableConfigResolver implements Resolve<EntityTableConfig<EdgeI
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([edge.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([edge.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
index e45370d257..b36756ace1 100644
--- a/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
@@ -337,7 +337,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([entityView.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([entityView.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts
index caa89e7b6f..5a81a0e603 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts
@@ -16,7 +16,7 @@
 
 import { Injectable } from '@angular/core';
 import { Resolve, Router } from '@angular/router';
-import { TenantInfo, TenantProfile } from '@shared/models/tenant.model';
+import { TenantProfile } from '@shared/models/tenant.model';
 import {
   checkBoxCell,
   DateEntityTableColumn,
diff --git a/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
index 2cbb26f4f4..7d5d7a3d7f 100644
--- a/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
@@ -91,7 +91,7 @@ export class TenantsTableConfigResolver implements Resolve<EntityTableConfig<Ten
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([tenant.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([tenant.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts b/ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts
index 3902b463c8..62d7a3091d 100644
--- a/ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts
+++ b/ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts
@@ -178,7 +178,7 @@ export class UsersTableConfigResolver implements Resolve<EntityTableConfig<User>
     if ($event) {
       $event.stopPropagation();
     }
-    const url = this.router.createUrlTree([user.id.id], {relativeTo: config.table.route})
+    const url = this.router.createUrlTree([user.id.id], {relativeTo: config.table.route});
     this.router.navigateByUrl(url);
   }