[trafficcontrol] branch master updated: Removed restangular from OriginService (#3622)

[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 dae1230  Removed restangular from OriginService (#3622)
dae1230 is described below

commit dae12301206c05137a09d99d96050a414126a488
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Mon Aug 26 19:57:22 2019 -0600

    Removed restangular from OriginService (#3622)
    
    * Removed restangular from ./OriginService.js
    
    * Fixed some service methods not throwing in error handlers
---
 traffic_portal/app/src/common/api/OriginService.js | 88 ++++++++++------------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/traffic_portal/app/src/common/api/OriginService.js b/traffic_portal/app/src/common/api/OriginService.js
index b6a8567..b309cb2 100644
--- a/traffic_portal/app/src/common/api/OriginService.js
+++ b/traffic_portal/app/src/common/api/OriginService.js
@@ -17,66 +17,60 @@
  * under the License.
  */
 
-var OriginService = function($http, $q, Restangular, locationUtils, messageModel, ENV) {
+var OriginService = function($http, locationUtils, messageModel, ENV) {
 
     this.getOrigins = function(queryParams) {
-        return Restangular.all('origins').getList(queryParams);
+        return $http.get(ENV.api['root'] + 'origins', {params: queryParams}).then(
+            function (result) {
+                return result.data.response;
+            },
+            function (err) {
+                throw err;
+            }
+        );
     };
 
     this.createOrigin = function(origin) {
-        var request = $q.defer();
-
-        $http.post(ENV.api['root'] + "origins", origin)
-            .then(
-                function(response) {
-                    messageModel.setMessages(response.data.alerts, true);
-                    locationUtils.navigateToPath('/origins');
-                    request.resolve(response);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false)
-                    request.reject(fault);
-                }
-            );
-
-        return request.promise;
+        return $http.post(ENV.api['root'] + 'origins', origin).then(
+            function(response) {
+                messageModel.setMessages(response.data.alerts, true);
+                locationUtils.navigateToPath('/origins');
+                return response;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false)
+                throw err;
+            }
+        );
     };
 
     this.updateOrigin = function(id, origin) {
-        var request = $q.defer();
-
-        $http.put(ENV.api['root'] + "origins?id=" + id, origin)
-            .then(
-                function(response) {
-                    messageModel.setMessages(response.data.alerts, false);
-                    request.resolve();
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                    request.reject();
-                }
-            );
-        return request.promise;
+        return $http.put(ENV.api['root'] + "origins", origin, {params: {id: id}}).then(
+            function(response) {
+                messageModel.setMessages(response.data.alerts, false);
+                return response;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
     this.deleteOrigin = function(id) {
-        var deferred = $q.defer();
-
-        $http.delete(ENV.api['root'] + "origins?id=" + id)
-            .then(
-                function(response) {
-                    messageModel.setMessages(response.data.alerts, true);
-                    deferred.resolve(response);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                    deferred.reject(fault);
-                }
-            );
-        return deferred.promise;
+        return $http.delete(ENV.api['root'] + "origins", {params: {id: id}}).then(
+            function(response) {
+                messageModel.setMessages(response.data.alerts, true);
+                return response;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
 };
 
-OriginService.$inject = ['$http', '$q', 'Restangular', 'locationUtils', 'messageModel', 'ENV'];
+OriginService.$inject = ['$http', 'locationUtils', 'messageModel', 'ENV'];
 module.exports = OriginService;