Commit f867e2c14f5ebb40e1fa4ae735d2b4e441499708

Authored by deaflynx
1 parent 4e8af4a1

Code review: from assets-table-config.resolver removed var edgeId usage

... ... @@ -70,7 +70,6 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
70 70 private readonly config: EntityTableConfig<AssetInfo> = new EntityTableConfig<AssetInfo>();
71 71
72 72 private customerId: string;
73   - private edgeId: string;
74 73
75 74 constructor(private store: Store<AppState>,
76 75 private broadcast: BroadcastService,
... ... @@ -115,10 +114,10 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
115 114 const routeParams = route.params;
116 115 this.config.componentsData = {
117 116 assetScope: route.data.assetsType,
118   - assetType: ''
  117 + assetType: '',
  118 + edgeId: routeParams.edgeId
119 119 };
120 120 this.customerId = routeParams.customerId;
121   - this.edgeId = routeParams.edgeId;
122 121 return this.store.pipe(select(selectAuthUser), take(1)).pipe(
123 122 tap((authUser) => {
124 123 if (authUser.authority === Authority.CUSTOMER_USER) {
... ... @@ -137,7 +136,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
137 136 this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('asset.assets');
138 137 }
139 138 } else if (this.config.componentsData.assetScope === 'edge') {
140   - this.edgeService.getEdge(this.edgeId).subscribe(
  139 + this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
141 140 edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets')
142 141 );
143 142 } else {
... ... @@ -182,7 +181,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
182 181 this.config.deleteEntity = id => this.assetService.deleteAsset(id.id);
183 182 } else if (assetScope === 'edge') {
184 183 this.config.entitiesFetchFunction = pageLink =>
185   - this.assetService.getEdgeAssets(this.edgeId, pageLink, this.config.componentsData.assetType);
  184 + this.assetService.getEdgeAssets(this.config.componentsData.edgeId, pageLink, this.config.componentsData.assetType);
186 185 } else {
187 186 this.config.entitiesFetchFunction = pageLink =>
188 187 this.assetService.getCustomerAssetInfos(this.customerId, pageLink, this.config.componentsData.assetType);
... ... @@ -480,7 +479,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
480 479 disableClose: true,
481 480 panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
482 481 data: {
483   - edgeId: this.edgeId,
  482 + edgeId: this.config.componentsData.edgeId,
484 483 entityType: EntityType.ASSET
485 484 }
486 485 }).afterClosed()
... ... @@ -503,7 +502,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
503 502 true
504 503 ).subscribe((res) => {
505 504 if (res) {
506   - this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id).subscribe(
  505 + this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id).subscribe(
507 506 () => {
508 507 this.config.table.updateData();
509 508 }
... ... @@ -528,7 +527,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
528 527 const tasks: Observable<any>[] = [];
529 528 assets.forEach(
530 529 (asset) => {
531   - tasks.push(this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id));
  530 + tasks.push(this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id));
532 531 }
533 532 );
534 533 forkJoin(tasks).subscribe(
... ...