Browse Source

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

pull/3811/head
deaflynx 6 years ago
parent
commit
f867e2c14f
  1. 15
      ui-ngx/src/app/modules/home/pages/asset/assets-table-config.resolver.ts

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

@ -70,7 +70,6 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
private readonly config: EntityTableConfig<AssetInfo> = new EntityTableConfig<AssetInfo>();
private customerId: string;
private edgeId: string;
constructor(private store: Store<AppState>,
private broadcast: BroadcastService,
@ -115,10 +114,10 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
const routeParams = route.params;
this.config.componentsData = {
assetScope: route.data.assetsType,
assetType: ''
assetType: '',
edgeId: routeParams.edgeId
};
this.customerId = routeParams.customerId;
this.edgeId = routeParams.edgeId;
return this.store.pipe(select(selectAuthUser), take(1)).pipe(
tap((authUser) => {
if (authUser.authority === Authority.CUSTOMER_USER) {
@ -137,7 +136,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('asset.assets');
}
} else if (this.config.componentsData.assetScope === 'edge') {
this.edgeService.getEdge(this.edgeId).subscribe(
this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('asset.assets')
);
} else {
@ -182,7 +181,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
this.config.deleteEntity = id => this.assetService.deleteAsset(id.id);
} else if (assetScope === 'edge') {
this.config.entitiesFetchFunction = pageLink =>
this.assetService.getEdgeAssets(this.edgeId, pageLink, this.config.componentsData.assetType);
this.assetService.getEdgeAssets(this.config.componentsData.edgeId, pageLink, this.config.componentsData.assetType);
} else {
this.config.entitiesFetchFunction = pageLink =>
this.assetService.getCustomerAssetInfos(this.customerId, pageLink, this.config.componentsData.assetType);
@ -480,7 +479,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {
edgeId: this.edgeId,
edgeId: this.config.componentsData.edgeId,
entityType: EntityType.ASSET
}
}).afterClosed()
@ -503,7 +502,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
true
).subscribe((res) => {
if (res) {
this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id).subscribe(
this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id).subscribe(
() => {
this.config.table.updateData();
}
@ -528,7 +527,7 @@ export class AssetsTableConfigResolver implements Resolve<EntityTableConfig<Asse
const tasks: Observable<any>[] = [];
assets.forEach(
(asset) => {
tasks.push(this.assetService.unassignAssetFromEdge(this.edgeId, asset.id.id));
tasks.push(this.assetService.unassignAssetFromEdge(this.config.componentsData.edgeId, asset.id.id));
}
);
forkJoin(tasks).subscribe(

Loading…
Cancel
Save