You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2019/06/07 20:03:37 UTC
[trafficcontrol] branch master updated: Removed restangular from
StaticDnsEntryService (#3631)
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 304e311 Removed restangular from StaticDnsEntryService (#3631)
304e311 is described below
commit 304e3112c72ec8cfd67a79e9729094629541319d
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Fri Jun 7 14:03:32 2019 -0600
Removed restangular from StaticDnsEntryService (#3631)
* Removed restangular from ./StaticDnsEntryService.js
* Fixed some service methods not throwing in error handlers
---
.../app/src/common/api/StaticDnsEntryService.js | 97 +++++++++++-----------
1 file changed, 49 insertions(+), 48 deletions(-)
diff --git a/traffic_portal/app/src/common/api/StaticDnsEntryService.js b/traffic_portal/app/src/common/api/StaticDnsEntryService.js
index afe96f7..64a42e5 100644
--- a/traffic_portal/app/src/common/api/StaticDnsEntryService.js
+++ b/traffic_portal/app/src/common/api/StaticDnsEntryService.js
@@ -17,69 +17,70 @@
* under the License.
*/
-var StaticDnsEntryService = function($http, $q, Restangular, locationUtils, messageModel, ENV) {
+var StaticDnsEntryService = function($http, locationUtils, messageModel, ENV) {
this.getStaticDnsEntries = function(queryParams) {
- return Restangular.all('staticdnsentries').getList(queryParams);
+ return $http.get(ENV.api['root'] + 'staticdnsentries', {params: queryParams}).then(
+ function (result) {
+ return result.data.response;
+ },
+ function (err) {
+ throw err;
+ }
+ )
};
this.getStaticDnsEntry = function(id) {
- return Restangular.one('staticdnsentries?id=' + id).get();
+ return $http.get(ENV.api['root'] + 'staticdnsentries', {params: {id: id}}).then(
+ function (result) {
+ return result.data.response[0];
+ },
+ function (err) {
+ throw err;
+ }
+ )
};
this.createDeliveryServiceStaticDnsEntry = function(staticDnsEntry) {
- var request = $q.defer();
-
- $http.post(ENV.api['root'] + "staticdnsentries", staticDnsEntry)
- .then(
- function(response) {
- messageModel.setMessages(response.data.alerts, true);
- locationUtils.navigateToPath('/delivery-services/' + staticDnsEntry.deliveryServiceId + '/static-dns-entries');
- request.resolve(response);
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false)
- request.reject(fault);
- }
- );
-
- return request.promise;
+ return $http.post(ENV.api['root'] + "staticdnsentries", staticDnsEntry).then(
+ function(response) {
+ messageModel.setMessages(response.data.alerts, true);
+ locationUtils.navigateToPath('/delivery-services/' + staticDnsEntry.deliveryServiceId + '/static-dns-entries');
+ return response;
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false)
+ throw err;
+ }
+ );
};
this.deleteDeliveryServiceStaticDnsEntry = function(id) {
- var deferred = $q.defer();
-
- $http.delete(ENV.api['root'] + "staticdnsentries?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'] + "staticdnsentries", {params: {id: id}}).then(
+ function(response) {
+ messageModel.setMessages(response.data.alerts, true);
+ return response;
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
+ }
+ );
};
this.updateDeliveryServiceStaticDnsEntry = function(id, staticDnsEntry) {
- var request = $q.defer();
-
- $http.put(ENV.api['root'] + "staticdnsentries?id=" + id, staticDnsEntry)
- .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'] + "staticdnsentries", staticDnsEntry, {params: {id: id}}).then(
+ function(response) {
+ messageModel.setMessages(response.data.alerts, false);
+ return response;
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
+ }
+ );
};
};
-StaticDnsEntryService.$inject = ['$http', '$q', 'Restangular', 'locationUtils', 'messageModel', 'ENV'];
+StaticDnsEntryService.$inject = ['$http', 'locationUtils', 'messageModel', 'ENV'];
module.exports = StaticDnsEntryService;