[trafficcontrol] branch master updated: Removed restangular from TenantService (#3633)

[mi...@apache.org]

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 f04bd4b  Removed restangular from TenantService (#3633)
f04bd4b is described below

commit f04bd4b62880c7e6d1c292842758f8311097c3c5
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Fri Jun 7 12:53:42 2019 -0600

    Removed restangular from TenantService (#3633)
    
    * Removed restangular from ./TenantService.js
    
    * Fixed some service methods not throwing in error handlers
    
    * fixed incorrect 'delay' argument in several places
---
 traffic_portal/app/src/common/api/TenantService.js | 77 +++++++++++++---------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/traffic_portal/app/src/common/api/TenantService.js b/traffic_portal/app/src/common/api/TenantService.js
index 53d09dd..d4f9376 100644
--- a/traffic_portal/app/src/common/api/TenantService.js
+++ b/traffic_portal/app/src/common/api/TenantService.js
@@ -17,53 +17,70 @@
  * under the License.
  */
 
-var TenantService = function(Restangular, messageModel) {
+var TenantService = function($http, ENV, messageModel) {
 
     this.getTenants = function(queryParams) {
-        return Restangular.all('tenants').getList(queryParams);
+        return $http.get(ENV.api['root'] + 'tenants', {params: queryParams}).then(
+            function (result) {
+                return result.data.response;
+            },
+            function (err) {
+                throw err;
+            }
+        )
     };
 
     this.getTenant = function(id) {
-        return Restangular.one("tenants", id).get();
+        return $http.get(ENV.api['root'] + 'tenants', {params: {id: id}}).then(
+            function (result) {
+                return result.data.response[0];
+            },
+            function (err) {
+                throw err;
+            }
+        )
     };
 
     this.createTenant = function(tenant) {
-        return Restangular.service('tenants').post(tenant)
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Tenant created' } ], true);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, true);
-                }
+        return $http.post(ENV.api['root'] + 'tenants', tenant).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Tenant created' } ], true);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
         );
     };
 
     this.updateTenant = function(tenant) {
-        return tenant.put()
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Tenant updated' } ], false);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                }
-            );
+        return $http.put(ENV.api['root'] + 'tenants/' + tenant.id, tenant).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Tenant updated' } ], false);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
     this.deleteTenant = function(id) {
-        return Restangular.one("tenants", id).remove()
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Tenant deleted' } ], true);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, true);
-                }
-            );
+        return $http.delete(ENV.api['root'] + "tenants/" + id).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Tenant deleted' } ], true);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
 };
 
-TenantService.$inject = ['Restangular', 'messageModel'];
+TenantService.$inject = ['$http', 'ENV', 'messageModel'];
 module.exports = TenantService;