tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Refactored edgeId entity table-resolvers

pull/3811/head
Artem Babak 6 years ago
parent
0be81ae7fe
commit
2aa50f8cbc
3 changed files with 28 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
  2. 15
      ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
  3. 27
      ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

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

@ -73,7 +73,6 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
private readonly config: EntityTableConfig<DeviceInfo> = new EntityTableConfig<DeviceInfo>(); private readonly config: EntityTableConfig<DeviceInfo> = new EntityTableConfig<DeviceInfo>();
private customerId: string; private customerId: string;
private edgeId: string;
constructor(private store: Store<AppState>, constructor(private store: Store<AppState>,
private broadcast: BroadcastService, private broadcast: BroadcastService,
@ -120,10 +119,11 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
const routeParams = route.params; const routeParams = route.params;
this.config.componentsData = { this.config.componentsData = {
deviceScope: route.data.devicesType, deviceScope: route.data.devicesType,
deviceProfileId: null deviceProfileId: null,
edgeId: routeParams.edgeId
}; };
this.customerId = routeParams.customerId; this.customerId = routeParams.customerId;
this.edgeId = routeParams.edgeId; this.config.componentsData.edgeId = routeParams.edgeId;
return this.store.pipe(select(selectAuthUser), take(1)).pipe( return this.store.pipe(select(selectAuthUser), take(1)).pipe(
tap((authUser) => { tap((authUser) => {
if (authUser.authority === Authority.CUSTOMER_USER) { if (authUser.authority === Authority.CUSTOMER_USER) {
@ -142,7 +142,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('device.devices'); this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('device.devices');
} }
} else if (this.config.componentsData.deviceScope === 'edge') { } else if (this.config.componentsData.deviceScope === 'edge') {
this.edgeService.getEdge(this.edgeId).subscribe( this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices') edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices')
); );
} else { } else {
@ -195,7 +195,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
this.config.deleteEntity = id => this.deviceService.deleteDevice(id.id); this.config.deleteEntity = id => this.deviceService.deleteDevice(id.id);
} else if (deviceScope === 'edge') { } else if (deviceScope === 'edge') {
this.config.entitiesFetchFunction = pageLink => this.config.entitiesFetchFunction = pageLink =>
this.deviceService.getEdgeDevices(this.edgeId, pageLink, this.config.componentsData.edgeType); this.deviceService.getEdgeDevices(this.config.componentsData.edgeId, pageLink, this.config.componentsData.edgeType);
} else { } else {
this.config.entitiesFetchFunction = pageLink => this.config.entitiesFetchFunction = pageLink =>
this.deviceService.getCustomerDeviceInfosByDeviceProfileId(this.customerId, pageLink, this.deviceService.getCustomerDeviceInfosByDeviceProfileId(this.customerId, pageLink,
@ -535,7 +535,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
disableClose: true, disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
edgeId: this.edgeId, edgeId: this.config.componentsData.edgeId,
entityType: EntityType.DEVICE entityType: EntityType.DEVICE
} }
}).afterClosed() }).afterClosed()
@ -558,7 +558,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
true true
).subscribe((res) => { ).subscribe((res) => {
if (res) { if (res) {
this.deviceService.unassignDeviceFromEdge(this.edgeId, device.id.id).subscribe( this.deviceService.unassignDeviceFromEdge(this.config.componentsData.edgeId, device.id.id).subscribe(
() => { () => {
this.config.table.updateData(); this.config.table.updateData();
} }
@ -583,7 +583,7 @@ export class DevicesTableConfigResolver implements Resolve<EntityTableConfig<Dev
const tasks: Observable<any>[] = []; const tasks: Observable<any>[] = [];
devices.forEach( devices.forEach(
(device) => { (device) => {
tasks.push(this.deviceService.unassignDeviceFromEdge(this.edgeId, device.id.id)); tasks.push(this.deviceService.unassignDeviceFromEdge(this.config.componentsData.edgeId, device.id.id));
} }
); );
forkJoin(tasks).subscribe( forkJoin(tasks).subscribe(

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

@ -68,7 +68,6 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
private readonly config: EntityTableConfig<EntityViewInfo> = new EntityTableConfig<EntityViewInfo>(); private readonly config: EntityTableConfig<EntityViewInfo> = new EntityTableConfig<EntityViewInfo>();
private customerId: string; private customerId: string;
private edgeId: string;
constructor(private store: Store<AppState>, constructor(private store: Store<AppState>,
private broadcast: BroadcastService, private broadcast: BroadcastService,
@ -115,10 +114,10 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
const routeParams = route.params; const routeParams = route.params;
this.config.componentsData = { this.config.componentsData = {
entityViewScope: route.data.entityViewsType, entityViewScope: route.data.entityViewsType,
entityViewType: '' entityViewType: '',
edgeId: routeParams.edgeId
}; };
this.customerId = routeParams.customerId; this.customerId = routeParams.customerId;
this.edgeId = routeParams.edgeId;
return this.store.pipe(select(selectAuthUser), take(1)).pipe( return this.store.pipe(select(selectAuthUser), take(1)).pipe(
tap((authUser) => { tap((authUser) => {
if (authUser.authority === Authority.CUSTOMER_USER) { if (authUser.authority === Authority.CUSTOMER_USER) {
@ -137,7 +136,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('entity-view.entity-views'); this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('entity-view.entity-views');
} }
} else if (this.config.componentsData.entityViewScope === 'edge') { } else if (this.config.componentsData.entityViewScope === 'edge') {
this.edgeService.getEdge(this.edgeId).subscribe( this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views') edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views')
); );
} }
@ -182,7 +181,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
this.config.deleteEntity = id => this.entityViewService.deleteEntityView(id.id); this.config.deleteEntity = id => this.entityViewService.deleteEntityView(id.id);
} else if (entityViewScope === 'edge') { } else if (entityViewScope === 'edge') {
this.config.entitiesFetchFunction = pageLink => this.config.entitiesFetchFunction = pageLink =>
this.entityViewService.getEdgeEntityViews(this.edgeId, pageLink, this.config.componentsData.entityViewType); this.entityViewService.getEdgeEntityViews(this.config.componentsData.edgeId, pageLink, this.config.componentsData.entityViewType);
} else { } else {
this.config.entitiesFetchFunction = pageLink => this.config.entitiesFetchFunction = pageLink =>
this.entityViewService.getCustomerEntityViewInfos(this.customerId, pageLink, this.config.componentsData.entityViewType); this.entityViewService.getCustomerEntityViewInfos(this.customerId, pageLink, this.config.componentsData.entityViewType);
@ -455,7 +454,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
disableClose: true, disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
edgeId: this.edgeId, edgeId: this.config.componentsData.edgeId,
entityType: EntityType.ENTITY_VIEW entityType: EntityType.ENTITY_VIEW
} }
}).afterClosed() }).afterClosed()
@ -478,7 +477,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
true true
).subscribe((res) => { ).subscribe((res) => {
if (res) { if (res) {
this.entityViewService.unassignEntityViewFromEdge(this.edgeId, entityView.id.id).subscribe( this.entityViewService.unassignEntityViewFromEdge(this.config.componentsData.edgeId, entityView.id.id).subscribe(
() => { () => {
this.config.table.updateData(); this.config.table.updateData();
} }
@ -503,7 +502,7 @@ export class EntityViewsTableConfigResolver implements Resolve<EntityTableConfig
const tasks: Observable<any>[] = []; const tasks: Observable<any>[] = [];
entityViews.forEach( entityViews.forEach(
(entityView) => { (entityView) => {
tasks.push(this.entityViewService.unassignEntityViewFromEdge(this.edgeId, entityView.id.id)); tasks.push(this.entityViewService.unassignEntityViewFromEdge(this.config.componentsData.edgeId, entityView.id.id));
} }
); );
forkJoin(tasks).subscribe( forkJoin(tasks).subscribe(

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

@ -52,7 +52,6 @@ import { Edge } from "@shared/models/edge.models";
export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> { export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> {
private readonly config: EntityTableConfig<RuleChain> = new EntityTableConfig<RuleChain>(); private readonly config: EntityTableConfig<RuleChain> = new EntityTableConfig<RuleChain>();
private edgeId: string;
private edge: Edge; private edge: Edge;
constructor(private ruleChainService: RuleChainService, constructor(private ruleChainService: RuleChainService,
@ -75,7 +74,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
new EntityTableColumn<RuleChain>('name', 'rulechain.name', '100%'), new EntityTableColumn<RuleChain>('name', 'rulechain.name', '100%'),
new EntityTableColumn<RuleChain>('root', 'rulechain.root', '60px', new EntityTableColumn<RuleChain>('root', 'rulechain.root', '60px',
entity => { entity => {
if (isDefined(this.edgeId) && this.edgeId != null) { if (isDefined(this.config.componentsData.edgeId)) {
return checkBoxCell((this.edge.rootRuleChainId.id == entity.id.id)); return checkBoxCell((this.edge.rootRuleChainId.id == entity.id.id));
} else { } else {
return checkBoxCell(entity.root); return checkBoxCell(entity.root);
@ -91,9 +90,9 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
this.config.saveEntity = ruleChain => this.saveRuleChain(ruleChain); this.config.saveEntity = ruleChain => this.saveRuleChain(ruleChain);
this.config.deleteEntity = id => this.ruleChainService.deleteRuleChain(id.id); this.config.deleteEntity = id => this.ruleChainService.deleteRuleChain(id.id);
this.config.onEntityAction = action => this.onRuleChainAction(action); this.config.onEntityAction = action => this.onRuleChainAction(action);
this.config.deleteEnabled = (ruleChain) => ruleChain && !ruleChain.root && !this.edgeId; this.config.deleteEnabled = (ruleChain) => ruleChain && !ruleChain.root && !this.config.componentsData.edgeId;
this.config.entitySelectionEnabled = (ruleChain) => { this.config.entitySelectionEnabled = (ruleChain) => {
if (isDefined(this.edgeId) && this.edgeId != null) { if (isDefined(this.config.componentsData.edgeId)) {
return this.edge.rootRuleChainId.id != ruleChain.id.id; return this.edge.rootRuleChainId.id != ruleChain.id.id;
} else { } else {
return ruleChain && !ruleChain.root; return ruleChain && !ruleChain.root;
@ -105,9 +104,9 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
const routeParams = route.params; const routeParams = route.params;
this.config.componentsData = { this.config.componentsData = {
ruleChainScope: route.data.ruleChainScope, ruleChainScope: route.data.ruleChainScope,
type: route.data.type type: route.data.type,
edgeId: routeParams.edgeId
}; };
this.edgeId = routeParams.edgeId;
this.configureEntityFunctions(this.config.componentsData.ruleChainScope); this.configureEntityFunctions(this.config.componentsData.ruleChainScope);
this.config.groupActionDescriptors = this.configureGroupActions(this.config.componentsData.ruleChainScope); this.config.groupActionDescriptors = this.configureGroupActions(this.config.componentsData.ruleChainScope);
this.config.addActionDescriptors = this.configureAddActions(this.config.componentsData.ruleChainScope); this.config.addActionDescriptors = this.configureAddActions(this.config.componentsData.ruleChainScope);
@ -154,14 +153,14 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
this.config.tableTitle = this.translate.instant('rulechain.edge-rulechains'); this.config.tableTitle = this.translate.instant('rulechain.edge-rulechains');
this.config.entitiesFetchFunction = pageLink => this.fetchEdgeRuleChains(pageLink); this.config.entitiesFetchFunction = pageLink => this.fetchEdgeRuleChains(pageLink);
} else if (ruleChainScope === 'edge') { } else if (ruleChainScope === 'edge') {
if (isDefined(this.edgeId) && this.edgeId != null) { if (isDefined(this.config.componentsData.edgeId)) {
this.edgeService.getEdge(this.edgeId).subscribe( this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
edge => { edge => {
this.edge = edge; this.edge = edge;
this.config.tableTitle = edge.name + ': ' + this.translate.instant('rulechain.edge-rulechains') this.config.tableTitle = edge.name + ': ' + this.translate.instant('rulechain.edge-rulechains')
}); });
} }
this.config.entitiesFetchFunction = pageLink => this.ruleChainService.getEdgeRuleChains(this.edgeId, pageLink); this.config.entitiesFetchFunction = pageLink => this.ruleChainService.getEdgeRuleChains(this.config.componentsData.edgeId, pageLink);
} }
} }
@ -298,8 +297,8 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
true true
).subscribe((res) => { ).subscribe((res) => {
if (res) { if (res) {
if (isDefined(this.edgeId) && this.edgeId != null) { if (isDefined(this.config.componentsData.edgeId)) {
this.edgeService.setRootRuleChain(this.edgeId, ruleChain.id.id).subscribe( this.edgeService.setRootRuleChain(this.config.componentsData.edgeId, ruleChain.id.id).subscribe(
(edge) => { (edge) => {
this.edge = edge; this.edge = edge;
this.config.table.updateData(); this.config.table.updateData();
@ -363,7 +362,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
disableClose: true, disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'], panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: { data: {
edgeId: this.edgeId, edgeId: this.config.componentsData.edgeId,
entityType: EntityType.RULE_CHAIN entityType: EntityType.RULE_CHAIN
} }
}).afterClosed() }).afterClosed()
@ -387,7 +386,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
true true
).subscribe((res) => { ).subscribe((res) => {
if (res) { if (res) {
this.ruleChainService.unassignRuleChainFromEdge(this.edgeId, ruleChain.id.id).subscribe( this.ruleChainService.unassignRuleChainFromEdge(this.config.componentsData.edgeId, ruleChain.id.id).subscribe(
() => { () => {
this.config.table.updateData(); this.config.table.updateData();
} }
@ -470,7 +469,7 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
} }
isNonRootRuleChain(ruleChain: RuleChain) { isNonRootRuleChain(ruleChain: RuleChain) {
if (isDefined(this.edgeId) && this.edgeId != null) { if (isDefined(this.config.componentsData.edgeId)) {
return (isDefined(this.edge.rootRuleChainId) && this.edge.rootRuleChainId != null && this.edge.rootRuleChainId.id != ruleChain.id.id); return (isDefined(this.edge.rootRuleChainId) && this.edge.rootRuleChainId != null && this.edge.rootRuleChainId.id != ruleChain.id.id);
} }
return (isDefined(ruleChain)) && !ruleChain.root; return (isDefined(ruleChain)) && !ruleChain.root;

Write Preview
Loading…
Cancel
Save