Browse Source

UI: Fixed generate url for entity details page

pull/5899/head
Vladyslav Prykhodko 5 years ago
parent
commit
cf9be1f98b
  1. 3
      ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
  2. 2
      ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts
  3. 2
      ui-ngx/src/app/modules/home/pages/customer/customers-table-config.resolver.ts
  4. 2
      ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
  5. 2
      ui-ngx/src/app/modules/home/pages/edge/edges-table-config.resolver.ts
  6. 2
      ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
  7. 2
      ui-ngx/src/app/modules/home/pages/tenant-profile/tenant-profiles-table-config.resolver.ts
  8. 2
      ui-ngx/src/app/modules/home/pages/tenant/tenants-table-config.resolver.ts
  9. 2
      ui-ngx/src/app/modules/home/pages/user/users-table-config.resolver.ts

3
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) {

2
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);
}

2
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);
}

2
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);
}

2
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);
}

2
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);
}

2
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,

2
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);
}

2
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);
}

Loading…
Cancel
Save