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

ui/src/app/api/asset.service.js

@@ -322,19 +322,13 @@ function AssetService($http, $q, $filter, customerService, userService) {
         return deferred.promise;
     }
 
-    function getEdgeAssets(edgeId, pageLink, config, type) {
+    function getEdgeAssets(edgeId, pageLink, config) {
         var deferred = $q.defer();
         var url = '/api/edge/' + edgeId + '/assets?limit=' + pageLink.limit;
         if (angular.isDefined(pageLink.idOffset)) {
             url += '&offset=' + pageLink.idOffset;
         }
         $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);
         }, function fail() {
             deferred.reject();

ui/src/app/api/device.service.js

@@ -384,19 +384,13 @@ function DeviceService($http, $q, $window, $filter, userService, attributeServic
         return deferred.promise;
     }
 
-    function getEdgeDevices(edgeId, pageLink, config, type) {
+    function getEdgeDevices(edgeId, pageLink, config) {
         var deferred = $q.defer();
         var url = '/api/edge/' + edgeId + '/devices?limit=' + pageLink.limit;
         if (angular.isDefined(pageLink.idOffset)) {
             url += '&offset=' + pageLink.idOffset;
         }
         $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);
         }, function fail() {
             deferred.reject();

ui/src/app/api/entity-view.service.js

@@ -245,19 +245,13 @@ function EntityViewService($http, $q, $window, $filter, userService, attributeSe
         return deferred.promise;
     }
 
-    function getEdgeEntityViews(edgeId, pageLink, config, type) {
+    function getEdgeEntityViews(edgeId, pageLink, config) {
         var deferred = $q.defer();
         var url = '/api/edge/' + edgeId + '/entityViews?limit=' + pageLink.limit;
         if (angular.isDefined(pageLink.idOffset)) {
             url += '&offset=' + pageLink.idOffset;
         }
         $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);
         }, function fail() {
             deferred.reject();

ui/src/app/asset/asset.controller.js

@@ -324,8 +324,8 @@ export function AssetController($rootScope, userService, assetService, customerS
             vm.assetGridConfig.addItemActions = [];
 
         } 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) {
                 return assetService.unassignAssetFromEdge(edgeId, assetId);

ui/src/app/device/device.controller.js

@@ -357,8 +357,8 @@ export function DeviceController($rootScope, userService, deviceService, custome
             vm.deviceGridConfig.addItemActions = [];
 
         } 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) {
                 return deviceService.unassignDeviceFromEdge(edgeId, deviceId);

ui/src/app/entity-view/entity-view.controller.js

@@ -285,8 +285,8 @@ export function EntityViewController($rootScope, userService, entityViewService,
                 vm.entityViewGridConfig.addItemAction = {};
             }
         } 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) {
                 return entityViewService.unassignEntityViewFromEdge(edgeId, entityViewId);