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/11/22 22:42:27 UTC
[trafficcontrol] branch master updated: Removed restangular from
DeliveryServiceUrlSigKeysService (#3616)
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 08c2cd3 Removed restangular from DeliveryServiceUrlSigKeysService (#3616)
08c2cd3 is described below
commit 08c2cd336b31115bcf3d6c37d4dfa03f89b9a017
Author: ocket8888 <oc...@gmail.com>
AuthorDate: Fri Nov 22 15:42:21 2019 -0700
Removed restangular from DeliveryServiceUrlSigKeysService (#3616)
* Removed restangular from ./DeliveryServiceUrlSigKeysService.js
* Fixed some service methods not throwing in error handlers
---
.../common/api/DeliveryServiceUrlSigKeysService.js | 43 +++++++++-------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js b/traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js
index 5ef9b29..d700ec0 100644
--- a/traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js
+++ b/traffic_portal/app/src/common/api/DeliveryServiceUrlSigKeysService.js
@@ -17,55 +17,46 @@
* under the License.
*/
-var DeliveryServiceUrlSigKeysService = function(locationUtils, messageModel, $http, $q, ENV) {
+var DeliveryServiceUrlSigKeysService = function(locationUtils, messageModel, $http, ENV) {
this.generateUrlSigKeys = function(dsXmlId) {
- var request = $q.defer();
- $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/generate')
- .then(
+ return $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/generate').then(
function(result) {
messageModel.setMessages(result.data.alerts, false);
- request.resolve();
+ return result;
},
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- request.reject();
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
}
);
- return request.promise;
};
this.copyUrlSigKeys = function(dsXmlId, copyFromXmlId) {
- var request = $q.defer();
- $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/copyFromXmlId/' + copyFromXmlId)
- .then(
+ return $http.post(ENV.api['root'] + 'deliveryservices/xmlId/' + dsXmlId + '/urlkeys/copyFromXmlId/' + copyFromXmlId).then(
function(result) {
messageModel.setMessages(result.data.alerts, false);
- request.resolve();
+ return result;
},
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- request.reject();
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
}
);
- return request.promise;
};
this.getDeliveryServiceUrlSigKeys = function(dsId) {
- var request = $q.defer();
- $http.get(ENV.api['root'] + "deliveryservices/" + dsId + "/urlkeys")
- .then(
+ return $http.get(ENV.api['root'] + "deliveryservices/" + dsId + "/urlkeys").then(
function(result) {
- request.resolve(result.data.response);
+ return result.data.response;
},
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- request.reject();
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
}
);
- return request.promise;
};
};
-DeliveryServiceUrlSigKeysService.$inject = ['locationUtils', 'messageModel', '$http', '$q', 'ENV'];
+DeliveryServiceUrlSigKeysService.$inject = ['locationUtils', 'messageModel', '$http', 'ENV'];
module.exports = DeliveryServiceUrlSigKeysService;