From 122be667a12314b13a0a79897997173b5fa36132 Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Tue, 28 May 2019 13:13:45 -0600 Subject: [PATCH 1/3] Removed restangular from ./TenantService.js --- .../app/src/common/api/TenantService.js | 74 +++++++++++-------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/traffic_portal/app/src/common/api/TenantService.js b/traffic_portal/app/src/common/api/TenantService.js index 53d09ddcbb..e350306830 100644 --- a/traffic_portal/app/src/common/api/TenantService.js +++ b/traffic_portal/app/src/common/api/TenantService.js @@ -17,53 +17,67 @@ * 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) { + console.error(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) { + console.error(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, true); + } ); }; 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); + } + ); }; 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, true); + } + ); }; }; -TenantService.$inject = ['Restangular', 'messageModel']; +TenantService.$inject = ['$http', 'ENV', 'messageModel']; module.exports = TenantService; From f0ecc89db8c49a3d7e23f8ae95b0826005244cce Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Mon, 3 Jun 2019 07:44:28 -0600 Subject: [PATCH 2/3] Fixed some service methods not throwing in error handlers --- traffic_portal/app/src/common/api/TenantService.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/traffic_portal/app/src/common/api/TenantService.js b/traffic_portal/app/src/common/api/TenantService.js index e350306830..25235f0e9a 100644 --- a/traffic_portal/app/src/common/api/TenantService.js +++ b/traffic_portal/app/src/common/api/TenantService.js @@ -25,7 +25,7 @@ var TenantService = function($http, ENV, messageModel) { return result.data.response; }, function (err) { - console.error(err); + throw err; } ) }; @@ -36,7 +36,7 @@ var TenantService = function($http, ENV, messageModel) { return result.data.response[0]; }, function (err) { - console.error(err); + throw err; } ) }; @@ -49,6 +49,7 @@ var TenantService = function($http, ENV, messageModel) { }, function(err) { messageModel.setMessages(err.data.alerts, true); + throw err; } ); }; @@ -61,6 +62,7 @@ var TenantService = function($http, ENV, messageModel) { }, function(err) { messageModel.setMessages(err.data.alerts, false); + throw err; } ); }; @@ -73,6 +75,7 @@ var TenantService = function($http, ENV, messageModel) { }, function(err) { messageModel.setMessages(err.data.alerts, true); + throw err; } ); }; From 0977c70656460853004f170146fa303eac9d1beb Mon Sep 17 00:00:00 2001 From: ocket8888 Date: Tue, 4 Jun 2019 11:07:50 -0600 Subject: [PATCH 3/3] fixed incorrect 'delay' argument in several places --- traffic_portal/app/src/common/api/TenantService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traffic_portal/app/src/common/api/TenantService.js b/traffic_portal/app/src/common/api/TenantService.js index 25235f0e9a..d4f937618f 100644 --- a/traffic_portal/app/src/common/api/TenantService.js +++ b/traffic_portal/app/src/common/api/TenantService.js @@ -48,7 +48,7 @@ var TenantService = function($http, ENV, messageModel) { return result; }, function(err) { - messageModel.setMessages(err.data.alerts, true); + messageModel.setMessages(err.data.alerts, false); throw err; } ); @@ -74,7 +74,7 @@ var TenantService = function($http, ENV, messageModel) { return result; }, function(err) { - messageModel.setMessages(err.data.alerts, true); + messageModel.setMessages(err.data.alerts, false); throw err; } );