diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index ccb9b76f01..f65cc59e06 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -384,7 +384,7 @@ export default angular.module('thingsboard.types', []) entityView: "ENTITY_VIEW", edge: "EDGE" }, - edgeEventType:{ + edgeDownlinksType:{ dashboard: "DASHBOARD", asset: "ASSET", device: "DEVICE", @@ -405,7 +405,7 @@ export default angular.module('thingsboard.types', []) widgetType: "WIDGET_TYPE", adminSettings: "ADMIN_SETTINGS" }, - edgeEventStatus: { + edgeDownlinksStatus: { "DEPLOYED": { name: "edge.deployed", color: grey900 @@ -1073,7 +1073,7 @@ export default angular.module('thingsboard.types', []) translate: { customTranslationsPrefix: "custom." }, - edgeEventActionType: { + edgeDownlinksActionType: { "ADDED": { name: "audit-log.type-added" }, @@ -1135,7 +1135,7 @@ export default angular.module('thingsboard.types', []) name: "audit-log.type-unassigned-from-edge" } }, - edgeEventTypeTranslations:{ + edgeDownlinksTypeTranslations:{ "DASHBOARD": { name: "entity.type-dashboard" }, @@ -1193,10 +1193,6 @@ export default angular.module('thingsboard.types', []) "ADMIN_SETTINGS": { name: "permission.resource.display-type.ADMIN_SETTINGS" } - }, - edgeDownlinks: { - value: "EDGE_DOWNLINKS", - name: "edge.downlinks" } } ).name; diff --git a/ui/src/app/edge/downlinks/event.scss b/ui/src/app/edge/downlinks/downlink.scss similarity index 94% rename from ui/src/app/edge/downlinks/event.scss rename to ui/src/app/edge/downlinks/downlink.scss index 7e67d0aac7..9f975fc1e1 100644 --- a/ui/src/app/edge/downlinks/event.scss +++ b/ui/src/app/edge/downlinks/downlink.scss @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -md-list.tb-event-table { +md-list.tb-edge-downlinks-table { padding: 0; md-list-item { @@ -85,11 +85,7 @@ md-list.tb-event-table { } } -.tb-edge-downlinks-table-2 { - @extend .tb-event-table; -} - -#tb-event-content { +#tb-edge-downlinks-content { width: 100%; min-width: 400px; height: 100%; diff --git a/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.controller.js b/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.controller.js index 7be69ea17f..432bdf4d50 100644 --- a/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.controller.js +++ b/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.controller.js @@ -76,7 +76,7 @@ export default function EdgeDownlinksContentDialogController($mdDialog, types, c } newWidth = 8 * maxLineLength + 16; } - $('#tb-event-content', element).height(newHeight.toString() + "px") + $('#tb-edge-downlinks-content', element).height(newHeight.toString() + "px") .width(newWidth.toString() + "px"); vm.editor.resize(); } diff --git a/ui/src/app/edge/downlinks/event-content-dialog.tpl.html b/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.tpl.html similarity index 96% rename from ui/src/app/edge/downlinks/event-content-dialog.tpl.html rename to ui/src/app/edge/downlinks/edge-downlinks-content-dialog.tpl.html index 3959da43f4..798990ec07 100644 --- a/ui/src/app/edge/downlinks/event-content-dialog.tpl.html +++ b/ui/src/app/edge/downlinks/edge-downlinks-content-dialog.tpl.html @@ -27,7 +27,7 @@
-
diff --git a/ui/src/app/edge/downlinks/edge-downlinks-header.directive.js b/ui/src/app/edge/downlinks/edge-downlinks-header.directive.js index fd14df88d5..3af243ca48 100644 --- a/ui/src/app/edge/downlinks/edge-downlinks-header.directive.js +++ b/ui/src/app/edge/downlinks/edge-downlinks-header.directive.js @@ -15,34 +15,19 @@ */ /* eslint-disable import/no-unresolved, import/default */ -import edgeDownlinksHeaderTemplate from './event-header-edge-event.tpl.html' +import edgeDownlinksHeaderTemplate from './edge-downlinks-header.tpl.html' /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function EventHeaderDirective2($compile, $templateCache, types) { +export default function EdgeDownlinksHeaderDirective($compile, $templateCache) { - var linker = function (scope, element, attrs) { + var linker = function (scope, element) { - var getTemplate = function(eventType) { - var template = ''; - switch(eventType) { - case types.edgeDownlinks.value: - template = edgeDownlinksHeaderTemplate; - break; - } - return $templateCache.get(template); - } - - scope.loadTemplate = function() { - element.html(getTemplate(attrs.eventType)); - $compile(element.contents())(scope); - } - - attrs.$observe('eventType', function() { - scope.loadTemplate(); - }); + var template = edgeDownlinksHeaderTemplate; + element.html($templateCache.get(template)); + $compile(element.contents())(scope); } return { diff --git a/ui/src/app/edge/downlinks/event-header-edge-event.tpl.html b/ui/src/app/edge/downlinks/edge-downlinks-header.tpl.html similarity index 100% rename from ui/src/app/edge/downlinks/event-header-edge-event.tpl.html rename to ui/src/app/edge/downlinks/edge-downlinks-header.tpl.html diff --git a/ui/src/app/edge/downlinks/edge-downlinks-row.directive.js b/ui/src/app/edge/downlinks/edge-downlinks-row.directive.js index 20c2eab89c..8e848dfaf6 100644 --- a/ui/src/app/edge/downlinks/edge-downlinks-row.directive.js +++ b/ui/src/app/edge/downlinks/edge-downlinks-row.directive.js @@ -15,40 +15,24 @@ */ /* eslint-disable import/no-unresolved, import/default */ -import eventErrorDialogTemplate from './event-content-dialog.tpl.html'; - -import edgeDownlinlsRowTemplate from './event-row-edge-event.tpl.html'; +import edgeDownlinksContentTemplate from './edge-downlinks-content-dialog.tpl.html'; +import edgeDownlinlsRowTemplate from './edge-downlinks-row.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function EventRowDirective2($compile, $templateCache, $mdDialog, $document, $translate, +export default function EdgeDownlinksRowDirective($compile, $templateCache, $mdDialog, $document, $translate, types, utils, toast, entityService, ruleChainService) { var linker = function (scope, element, attrs) { - var getTemplate = function(eventType) { - var template = ''; - switch(eventType) { - case types.edgeDownlinks.value: - template = edgeDownlinlsRowTemplate; - break; - } - return $templateCache.get(template); - } - - scope.loadTemplate = function() { - element.html(getTemplate(attrs.eventType)); - $compile(element.contents())(scope); - } + var template = edgeDownlinlsRowTemplate; - attrs.$observe('eventType', function() { - scope.loadTemplate(); - }); + element.html($templateCache.get(template)); + $compile(element.contents())(scope); scope.types = types; - - scope.event = attrs.event; + scope.downlink = attrs.downlink; scope.showEdgeEntityContent = function($event, title, contentType) { var onShowingCallback = { @@ -58,13 +42,13 @@ export default function EventRowDirective2($compile, $templateCache, $mdDialog, contentType = null; } var content = ''; - switch(scope.event.type) { - case types.edgeEventType.relation: - content = angular.toJson(scope.event.body); + switch(scope.downlink.type) { + case types.edgeDownlinksType.relation: + content = angular.toJson(scope.downlink.body); showDialog(); break; - case types.edgeEventType.ruleChainMetaData: - content = ruleChainService.getRuleChainMetaData(scope.event.entityId, {ignoreErrors: true}).then( + case types.edgeDownlinksType.ruleChainMetaData: + content = ruleChainService.getRuleChainMetaData(scope.downlink.entityId, {ignoreErrors: true}).then( function success(info) { showDialog(); return angular.toJson(info); @@ -73,7 +57,7 @@ export default function EventRowDirective2($compile, $templateCache, $mdDialog, }); break; default: - content = entityService.getEntity(scope.event.type, scope.event.entityId, {ignoreErrors: true}).then( + content = entityService.getEntity(scope.downlink.type, scope.downlink.entityId, {ignoreErrors: true}).then( function success(info) { showDialog(); return angular.toJson(info); @@ -84,9 +68,9 @@ export default function EventRowDirective2($compile, $templateCache, $mdDialog, } function showDialog() { $mdDialog.show({ - controller: 'EventContentDialogController2', + controller: 'EdgeDownlinksContentDialogController', controllerAs: 'vm', - templateUrl: eventErrorDialogTemplate, + templateUrl: edgeDownlinksContentTemplate, locals: {content: content, title: title, contentType: contentType, showingCallback: onShowingCallback}, parent: angular.element($document[0].body), fullscreen: true, @@ -102,10 +86,10 @@ export default function EventRowDirective2($compile, $templateCache, $mdDialog, } } - scope.checkEdgeEventType = function (type) { - return !(type === types.edgeEventType.widgetType || - type === types.edgeEventType.adminSettings || - type === types.edgeEventType.widgetsBundle ); + scope.checkEdgeDownlinksType = function (type) { + return !(type === types.edgeDownlinksType.widgetType || + type === types.edgeDownlinksType.adminSettings || + type === types.edgeDownlinksType.widgetsBundle ); } scope.checkTooltip = function($event) { @@ -118,14 +102,14 @@ export default function EventRowDirective2($compile, $templateCache, $mdDialog, $compile(element.contents())(scope); - scope.updateStatus = function(eventCreatedTime) { + scope.updateStatus = function(downlinkCreatedTime) { var status; - if (eventCreatedTime < scope.queueStartTs) { - status = $translate.instant(types.edgeEventStatus.DEPLOYED.name); - scope.statusColor = types.edgeEventStatus.DEPLOYED.color; + if (downlinkCreatedTime < scope.queueStartTs) { + status = $translate.instant(types.edgeDownlinksStatus.DEPLOYED.name); + scope.statusColor = types.edgeDownlinksStatus.DEPLOYED.color; } else { - status = $translate.instant(types.edgeEventStatus.PENDING.name); - scope.statusColor = types.edgeEventStatus.PENDING.color; + status = $translate.instant(types.edgeDownlinksStatus.PENDING.name); + scope.statusColor = types.edgeDownlinksStatus.PENDING.color; } return status; } diff --git a/ui/src/app/event/event-row-edge-event.tpl.html b/ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html similarity index 71% rename from ui/src/app/event/event-row-edge-event.tpl.html rename to ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html index a842b5d787..67a52e6836 100644 --- a/ui/src/app/event/event-row-edge-event.tpl.html +++ b/ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html @@ -15,13 +15,13 @@ limitations under the License. --> -
{{ event.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}
-
{{ event.edgeEventTypeText }}
-
{{ event.edgeEventActionText }}
-
{{ event.entityId }}
-
{{ updateStatus(event.createdTime) }}
+
{{ downlink.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}
+
{{ downlink.edgeDownlinksTypeText }}
+
{{ downlink.edgeDownlinksActionText }}
+
{{ downlink.entityId }}
+
{{ updateStatus(downlink.createdTime) }}
- diff --git a/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js b/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js index 46f194b68b..50f8f34524 100644 --- a/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js +++ b/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import './event.scss'; +import './downlink.scss'; /* eslint-disable import/no-unresolved, import/default */ @@ -22,17 +22,13 @@ import edgeDownlinksTableTemplate from './edge-downlinks-table.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function EdgeDownlinksDirective2($compile, $templateCache, $rootScope, $translate, types, - eventService, edgeService, attributeService) { +export default function EdgeDownlinksDirective($compile, $templateCache, $rootScope, $translate, types, edgeService, attributeService) { var linker = function (scope, element) { var template = $templateCache.get(edgeDownlinksTableTemplate); - element.html(template); - scope.eventType = types.edgeDownlinks.value; - var pageSize = 20; var startTime = 0; var endTime = 0; @@ -45,13 +41,13 @@ export default function EdgeDownlinksDirective2($compile, $templateCache, $rootS scope.topIndex = 0; - scope.theEvents = { + scope.theDownlinks = { getItemAtIndex: function (index) { - if (index > scope.events.data.length) { - scope.theEvents.fetchMoreItems_(index); + if (index > scope.downlinks.data.length) { + scope.theDownlinks.fetchMoreItems_(index); return null; } - var item = scope.events.data[index]; + var item = scope.downlinks.data[index]; if (item) { item.indexNumber = index + 1; } @@ -59,34 +55,34 @@ export default function EdgeDownlinksDirective2($compile, $templateCache, $rootS }, getLength: function () { - if (scope.events.hasNext) { - return scope.events.data.length + scope.events.nextPageLink.limit; + if (scope.downlinks.hasNext) { + return scope.downlinks.data.length + scope.downlinks.nextPageLink.limit; } else { - return scope.events.data.length; + return scope.downlinks.data.length; } }, fetchMoreItems_: function () { - if (scope.events.hasNext && !scope.events.pending) { - if (scope.entityType && scope.entityId && scope.eventType && scope.tenantId) { + if (scope.downlinks.hasNext && !scope.downlinks.pending) { + if (scope.entityType && scope.entityId && scope.tenantId) { scope.loadEdgeInfo(); - scope.events.pending = true; - edgeService.getEdgeDownlinks(scope.entityId, scope.events.nextPageLink).then( - function success(events) { - scope.events.data = scope.events.data.concat(prepareEdgeEventData(events.data)); - scope.events.nextPageLink = events.nextPageLink; - scope.events.hasNext = events.hasNext; - if (scope.events.hasNext) { - scope.events.nextPageLink.limit = pageSize; + scope.downlinks.pending = true; + edgeService.getEdgeDownlinks(scope.entityId, scope.downlinks.nextPageLink).then( + function success(downlinks) { + scope.downlinks.data = scope.downlinks.data.concat(prepareEdgeDownlinksData(downlinks.data)); + scope.downlinks.nextPageLink = downlinks.nextPageLink; + scope.downlinks.hasNext = downlinks.hasNext; + if (scope.downlinks.hasNext) { + scope.downlinks.nextPageLink.limit = pageSize; } - scope.events.pending = false; + scope.downlinks.pending = false; }, function fail() { - scope.events.hasNext = false; - scope.events.pending = false; + scope.downlinks.hasNext = false; + scope.downlinks.pending = false; }); } else { - scope.events.hasNext = false; + scope.downlinks.hasNext = false; } } } @@ -128,7 +124,7 @@ export default function EdgeDownlinksDirective2($compile, $templateCache, $rootS scope.topIndex = 0; scope.selected = []; scope.updateTimeWindowRange(); - scope.events = { + scope.downlinks = { data: [], nextPageLink: { limit: pageSize, @@ -138,15 +134,15 @@ export default function EdgeDownlinksDirective2($compile, $templateCache, $rootS hasNext: true, pending: false }; - scope.theEvents.getItemAtIndex(pageSize); + scope.theDownlinks.getItemAtIndex(pageSize); } scope.noData = function() { - return scope.events.data.length == 0 && !scope.events.hasNext; + return scope.downlinks.data.length == 0 && !scope.downlinks.hasNext; } scope.hasData = function() { - return scope.events.data.length > 0; + return scope.downlinks.data.length > 0; } scope.loading = function() { @@ -211,12 +207,12 @@ export default function EdgeDownlinksDirective2($compile, $templateCache, $rootS $compile(element.contents())(scope); } - function prepareEdgeEventData(data) { + function prepareEdgeDownlinksData(data) { data.forEach( - edgeEvent => { - edgeEvent.edgeEventActionText = $translate.instant(types.edgeEventActionType[edgeEvent.action].name); - edgeEvent.edgeEventTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeEvent.edgeId.entityType].name); + edgeDownlink => { + edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeDownlinksActionType[edgeDownlink.action].name); + edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeDownlinksTypeTranslations[edgeDownlink.edgeId.entityType].name); } ); return data; diff --git a/ui/src/app/edge/downlinks/edge-downlinks-table.tpl.html b/ui/src/app/edge/downlinks/edge-downlinks-table.tpl.html index 4bff7afa4b..0e66b2b685 100644 --- a/ui/src/app/edge/downlinks/edge-downlinks-table.tpl.html +++ b/ui/src/app/edge/downlinks/edge-downlinks-table.tpl.html @@ -27,7 +27,7 @@ - + @@ -36,8 +36,8 @@ style="margin-top: 25px;" class="tb-prompt" ng-show="noData()">edge.no-downlinks-prompt - - + + diff --git a/ui/src/app/edge/downlinks/event-row-edge-event.tpl.html b/ui/src/app/edge/downlinks/event-row-edge-event.tpl.html deleted file mode 100644 index a842b5d787..0000000000 --- a/ui/src/app/edge/downlinks/event-row-edge-event.tpl.html +++ /dev/null @@ -1,37 +0,0 @@ - -
{{ event.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}
-
{{ event.edgeEventTypeText }}
-
{{ event.edgeEventActionText }}
-
{{ event.entityId }}
-
{{ updateStatus(event.createdTime) }}
-
- - - {{ 'action.view' | translate }} - - - more_horiz - - -
- - diff --git a/ui/src/app/edge/edges.tpl.html b/ui/src/app/edge/edges.tpl.html index d1cb6182cd..e53ebba83a 100644 --- a/ui/src/app/edge/edges.tpl.html +++ b/ui/src/app/edge/edges.tpl.html @@ -65,13 +65,6 @@ default-event-type="{{vm.types.eventType.error.value}}"> - - - - scope.events.data.length) { - scope.theEvents.fetchMoreItems_(index); - return null; - } - var item = scope.events.data[index]; - if (item) { - item.indexNumber = index + 1; - } - return item; - }, - - getLength: function () { - if (scope.events.hasNext) { - return scope.events.data.length + scope.events.nextPageLink.limit; - } else { - return scope.events.data.length; - } - }, - - fetchMoreItems_: function () { - if (scope.events.hasNext && !scope.events.pending) { - if (scope.entityType && scope.entityId && scope.eventType && scope.tenantId) { - scope.loadEdgeInfo(); - scope.events.pending = true; - edgeService.getEdgeDownlinks(scope.entityId, scope.events.nextPageLink).then( - function success(events) { - scope.events.data = scope.events.data.concat(prepareEdgeEventData(events.data)); - scope.events.nextPageLink = events.nextPageLink; - scope.events.hasNext = events.hasNext; - if (scope.events.hasNext) { - scope.events.nextPageLink.limit = pageSize; - } - scope.events.pending = false; - }, - function fail() { - scope.events.hasNext = false; - scope.events.pending = false; - }); - } else { - scope.events.hasNext = false; - } - } - } - }; - - scope.$watch("entityId", function(newVal, prevVal) { - if (newVal && !angular.equals(newVal, prevVal)) { - scope.resetFilter(); - scope.reload(); - } - }); - - scope.$watch("timewindow", function(newVal, prevVal) { - if (newVal && !angular.equals(newVal, prevVal)) { - scope.reload(); - } - }, true); - - scope.resetFilter = function() { - scope.timewindow = { - history: { - timewindowMs: 24 * 60 * 60 * 1000 // 1 day - } - }; - } - - scope.updateTimeWindowRange = function() { - if (scope.timewindow.history.timewindowMs) { - var currentTime = (new Date).getTime(); - startTime = currentTime - scope.timewindow.history.timewindowMs; - endTime = currentTime; - } else { - startTime = scope.timewindow.history.fixedTimewindow.startTimeMs; - endTime = scope.timewindow.history.fixedTimewindow.endTimeMs; - } - } - - scope.reload = function() { - scope.topIndex = 0; - scope.selected = []; - scope.updateTimeWindowRange(); - scope.events = { - data: [], - nextPageLink: { - limit: pageSize, - startTime: startTime, - endTime: endTime - }, - hasNext: true, - pending: false - }; - scope.theEvents.getItemAtIndex(pageSize); - } - - scope.noData = function() { - return scope.events.data.length == 0 && !scope.events.hasNext; - } - - scope.hasData = function() { - return scope.events.data.length > 0; - } - - scope.loading = function() { - return $rootScope.loading; - } - - scope.hasScroll = function() { - var repeatContainer = scope.repeatContainer[0]; - if (repeatContainer) { - var scrollElement = repeatContainer.children[0]; - if (scrollElement) { - return scrollElement.scrollHeight > scrollElement.clientHeight; - } - } - return false; - } - - scope.subscriptionId = null; - - scope.loadEdgeInfo = function() { - attributeService.getEntityAttributesValues( - scope.entityType, - scope.entityId, - types.attributesScope.server.value, - types.edgeAttributeKeys.queueStartTs, - null).then( - function success(attributes) { - attributes.length > 0 ? scope.onEdgeAttributesUpdate(attributes) : scope.queueStartTs = 0; - }); - scope.checkSubscription(); - } - - scope.onEdgeAttributesUpdate = function(attributes) { - let edgeAttributes = attributes.reduce(function (map, attribute) { - map[attribute.key] = attribute; - return map; - }, {}); - if (edgeAttributes.queueStartTs) { - scope.queueStartTs = edgeAttributes.queueStartTs.lastUpdateTs; - } - } - - scope.checkSubscription = function() { - var newSubscriptionId = null; - if (scope.entityId && scope.entityType && types.attributesScope.server.value) { - newSubscriptionId = - attributeService.subscribeForEntityAttributes(scope.entityType, scope.entityId, types.attributesScope.server.value); - } - if (scope.subscriptionId && scope.subscriptionId != newSubscriptionId) { - attributeService.unsubscribeForEntityAttributes(scope.subscriptionId); - } - scope.subscriptionId = newSubscriptionId; - } - - scope.$on('$destroy', function () { - if (scope.subscriptionId) { - attributeService.unsubscribeForEntityAttributes(scope.subscriptionId); - } - }); - - scope.reload(); - - $compile(element.contents())(scope); - } - function prepareEdgeEventData(data) { - - data.forEach( - edgeEvent => { - edgeEvent.edgeEventActionText = $translate.instant(types.edgeEventActionType[edgeEvent.action].name); - edgeEvent.edgeEventTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeEvent.edgeId.entityType].name); - } - ); - return data; - } - - return { - restrict: "E", - link: linker, - scope: { - entityType: '=', - entityId: '=', - tenantId: '=' - } - }; -} diff --git a/ui/src/app/event/edge-downlinks-table.tpl.html b/ui/src/app/event/edge-downlinks-table.tpl.html deleted file mode 100644 index d55e61457c..0000000000 --- a/ui/src/app/event/edge-downlinks-table.tpl.html +++ /dev/null @@ -1,46 +0,0 @@ - - -
- - - refresh - - {{ 'action.refresh' | translate }} - - -
- - - - - - edge.no-downlinks-prompt - - - - - - - - - diff --git a/ui/src/app/event/event-header-edge-event.tpl.html b/ui/src/app/event/event-header-edge-event.tpl.html deleted file mode 100644 index 3de281ddc7..0000000000 --- a/ui/src/app/event/event-header-edge-event.tpl.html +++ /dev/null @@ -1,23 +0,0 @@ - -
event.event-time
-
event.event-type
-
edge.event-action
-
edge.entity-id
-
edge.status
-
edge.entity-info
diff --git a/ui/src/app/event/event-header.directive.js b/ui/src/app/event/event-header.directive.js index a9db6fa5fb..ce0fe4e81c 100644 --- a/ui/src/app/event/event-header.directive.js +++ b/ui/src/app/event/event-header.directive.js @@ -19,7 +19,6 @@ import eventHeaderLcEventTemplate from './event-header-lc-event.tpl.html'; import eventHeaderStatsTemplate from './event-header-stats.tpl.html'; import eventHeaderErrorTemplate from './event-header-error.tpl.html'; import eventHeaderDebugRuleNodeTemplate from './event-header-debug-rulenode.tpl.html'; -import edgeDownlinksHeaderTemplate from './event-header-edge-event.tpl.html' /* eslint-enable import/no-unresolved, import/default */ @@ -46,9 +45,6 @@ export default function EventHeaderDirective($compile, $templateCache, types) { case types.debugEventType.debugRuleChain.value: template = eventHeaderDebugRuleNodeTemplate; break; - case types.edgeDownlinks.value: - template = edgeDownlinksHeaderTemplate; - break; } return $templateCache.get(template); } diff --git a/ui/src/app/event/event-row.directive.js b/ui/src/app/event/event-row.directive.js index fd5fce3a0c..2195e68ad3 100644 --- a/ui/src/app/event/event-row.directive.js +++ b/ui/src/app/event/event-row.directive.js @@ -21,13 +21,12 @@ import eventRowLcEventTemplate from './event-row-lc-event.tpl.html'; import eventRowStatsTemplate from './event-row-stats.tpl.html'; import eventRowErrorTemplate from './event-row-error.tpl.html'; import eventRowDebugRuleNodeTemplate from './event-row-debug-rulenode.tpl.html'; -import edgeDownlinlsRowTemplate from './event-row-edge-event.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ export default function EventRowDirective($compile, $templateCache, $mdDialog, $document, $translate, - types, utils, toast, entityService, ruleChainService) { + types, utils) { var linker = function (scope, element, attrs) { @@ -49,9 +48,6 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ case types.debugEventType.debugRuleChain.value: template = eventRowDebugRuleNodeTemplate; break; - case types.edgeDownlinks.value: - template = edgeDownlinlsRowTemplate; - break; } return $templateCache.get(template); } @@ -98,85 +94,7 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ }); } - scope.showEdgeEntityContent = function($event, title, contentType) { - var onShowingCallback = { - onShowing: function(){} - } - if (!contentType) { - contentType = null; - } - var content = ''; - switch(scope.event.type) { - case types.edgeEventType.relation: - content = angular.toJson(scope.event.body); - showDialog(); - break; - case types.edgeEventType.ruleChainMetaData: - content = ruleChainService.getRuleChainMetaData(scope.event.entityId, {ignoreErrors: true}).then( - function success(info) { - showDialog(); - return angular.toJson(info); - }, function fail() { - showError(); - }); - break; - default: - content = entityService.getEntity(scope.event.type, scope.event.entityId, {ignoreErrors: true}).then( - function success(info) { - showDialog(); - return angular.toJson(info); - }, function fail() { - showError(); - }); - break; - } - function showDialog() { - $mdDialog.show({ - controller: 'EventContentDialogController', - controllerAs: 'vm', - templateUrl: eventErrorDialogTemplate, - locals: {content: content, title: title, contentType: contentType, showingCallback: onShowingCallback}, - parent: angular.element($document[0].body), - fullscreen: true, - targetEvent: $event, - multiple: true, - onShowing: function(scope, element) { - onShowingCallback.onShowing(scope, element); - } - }); - } - function showError() { - toast.showError($translate.instant('edge.load-entity-error')); - } - } - - scope.checkEdgeEventType = function (type) { - return !(type === types.edgeEventType.widgetType || - type === types.edgeEventType.adminSettings || - type === types.edgeEventType.widgetsBundle ); - } - - scope.checkTooltip = function($event) { - var el = $event.target; - var $el = angular.element(el); - if(el.offsetWidth < el.scrollWidth && !$el.attr('title')){ - $el.attr('title', $el.text()); - } - } - $compile(element.contents())(scope); - - scope.updateStatus = function(eventCreatedTime) { - var status; - if (eventCreatedTime < scope.queueStartTs) { - status = $translate.instant(types.edgeEventStatus.DEPLOYED.name); - scope.statusColor = types.edgeEventStatus.DEPLOYED.color; - } else { - status = $translate.instant(types.edgeEventStatus.PENDING.name); - scope.statusColor = types.edgeEventStatus.PENDING.color; - } - return status; - } } return { diff --git a/ui/src/app/event/event.scss b/ui/src/app/event/event.scss index b0d0d19157..f1b5eb0d46 100644 --- a/ui/src/app/event/event.scss +++ b/ui/src/app/event/event.scss @@ -85,10 +85,6 @@ md-list.tb-event-table { } } -.tb-edge-downlinks-table { - @extend .tb-event-table; -} - #tb-event-content { width: 100%; min-width: 400px; diff --git a/ui/src/app/event/index.js b/ui/src/app/event/index.js index fb918833c7..69227eef8b 100644 --- a/ui/src/app/event/index.js +++ b/ui/src/app/event/index.js @@ -19,7 +19,6 @@ import EventContentDialogController from './event-content-dialog.controller'; import EventHeaderDirective from './event-header.directive'; import EventRowDirective from './event-row.directive'; import EventTableDirective from './event-table.directive'; -import EdgeDownlinksDirective from "./edge-downlinks-table.directive"; export default angular.module('thingsboard.event', [ thingsboardApiEvent @@ -28,5 +27,4 @@ export default angular.module('thingsboard.event', [ .directive('tbEventHeader', EventHeaderDirective) .directive('tbEventRow', EventRowDirective) .directive('tbEventTable', EventTableDirective) - .directive('tbEdgeDownlinksTableOld', EdgeDownlinksDirective) .name;