You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2019/11/07 22:19:21 UTC
[GitHub] [trafficcontrol] mitchell852 commented on a change in pull request
#3620: Removed restangular from FederationService
mitchell852 commented on a change in pull request #3620: Removed restangular from FederationService
URL: https://github.com/apache/trafficcontrol/pull/3620#discussion_r343904597
##########
File path: traffic_portal/app/src/common/api/FederationService.js
##########
@@ -17,136 +17,178 @@
* under the License.
*/
-var FederationService = function(Restangular, $http, $q, ENV, locationUtils, messageModel, httpService) {
+var FederationService = function($http, $q, ENV, locationUtils, messageModel) {
- var service = this;
+ const service = this;
this.getCDNFederations = function(cdnName) {
- return Restangular.one('cdns', cdnName).getList('federations');
+ return $http.get(ENV.api['root'] + 'cdns/' + cdnName + '/federations').then(
+ function (result) {
+ return result.data.response;
+ },
+ function (err) {
+ throw err;
+ }
+ );
};
this.getCDNFederation = function(cdnName, fedId) {
- return Restangular.one('cdns', cdnName).one('federations', fedId).get();
+ return $http.get(ENV.api['root'] + 'cdns/' + cdnName + '/federations', {params: {id: fedId}}).then(
+ function (result) {
+ return result.data.response[0];
+ },
+ function (err) {
+ throw err;
+ }
+ );
};
this.createFederation = function(cdn, fed) {
- return $http.post(ENV.api['root'] + 'cdns/' + cdn.name + '/federations', fed)
- .then(
- function(result) {
- var newFedId = result.data.response.id,
- alerts = result.data.alerts,
- promises = [];
- // after creating the federation, assign the selected user and ds to the federation
- promises.push(service.assignFederationUsers(newFedId, [ fed.userId ], false));
- promises.push(service.assignFederationDeliveryServices(newFedId, [ fed.dsId ], false));
-
- $q.all(promises)
- .then(
- function() {
- messageModel.setMessages(alerts, true);
- locationUtils.navigateToPath('/cdns/' + cdn.id + '/federations/' + newFedId);
- },
- function(fault) {
- // do nothing
- });
-
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- }
- );
+ return $http.post(ENV.api['root'] + 'cdns/' + cdn.name + '/federations', fed).then(
+ function(result) {
+ const newFedId = result.data.response.id;
+ const alerts = result.data.alerts;
+ const promises = [];
+
+ // after creating the federation, assign the selected user and ds to the federation
+ promises.push(service.assignFederationUsers(newFedId, [ fed.userId ], false));
+ promises.push(service.assignFederationDeliveryServices(newFedId, [ fed.dsId ], false));
+
+ $q.all(promises).then(
+ function() {
+ messageModel.setMessages(alerts, true);
+ locationUtils.navigateToPath('/cdns/' + cdn.id + '/federations/' + newFedId);
+ },
+ function(err) {
+ console.error(err);
+ }
+ );
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
+ }
+ );
};
- this.updateFederation = function(fed) {
- return fed.put()
- .then(
- function() {
- service.assignFederationDeliveryServices(fed.id, [ fed.dsId ], true)
- .then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'Federation updated' } ], false);
- }
- );
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- }
- );
+ this.updateFederation = function(cdnName, fed) {
+ return $http.put(ENV.api['root'] + 'cdns/' + cdnName + '/federations/' + fed.id, fed).then(
+ function() {
+ service.assignFederationDeliveryServices(fed.id, [ fed.dsId ], true).then(
+ function() {
+ messageModel.setMessages([{level: 'success', text: 'Federation updated'}], false);
+ },
+ function(err) {
+ console.error(err);
+ }
+ );
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
+ }
+ );
};
this.deleteFederation = function(cdnId, fedId) {
- return Restangular.one('cdns', cdnId).one('federations', fedId).remove()
- .then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'Federation deleted' } ], true);
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, true);
- }
- );
+ return $http.delete(ENV.api['root'] + 'cdns/' + cdnId + '/federations/' + fedId).then(
+ function(result) {
+ messageModel.setMessages([{level: 'success', text: 'Federation deleted'}], true);
+ return result;
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, true);
+ throw err;
+ }
+ );
};
this.getFederationUsers = function(fedId) {
- return Restangular.one('federations', fedId).getList('users');
+ return $http.get(ENV.api['root'] + 'federations/' + fedId + '/users').then(
+ function (result) {
+ return result.data.response;
+ },
+ function (err) {
+ throw err;
+ }
+ );
};
this.assignFederationUsers = function(fedId, userIds, replace) {
- return $http.post(ENV.api['root'] + 'federations/' + fedId + '/users', { userIds: userIds, replace: replace })
- .then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'Users linked to federation' } ], false);
- },
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
- }
- );
+ return $http.post(ENV.api['root'] + 'federations/' + fedId + '/users', { userIds: userIds, replace: replace }).then(
+ function(result) {
+ messageModel.setMessages([{level: 'success', text: 'Users linked to federation'}], false);
+ return result;
+ },
+ function(err) {
+ messageModel.setMessages(err.data.alerts, false);
+ throw err;
+ }
+ );
};
this.deleteFederationUser = function(fedId, userId) {
- return httpService.delete(ENV.api['root'] + 'federations/' + fedId + '/users/' + userId)
- .then(
- function() {
+ return $http.delete(ENV.api['root'] + 'federations/' + fedId + '/users/' + userId).then(
+ function(result) {
messageModel.setMessages([ { level: 'success', text: 'Federation and user were unlinked.' } ], false);
+ return result;
},
- function(fault) {
- messageModel.setMessages(fault.data.alerts, true);
+ function(err) {
+ messageModel.setMessages(err.data.alerts, true);
+ throw err;
}
);
};
this.getFederationDeliveryServices = function(fedId) {
- return Restangular.one('federations', fedId).getList('deliveryservices');
+ return $http.get(ENV.api['root'] + 'federations/' + fedId + '/deliveryservices').then(
+ function (result) {
+ return result.data.response;
+ },
+ function (err) {
+ return throw err;
Review comment:
remove the return
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services