dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edge Downlinks refactored

Browse Source
This commit is contained in:
Artem Babak 2021-01-06 11:46:59 +02:00
parent bee4da8995
commit f34420cfa8
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/common/types.constant.js
View File

@ -384,7 +384,7 @@ export default angular.module('thingsboard.types', [])
entityView: "ENTITY_VIEW",
edge: "EDGE"
},
edgeDownlinksType:{
edgeEventType:{
dashboard: "DASHBOARD",
asset: "ASSET",
device: "DEVICE",
@ -405,7 +405,7 @@ export default angular.module('thingsboard.types', [])
widgetType: "WIDGET_TYPE",
adminSettings: "ADMIN_SETTINGS"
},
edgeDownlinksStatus: {
getEdgeStatus: {
"DEPLOYED": {
name: "edge.deployed",
color: grey900

18
ui/src/app/edge/downlinks/edge-downlinks-row.directive.js
View File

@ -43,11 +43,11 @@ export default function EdgeDownlinksRowDirective($compile, $templateCache, $mdD
}
var content = '';
switch(scope.downlink.type) {
case types.edgeDownlinksType.relation:
case types.edgeEventType.relation:
content = angular.toJson(scope.downlink.body);
showDialog();
break;
case types.edgeDownlinksType.ruleChainMetaData:
case types.edgeEventType.ruleChainMetaData:
content = ruleChainService.getRuleChainMetaData(scope.downlink.entityId, {ignoreErrors: true}).then(
function success(info) {
showDialog();
@ -87,9 +87,9 @@ export default function EdgeDownlinksRowDirective($compile, $templateCache, $mdD
}
scope.checkEdgeDownlinksType = function (type) {
return !(type === types.edgeDownlinksType.widgetType ||
type === types.edgeDownlinksType.adminSettings ||
type === types.edgeDownlinksType.widgetsBundle );
return !(type === types.edgeEventType.widgetType ||
type === types.edgeEventType.adminSettings ||
type === types.edgeEventType.widgetsBundle );
}
scope.checkTooltip = function($event) {
@ -105,11 +105,11 @@ export default function EdgeDownlinksRowDirective($compile, $templateCache, $mdD
scope.updateStatus = function(downlinkCreatedTime) {
var status;
if (downlinkCreatedTime < scope.queueStartTs) {
status = $translate.instant(types.edgeDownlinksStatus.DEPLOYED.name);
scope.statusColor = types.edgeDownlinksStatus.DEPLOYED.color;
status = $translate.instant(types.getEdgeStatus.DEPLOYED.name);
scope.statusColor = types.getEdgeStatus.DEPLOYED.color;
} else {
status = $translate.instant(types.edgeDownlinksStatus.PENDING.name);
scope.statusColor = types.edgeDownlinksStatus.PENDING.color;
status = $translate.instant(types.getEdgeStatus.PENDING.name);
scope.statusColor = types.getEdgeStatus.PENDING.color;
}
return status;
}

4
ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html
View File

@ -16,8 +16,8 @@
-->
<div class="tb-cell" flex="20">{{ downlink.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
<div class="tb-cell" flex="15">{{ downlink.edgeDownlinksTypeText }}</div>
<div class="tb-cell" flex="15">{{ downlink.edgeDownlinksActionText }}</div>
<div class="tb-cell" flex="15">{{ downlink.edgeEventTypeText }}</div>
<div class="tb-cell" flex="15">{{ downlink.edgeEventActionText }}</div>
<div class="tb-cell" flex="30">{{ downlink.entityId }}</div>
<div class="tb-cell" flex="10" ng-style="{'color': statusColor}">{{ updateStatus(downlink.createdTime) }}</div>
<div class="tb-cell" flex="10">

4
ui/src/app/edge/downlinks/edge-downlinks-table.directive.js
View File

@ -211,8 +211,8 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc
data.forEach(
edgeDownlink => {
edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeEventActionTypeTranslations[edgeDownlink.action].name);
edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeDownlink.type].name);
edgeDownlink.edgeEventActionText = $translate.instant(types.edgeEventActionTypeTranslations[edgeDownlink.action].name);
edgeDownlink.edgeEventTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeDownlink.type].name);
}
);
return data;

3
ui/src/app/edge/edges.tpl.html
View File

@ -68,8 +68,7 @@
<md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'edge.downlinks' | translate }}">
<tb-edge-downlinks-table flex entity-type="vm.types.entityType.edge"
entity-id="vm.grid.operatingItem().id.id"
tenant-id="vm.grid.operatingItem().tenantId.id"
default-event-type="{{vm.types.edgeDownlinks.value}}">
tenant-id="vm.grid.operatingItem().tenantId.id">
</tb-edge-downlinks-table>
</md-tab>
<md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'relation.relations' | translate }}">