[trafficcontrol] branch master updated: Removed restangular from RoleService (#3629)

[mitchell852]

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c07410  Removed restangular from RoleService (#3629)
5c07410 is described below

commit 5c07410c093c5892834d54e46bb9ba29d14a5bf2
Author: ocket8888 <ocket8...@gmail.com>
AuthorDate: Mon Jun 3 20:39:21 2019 -0600

    Removed restangular from RoleService (#3629)
    
    * Removed restangular from ./RoleService.js
    
    * Fixed some service methods not throwing in error handlers
---
 traffic_portal/app/src/common/api/RoleService.js | 82 +++++++++++-------------
 1 file changed, 37 insertions(+), 45 deletions(-)

diff --git a/traffic_portal/app/src/common/api/RoleService.js 
b/traffic_portal/app/src/common/api/RoleService.js
index 1e8bef7..b981441 100644
--- a/traffic_portal/app/src/common/api/RoleService.js
+++ b/traffic_portal/app/src/common/api/RoleService.js
@@ -17,64 +17,56 @@
  * under the License.
  */
 
-var RoleService = function(Restangular, $http, $q, messageModel, ENV) {
+var RoleService = function($http, messageModel, ENV) {
 
     this.getRoles = function(queryParams) {
-        return Restangular.all('roles').getList(queryParams);
+        return $http.get(ENV.api['root'] + 'roles', {params: 
queryParams}).then(
+            function (result) {
+                return result.data.response;
+            },
+            function (err) {
+                throw err;
+            }
+        )
     };
 
     this.createRole = function(role) {
-        var request = $q.defer();
-
-        $http.post(ENV.api['root'] + "roles", role)
-            .then(
-                function(result) {
-                    request.resolve(result.data);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                    request.reject(fault);
-                }
-            );
-
-        return request.promise;
+        return $http.post(ENV.api['root'] + "roles", role).then(
+            function(result) {
+                return result.data;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
     this.updateRole = function(role) {
-        var request = $q.defer();
-
-        $http.put(ENV.api['root'] + "roles?id=" + role.id, role)
-            .then(
-                function(result) {
-                    request.resolve(result.data);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                    request.reject();
-                }
-            );
-
-        return request.promise;
+        return $http.put(ENV.api['root'] + "roles", role, {params: {id: 
role.id}}).then(
+            function(result) {
+                return result.data;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
     this.deleteRole = function(id) {
-        var request = $q.defer();
-
-        $http.delete(ENV.api['root'] + "roles?id=" + id)
-            .then(
-                function(result) {
-                    request.resolve(result.data);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                    request.reject(fault);
-                }
-            );
-
-        return request.promise;
+        return $http.delete(ENV.api['root'] + "roles", {params: {id: 
id}}).then(
+            function(result) {
+                return result.data;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
 };
 
-RoleService.$inject = ['Restangular', '$http', '$q', 'messageModel', 'ENV'];
+RoleService.$inject = ['$http', 'messageModel', 'ENV'];
 module.exports = RoleService;