[trafficcontrol] branch master updated: Removed restangular from RegionService (#3628)

[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 df69902  Removed restangular from RegionService (#3628)
df69902 is described below

commit df699021eaf03ad64add2bb157a260880881eb22
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Sat Jun 8 14:53:00 2019 -0600

    Removed restangular from RegionService (#3628)
    
    * Removed restangular from ./RegionService.js
    
    * Fixed some service methods not throwing in error handlers
---
 traffic_portal/app/src/common/api/RegionService.js | 71 ++++++++++++++--------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/traffic_portal/app/src/common/api/RegionService.js b/traffic_portal/app/src/common/api/RegionService.js
index fcfca7d..a68ec40 100644
--- a/traffic_portal/app/src/common/api/RegionService.js
+++ b/traffic_portal/app/src/common/api/RegionService.js
@@ -17,53 +17,70 @@
  * under the License.
  */
 
-var RegionService = function(Restangular, messageModel) {
+var RegionService = function($http, ENV, messageModel) {
 
     this.getRegions = function(queryParams) {
-        return Restangular.all('regions').getList(queryParams);
+        return $http.get(ENV.api['root'] + 'regions', {params: queryParams}).then(
+            function (result) {
+                return result.data.response;
+            },
+            function (err) {
+                throw err;
+            }
+        );
     };
 
     this.getRegion = function(id) {
-        return Restangular.one("regions", id).get();
+        return $http.get(ENV.api['root'] + 'regions', {params: {id: id}}).then(
+            function (result) {
+                return result.data.response[0];
+            },
+            function (err) {
+                throw err;
+            }
+        )
     };
 
     this.createRegion = function(region) {
-        return Restangular.service('regions').post(region)
-            .then(
-            function() {
+        return $http.post(ENV.api['root'] + 'regions', region).then(
+            function(result) {
                 messageModel.setMessages([ { level: 'success', text: 'Region created' } ], true);
+                return result;
             },
-            function(fault) {
-                messageModel.setMessages(fault.data.alerts, false);
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
             }
         );
     };
 
     this.updateRegion = function(region) {
-        return region.put()
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Region updated' } ], false);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, false);
-                }
-            );
+        return $http.put(ENV.api['root'] + 'regions/' + region.id, region).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Region updated' } ], false);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, false);
+                throw err;
+            }
+        );
     };
 
     this.deleteRegion = function(id) {
-        return Restangular.one("regions", id).remove()
-            .then(
-                function() {
-                    messageModel.setMessages([ { level: 'success', text: 'Region deleted' } ], true);
-                },
-                function(fault) {
-                    messageModel.setMessages(fault.data.alerts, true);
-                }
-            );
+        return $http.delete(ENV.api['root'] + "regions/" + id).then(
+            function(result) {
+                messageModel.setMessages([ { level: 'success', text: 'Region deleted' } ], true);
+                return result;
+            },
+            function(err) {
+                messageModel.setMessages(err.data.alerts, true);
+                throw err;
+            }
+        );
     };
 
 };
 
-RegionService.$inject = ['Restangular', 'messageModel'];
+RegionService.$inject = ['$http', 'ENV', 'messageModel'];
 module.exports = RegionService;