Browse Source

Refactored method get edge name for title in edge's assigned entities

pull/3811/head
Artem Babak 6 years ago
parent
commit
0be81ae7fe
  1. 1
      .run/[CE Edge] Server.run.xml
  2. 5
      ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts
  3. 5
      ui-ngx/src/app/modules/home/pages/device/devices-table-config.resolver.ts
  4. 5
      ui-ngx/src/app/modules/home/pages/entity-view/entity-views-table-config.resolver.ts
  5. 6
      ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

1
.run/[CE Edge] Server.run.xml

@ -9,6 +9,7 @@
</envs> </envs>
<option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardServerApplication" /> <option name="MAIN_CLASS_NAME" value="org.thingsboard.server.ThingsboardServerApplication" />
<module name="application" /> <module name="application" />
<option name="PROGRAM_PARAMETERS" value="$ContentRoot$" />
<extension name="coverage"> <extension name="coverage">
<pattern> <pattern>
<option name="PATTERN" value="org.thingsboard.server.*" /> <option name="PATTERN" value="org.thingsboard.server.*" />

5
ui-ngx/src/app/modules/home/pages/dashboard/dashboards-table-config.resolver.ts

@ -132,8 +132,9 @@ export class DashboardsTableConfigResolver implements Resolve<EntityTableConfig<
this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('dashboard.dashboards'); this.config.tableTitle = parentCustomer.title + ': ' + this.translate.instant('dashboard.dashboards');
} }
} else if (this.config.componentsData.dashboardScope === 'edge') { } else if (this.config.componentsData.dashboardScope === 'edge') {
this.edgeService.getEdge(this.config.componentsData.edgeId).pipe(map(edge => this.edgeService.getEdge(this.config.componentsData.edgeId).subscribe(
this.config.tableTitle = edge.name + ': ' + this.translate.instant('dashboard.dashboards'))).subscribe(); edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('dashboard.dashboards')
);
} else { } else {
this.config.tableTitle = this.translate.instant('dashboard.dashboards'); this.config.tableTitle = this.translate.instant('dashboard.dashboards');
} }

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

@ -142,8 +142,9 @@ 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).pipe(map(edge => this.edgeService.getEdge(this.edgeId).subscribe(
this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices'))).subscribe(); edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('device.devices')
);
} else { } else {
this.config.tableTitle = this.translate.instant('device.devices'); this.config.tableTitle = this.translate.instant('device.devices');
} }

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

@ -137,8 +137,9 @@ 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).pipe(map(edge => this.edgeService.getEdge(this.edgeId).subscribe(
this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views'))).subscribe(); edge => this.config.tableTitle = edge.name + ': ' + this.translate.instant('entity-view.entity-views')
);
} }
else { else {
this.config.tableTitle = this.translate.instant('entity-view.entity-views'); this.config.tableTitle = this.translate.instant('entity-view.entity-views');

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

@ -155,11 +155,11 @@ export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<
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.edgeId) && this.edgeId != null) {
this.edgeService.getEdge(this.edgeId) this.edgeService.getEdge(this.edgeId).subscribe(
.pipe(map(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')
})).subscribe(); });
} }
this.config.entitiesFetchFunction = pageLink => this.ruleChainService.getEdgeRuleChains(this.edgeId, pageLink); this.config.entitiesFetchFunction = pageLink => this.ruleChainService.getEdgeRuleChains(this.edgeId, pageLink);
} }

Loading…
Cancel
Save