Browse Source

Added edgeEventType constants, changed hardcoded values

pull/2436/head
deaflynx 6 years ago
parent
commit
12d650c400
  1. 13
      ui/src/app/common/types.constant.js
  2. 4
      ui/src/app/event/event-row.directive.js
  3. 2
      ui/src/app/event/event-table.directive.js

13
ui/src/app/common/types.constant.js

@ -376,6 +376,19 @@ export default angular.module('thingsboard.types', [])
entityView: "ENTITY_VIEW", entityView: "ENTITY_VIEW",
edge: "EDGE" edge: "EDGE"
}, },
edgeEventType:{
dashboard: "DASHBOARD",
asset: "ASSET",
device: "DEVICE",
entityView: "ENTITY_VIEW",
alarm: "ALARM",
rulechain: "RULE_CHAIN",
ruleChainMetaData: "RULE_CHAIN_METADATA",
edge: "EDGE",
user: "USER",
customer: "CUSTOMER",
relation: "RELATION"
},
importEntityColumnType: { importEntityColumnType: {
name: { name: {
name: 'import.column-type.name', name: 'import.column-type.name',

4
ui/src/app/event/event-row.directive.js

@ -100,10 +100,10 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $
} }
var content = ''; var content = '';
switch(scope.event.edgeEventType) { switch(scope.event.edgeEventType) {
case 'RELATION': case types.edgeEventType.relation:
content = angular.toJson(scope.event.entityBody); content = angular.toJson(scope.event.entityBody);
break; break;
case 'RULE_CHAIN_METADATA': case types.edgeEventType.ruleChainMetaData:
content = ruleChainService.getRuleChainMetaData(scope.event.entityId, {}).then( content = ruleChainService.getRuleChainMetaData(scope.event.entityId, {}).then(
function success(info) { function success(info) {
return angular.toJson(info); return angular.toJson(info);

2
ui/src/app/event/event-table.directive.js

@ -100,7 +100,7 @@ export default function EventTableDirective($compile, $templateCache, $rootScope
fetchMoreItems_: function () { fetchMoreItems_: function () {
if (scope.events.hasNext && !scope.events.pending) { if (scope.events.hasNext && !scope.events.pending) {
if (scope.entityType && scope.entityId && scope.eventType && scope.tenantId) { if (scope.entityType && scope.entityId && scope.eventType && scope.tenantId) {
if (scope.eventType !== "EDGE_EVENT") { if (scope.eventType !== types.eventType.edgeEvent.value) {
var promise = eventService.getEvents(scope.entityType, scope.entityId, var promise = eventService.getEvents(scope.entityType, scope.entityId,
scope.eventType, scope.tenantId, scope.events.nextPageLink); scope.eventType, scope.tenantId, scope.events.nextPageLink);
} else { } else {

Loading…
Cancel
Save