Commit cb0201e87a27a805feab273e9950784f7b79e28c

Authored by Artem Babak
1 parent 1178e577

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

... ... @@ -322,19 +322,13 @@ function AssetService($http, $q, $filter, customerService, userService) {
322 322 return deferred.promise;
323 323 }
324 324
325   - function getEdgeAssets(edgeId, pageLink, config, type) {
  325 + function getEdgeAssets(edgeId, pageLink, config) {
326 326 var deferred = $q.defer();
327 327 var url = '/api/edge/' + edgeId + '/assets?limit=' + pageLink.limit;
328 328 if (angular.isDefined(pageLink.idOffset)) {
329 329 url += '&offset=' + pageLink.idOffset;
330 330 }
331 331 $http.get(url, config).then(function success(response) {
332   - if (pageLink.textSearch) {
333   - response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
334   - }
335   - if (angular.isDefined(type) && type.length) {
336   - response.data.data = $filter('filter')(response.data.data, {type: type});
337   - }
338 332 deferred.resolve(response.data);
339 333 }, function fail() {
340 334 deferred.reject();
... ...
... ... @@ -384,19 +384,13 @@ function DeviceService($http, $q, $window, $filter, userService, attributeServic
384 384 return deferred.promise;
385 385 }
386 386
387   - function getEdgeDevices(edgeId, pageLink, config, type) {
  387 + function getEdgeDevices(edgeId, pageLink, config) {
388 388 var deferred = $q.defer();
389 389 var url = '/api/edge/' + edgeId + '/devices?limit=' + pageLink.limit;
390 390 if (angular.isDefined(pageLink.idOffset)) {
391 391 url += '&offset=' + pageLink.idOffset;
392 392 }
393 393 $http.get(url, config).then(function success(response) {
394   - if (pageLink.textSearch) {
395   - response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
396   - }
397   - if (angular.isDefined(type) && type.length) {
398   - response.data.data = $filter('filter')(response.data.data, {type: type});
399   - }
400 394 deferred.resolve(response.data);
401 395 }, function fail() {
402 396 deferred.reject();
... ...
... ... @@ -245,19 +245,13 @@ function EntityViewService($http, $q, $window, $filter, userService, attributeSe
245 245 return deferred.promise;
246 246 }
247 247
248   - function getEdgeEntityViews(edgeId, pageLink, config, type) {
  248 + function getEdgeEntityViews(edgeId, pageLink, config) {
249 249 var deferred = $q.defer();
250 250 var url = '/api/edge/' + edgeId + '/entityViews?limit=' + pageLink.limit;
251 251 if (angular.isDefined(pageLink.idOffset)) {
252 252 url += '&offset=' + pageLink.idOffset;
253 253 }
254 254 $http.get(url, config).then(function success(response) {
255   - if (pageLink.textSearch) {
256   - response.data.data = $filter('filter')(response.data.data, {name: pageLink.textSearch});
257   - }
258   - if (angular.isDefined(type) && type.length) {
259   - response.data.data = $filter('filter')(response.data.data, {type: type});
260   - }
261 255 deferred.resolve(response.data);
262 256 }, function fail() {
263 257 deferred.reject();
... ...
... ... @@ -324,8 +324,8 @@ export function AssetController($rootScope, userService, assetService, customerS
324 324 vm.assetGridConfig.addItemActions = [];
325 325
326 326 } else if (vm.assetsScope === 'edge') {
327   - fetchAssetsFunction = function (pageLink, assetType) {
328   - return assetService.getEdgeAssets(edgeId, pageLink, null, assetType);
  327 + fetchAssetsFunction = function (pageLink) {
  328 + return assetService.getEdgeAssets(edgeId, pageLink, null);
329 329 };
330 330 deleteAssetFunction = function (assetId) {
331 331 return assetService.unassignAssetFromEdge(edgeId, assetId);
... ...
... ... @@ -357,8 +357,8 @@ export function DeviceController($rootScope, userService, deviceService, custome
357 357 vm.deviceGridConfig.addItemActions = [];
358 358
359 359 } else if (vm.devicesScope === 'edge') {
360   - fetchDevicesFunction = function (pageLink, deviceType) {
361   - return deviceService.getEdgeDevices(edgeId, pageLink, null, deviceType);
  360 + fetchDevicesFunction = function (pageLink) {
  361 + return deviceService.getEdgeDevices(edgeId, pageLink, null);
362 362 };
363 363 deleteDeviceFunction = function (deviceId) {
364 364 return deviceService.unassignDeviceFromEdge(edgeId, deviceId);
... ...
... ... @@ -285,8 +285,8 @@ export function EntityViewController($rootScope, userService, entityViewService,
285 285 vm.entityViewGridConfig.addItemAction = {};
286 286 }
287 287 } else if (vm.entityViewsScope === 'edge') {
288   - fetchEntityViewsFunction = function (pageLink, entityViewType) {
289   - return entityViewService.getEdgeEntityViews(edgeId, pageLink, null, entityViewType);
  288 + fetchEntityViewsFunction = function (pageLink) {
  289 + return entityViewService.getEdgeEntityViews(edgeId, pageLink, null);
290 290 };
291 291 deleteEntityViewFunction = function (entityViewId) {
292 292 return entityViewService.unassignEntityViewFromEdge(edgeId, entityViewId);
... ...