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

getEdge, getTenantEdges, getCustomerEdges refactored

Browse Source
This commit is contained in:
Artem Babak 2020-12-15 15:29:10 +02:00
parent 00caacf6c2
commit 05771cd900
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/src/app/api/edge.service.js
View File

@ -30,6 +30,7 @@ function EdgeService($http, $q, customerService) {
getTenantEdges: getTenantEdges, getTenantEdges: getTenantEdges,
getCustomerEdges: getCustomerEdges, getCustomerEdges: getCustomerEdges,
assignEdgeToCustomer: assignEdgeToCustomer, assignEdgeToCustomer: assignEdgeToCustomer,
findByQuery: findByQuery,
unassignEdgeFromCustomer: unassignEdgeFromCustomer, unassignEdgeFromCustomer: unassignEdgeFromCustomer,
makeEdgePublic: makeEdgePublic, makeEdgePublic: makeEdgePublic,
setRootRuleChain: setRootRuleChain, setRootRuleChain: setRootRuleChain,
@ -61,13 +62,7 @@ function EdgeService($http, $q, customerService) {
function getEdgesByIds(edgeIds, config) { function getEdgesByIds(edgeIds, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var ids = ''; var ids = edgeIds.join(',');
for (var i=0;i<edgeIds.length;i++) {
if (i>0) {
ids += ',';
}
ids += edgeIds[i];
}
var url = '/api/edges?edgeIds=' + ids; var url = '/api/edges?edgeIds=' + ids;
$http.get(url, config).then(function success(response) { $http.get(url, config).then(function success(response) {
var entities = response.data; var entities = response.data;
@ -85,9 +80,13 @@ function EdgeService($http, $q, customerService) {
return deferred.promise; return deferred.promise;
} }
function getEdge(edgeId, config) { function getEdge(edgeId, ignoreErrors, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/edge/' + edgeId; var url = '/api/edge/' + edgeId;
if (!config) {
config = {};
}
config = Object.assign(config, { ignoreErrors: ignoreErrors });
$http.get(url, config).then(function success(response) { $http.get(url, config).then(function success(response) {
deferred.resolve(response.data); deferred.resolve(response.data);
}, function fail(response) { }, function fail(response) {
@ -129,7 +128,7 @@ function EdgeService($http, $q, customerService) {
return deferred.promise; return deferred.promise;
} }
function getTenantEdges(pageLink, applyCustomersInfo, config, type) { function getTenantEdges(pageLink, applyCustomersInfo, type, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/tenant/edges?limit=' + pageLink.limit; var url = '/api/tenant/edges?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.textSearch)) { if (angular.isDefined(pageLink.textSearch)) {
@ -164,7 +163,7 @@ function EdgeService($http, $q, customerService) {
return deferred.promise; return deferred.promise;
} }
function getCustomerEdges(customerId, pageLink, applyCustomersInfo, config, type) { function getCustomerEdges(customerId, pageLink, applyCustomersInfo, type, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/customer/' + customerId + '/edges?limit=' + pageLink.limit; var url = '/api/customer/' + customerId + '/edges?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.textSearch)) { if (angular.isDefined(pageLink.textSearch)) {
@ -200,6 +199,21 @@ function EdgeService($http, $q, customerService) {
return deferred.promise; return deferred.promise;
} }
function findByQuery(query, ignoreErrors, config) {
var deferred = $q.defer();
var url = '/api/edges';
if (!config) {
config = {};
}
config = Object.assign(config, { ignoreErrors: ignoreErrors });
$http.post(url, query, config).then(function success(response) {
deferred.resolve(response.data);
}, function fail() {
deferred.reject();
});
return deferred.promise;
}
function assignEdgeToCustomer(customerId, edgeId) { function assignEdgeToCustomer(customerId, edgeId) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/customer/' + customerId + '/edge/' + edgeId; var url = '/api/customer/' + customerId + '/edge/' + edgeId;

11
ui/src/app/api/entity.service.js
View File

@ -78,7 +78,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
$log.error('Get Alarm Entity is not implemented!'); $log.error('Get Alarm Entity is not implemented!');
break; break;
case types.entityType.edge: case types.entityType.edge:
promise = edgeService.getEdge(entityId, config); promise = edgeService.getEdge(entityId, true, config);
break; break;
} }
return promise; return promise;
@ -164,7 +164,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
break; break;
case types.entityType.edge: case types.entityType.edge:
promise = getEntitiesByIdsPromise( promise = getEntitiesByIdsPromise(
(id) => edgeService.getEdge(id, config), entityIds); (id) => edgeService.getEdge(id, true, config), entityIds);
break; break;
} }
return promise; return promise;
@ -294,9 +294,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
break; break;
case types.entityType.edge: case types.entityType.edge:
if (user.authority === 'CUSTOMER_USER') { if (user.authority === 'CUSTOMER_USER') {
promise = edgeService.getCustomerEdges(customerId, pageLink, false, config, subType); promise = edgeService.getCustomerEdges(customerId, pageLink, false, subType, config);
} else { } else {
promise = edgeService.getTenantEdges(pageLink, false, config, subType); promise = edgeService.getTenantEdges(pageLink, false, subType, config);
} }
break; break;
} }
@ -960,9 +960,6 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
break; break;
case types.entityType.entityView: case types.entityType.entityView:
case types.entityType.edge: case types.entityType.edge:
entityFieldKeys.push(types.entityField.name.keyName);
entityFieldKeys.push(types.entityField.type.keyName);
break;
case types.entityType.device: case types.entityType.device:
case types.entityType.asset: case types.entityType.asset:
entityFieldKeys.push(types.entityField.name.keyName); entityFieldKeys.push(types.entityField.name.keyName);

4
ui/src/app/edge/edge.controller.js
View File

@ -161,7 +161,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer
if (vm.edgesScope === 'tenant') { if (vm.edgesScope === 'tenant') {
fetchEdgesFunction = function (pageLink, edgeType) { fetchEdgesFunction = function (pageLink, edgeType) {
return edgeService.getTenantEdges(pageLink, true, null, edgeType); return edgeService.getTenantEdges(pageLink, true, edgeType, null);
}; };
deleteEdgeFunction = function (edgeId) { deleteEdgeFunction = function (edgeId) {
return edgeService.deleteEdge(edgeId); return edgeService.deleteEdge(edgeId);
@ -337,7 +337,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer
} else if (vm.edgesScope === 'customer' || vm.edgesScope === 'customer_user') { } else if (vm.edgesScope === 'customer' || vm.edgesScope === 'customer_user') {
fetchEdgesFunction = function (pageLink, edgeType) { fetchEdgesFunction = function (pageLink, edgeType) {
return edgeService.getCustomerEdges(customerId, pageLink, true, null, edgeType); return edgeService.getCustomerEdges(customerId, pageLink, true, edgeType, null);
}; };
deleteEdgeFunction = function (edgeId) { deleteEdgeFunction = function (edgeId) {
return edgeService.unassignEdgeFromCustomer(edgeId); return edgeService.unassignEdgeFromCustomer(edgeId);

2
ui/src/app/rulechain/rulechains.controller.js
View File

@ -107,7 +107,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
var deleteRuleChainFunction = null; var deleteRuleChainFunction = null;
if (edgeId) { if (edgeId) {
edgeService.getEdge(edgeId).then( edgeService.getEdge(edgeId, true, null).then(
function success(edge) { function success(edge) {
vm.edge = edge; vm.edge = edge;
} }