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

Delete UI filtering for getEdge assets/entity-views/devices

Browse Source
This commit is contained in:
Artem Babak 2020-12-15 13:22:24 +02:00
parent 1178e5779a
commit cb0201e87a
6 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/api/asset.service.js
View File

@ -322,19 +322,13 @@ function AssetService($http, $q, $filter, customerService, userService) {
return deferred.promise; return deferred.promise;
} }
function getEdgeAssets(edgeId, pageLink, config, type) { function getEdgeAssets(edgeId, pageLink, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/edge/' + edgeId + '/assets?limit=' + pageLink.limit; var url = '/api/edge/' + edgeId + '/assets?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.idOffset)) { if (angular.isDefined(pageLink.idOffset)) {
url += '&offset=' + pageLink.idOffset; url += '&offset=' + pageLink.idOffset;
} }
$http.get(url, config).then(function success(response) { $http.get(url, config).then(function success(response) {
if (pageLink.textSearch) {
response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
}
if (angular.isDefined(type) && type.length) {
response.data.data = $filter('filter')(response.data.data, {type: type});
}
deferred.resolve(response.data); deferred.resolve(response.data);
}, function fail() { }, function fail() {
deferred.reject(); deferred.reject();

8
ui/src/app/api/device.service.js
View File

@ -384,19 +384,13 @@ function DeviceService($http, $q, $window, $filter, userService, attributeServic
return deferred.promise; return deferred.promise;
} }
function getEdgeDevices(edgeId, pageLink, config, type) { function getEdgeDevices(edgeId, pageLink, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/edge/' + edgeId + '/devices?limit=' + pageLink.limit; var url = '/api/edge/' + edgeId + '/devices?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.idOffset)) { if (angular.isDefined(pageLink.idOffset)) {
url += '&offset=' + pageLink.idOffset; url += '&offset=' + pageLink.idOffset;
} }
$http.get(url, config).then(function success(response) { $http.get(url, config).then(function success(response) {
if (pageLink.textSearch) {
response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
}
if (angular.isDefined(type) && type.length) {
response.data.data = $filter('filter')(response.data.data, {type: type});
}
deferred.resolve(response.data); deferred.resolve(response.data);
}, function fail() { }, function fail() {
deferred.reject(); deferred.reject();

8
ui/src/app/api/entity-view.service.js
View File

@ -245,19 +245,13 @@ function EntityViewService($http, $q, $window, $filter, userService, attributeSe
return deferred.promise; return deferred.promise;
} }
function getEdgeEntityViews(edgeId, pageLink, config, type) { function getEdgeEntityViews(edgeId, pageLink, config) {
var deferred = $q.defer(); var deferred = $q.defer();
var url = '/api/edge/' + edgeId + '/entityViews?limit=' + pageLink.limit; var url = '/api/edge/' + edgeId + '/entityViews?limit=' + pageLink.limit;
if (angular.isDefined(pageLink.idOffset)) { if (angular.isDefined(pageLink.idOffset)) {
url += '&offset=' + pageLink.idOffset; url += '&offset=' + pageLink.idOffset;
} }
$http.get(url, config).then(function success(response) { $http.get(url, config).then(function success(response) {
if (pageLink.textSearch) {
response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
}
if (angular.isDefined(type) && type.length) {
response.data.data = $filter('filter')(response.data.data, {type: type});
}
deferred.resolve(response.data); deferred.resolve(response.data);
}, function fail() { }, function fail() {
deferred.reject(); deferred.reject();

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

@ -324,8 +324,8 @@ export function AssetController($rootScope, userService, assetService, customerS
vm.assetGridConfig.addItemActions = []; vm.assetGridConfig.addItemActions = [];
} else if (vm.assetsScope === 'edge') { } else if (vm.assetsScope === 'edge') {
fetchAssetsFunction = function (pageLink, assetType) { fetchAssetsFunction = function (pageLink) {
return assetService.getEdgeAssets(edgeId, pageLink, null, assetType); return assetService.getEdgeAssets(edgeId, pageLink, null);
}; };
deleteAssetFunction = function (assetId) { deleteAssetFunction = function (assetId) {
return assetService.unassignAssetFromEdge(edgeId, assetId); return assetService.unassignAssetFromEdge(edgeId, assetId);

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

@ -357,8 +357,8 @@ export function DeviceController($rootScope, userService, deviceService, custome
vm.deviceGridConfig.addItemActions = []; vm.deviceGridConfig.addItemActions = [];
} else if (vm.devicesScope === 'edge') { } else if (vm.devicesScope === 'edge') {
fetchDevicesFunction = function (pageLink, deviceType) { fetchDevicesFunction = function (pageLink) {
return deviceService.getEdgeDevices(edgeId, pageLink, null, deviceType); return deviceService.getEdgeDevices(edgeId, pageLink, null);
}; };
deleteDeviceFunction = function (deviceId) { deleteDeviceFunction = function (deviceId) {
return deviceService.unassignDeviceFromEdge(edgeId, deviceId); return deviceService.unassignDeviceFromEdge(edgeId, deviceId);

4
ui/src/app/entity-view/entity-view.controller.js
View File

@ -285,8 +285,8 @@ export function EntityViewController($rootScope, userService, entityViewService,
vm.entityViewGridConfig.addItemAction = {}; vm.entityViewGridConfig.addItemAction = {};
} }
} else if (vm.entityViewsScope === 'edge') { } else if (vm.entityViewsScope === 'edge') {
fetchEntityViewsFunction = function (pageLink, entityViewType) { fetchEntityViewsFunction = function (pageLink) {
return entityViewService.getEdgeEntityViews(edgeId, pageLink, null, entityViewType); return entityViewService.getEdgeEntityViews(edgeId, pageLink, null);
}; };
deleteEntityViewFunction = function (entityViewId) { deleteEntityViewFunction = function (entityViewId) {
return entityViewService.unassignEntityViewFromEdge(edgeId, entityViewId); return entityViewService.unassignEntityViewFromEdge(edgeId, entityViewId);