Browse Source

Edge Downlinks refactored

pull/3957/head
Artem Babak 6 years ago
parent
commit
bee4da8995
  1. 4
      ui/src/app/api/edge.service.js
  2. 2
      ui/src/app/edge/downlinks/edge-downlinks-table.directive.js

4
ui/src/app/api/edge.service.js

@ -35,7 +35,7 @@ function EdgeService($http, $q, customerService) {
unassignEdgeFromCustomer: unassignEdgeFromCustomer, unassignEdgeFromCustomer: unassignEdgeFromCustomer,
makeEdgePublic: makeEdgePublic, makeEdgePublic: makeEdgePublic,
setRootRuleChain: setRootRuleChain, setRootRuleChain: setRootRuleChain,
getEdgeDownlinks: getEdgeDownlinks, getEdgeEvents: getEdgeEvents,
syncEdge: syncEdge, syncEdge: syncEdge,
findMissingToRelatedRuleChains: findMissingToRelatedRuleChains findMissingToRelatedRuleChains: findMissingToRelatedRuleChains
}; };
@ -276,7 +276,7 @@ function EdgeService($http, $q, customerService) {
return deferred.promise; return deferred.promise;
} }
function getEdgeDownlinks(edgeId, pageLink) { function getEdgeEvents(edgeId, pageLink) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/edge/' + edgeId + '/events' + '?limit=' + pageLink.limit; var url = '/api/edge/' + edgeId + '/events' + '?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) { if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {

2
ui/src/app/edge/downlinks/edge-downlinks-table.directive.js

@ -67,7 +67,7 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc
if (scope.entityType && scope.entityId && scope.tenantId) { if (scope.entityType && scope.entityId && scope.tenantId) {
scope.loadEdgeInfo(); scope.loadEdgeInfo();
scope.downlinks.pending = true; scope.downlinks.pending = true;
edgeService.getEdgeDownlinks(scope.entityId, scope.downlinks.nextPageLink).then( edgeService.getEdgeEvents(scope.entityId, scope.downlinks.nextPageLink).then(
function success(downlinks) { function success(downlinks) {
scope.downlinks.data = scope.downlinks.data.concat(prepareEdgeDownlinksData(downlinks.data)); scope.downlinks.data = scope.downlinks.data.concat(prepareEdgeDownlinksData(downlinks.data));
scope.downlinks.nextPageLink = downlinks.nextPageLink; scope.downlinks.nextPageLink = downlinks.nextPageLink;

Loading…
Cancel
Save