Skip to content

Commit

Permalink
Filter the list of potential Steering Targets in Traffic Portal
Browse files Browse the repository at this point in the history
The old Perl UI lists HTTP-type DSes belonging to the same CDN as the
Steering DS that aren't already targets, and this makes Traffic Portal
do the same thing.
  • Loading branch information
Rawlin Peters authored and mitchell852 committed Jun 20, 2018
1 parent cba0d7f commit e99a0ff
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
* under the License.
*/

var FormDeliveryServiceTargetController = function(deliveryService, target, $scope, formUtils, locationUtils, deliveryServiceService, typeService) {
var FormDeliveryServiceTargetController = function(deliveryService, currentTargets, target, $scope, formUtils, locationUtils, deliveryServiceService, typeService) {

var getDeliveryServices = function() {
deliveryServiceService.getDeliveryServices()
deliveryServiceService.getDeliveryServices({ cdn: deliveryService.cdnId })
.then(function(result) {
$scope.deliveryServices = result;
$scope.deliveryServices = _.filter(result, function(ds) {
return ds.type.startsWith('HTTP') && _.findWhere(currentTargets, {targetId: ds.id}) == undefined;
});
});
};

Expand Down Expand Up @@ -53,5 +55,5 @@ var FormDeliveryServiceTargetController = function(deliveryService, target, $sco

};

FormDeliveryServiceTargetController.$inject = ['deliveryService', 'target', '$scope', 'formUtils', 'locationUtils', 'deliveryServiceService', 'typeService'];
FormDeliveryServiceTargetController.$inject = ['deliveryService', 'currentTargets', 'target', '$scope', 'formUtils', 'locationUtils', 'deliveryServiceService', 'typeService'];
module.exports = FormDeliveryServiceTargetController;
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* under the License.
*/

var FormEditDeliveryServiceTargetController = function(deliveryService, target, $scope, $controller, $uibModal, $anchorScroll, locationUtils, deliveryServiceService) {
var FormEditDeliveryServiceTargetController = function(deliveryService, currentTargets, target, $scope, $controller, $uibModal, $anchorScroll, locationUtils, deliveryServiceService) {

// extends the FormDeliveryServiceTargetController to inherit common methods
angular.extend(this, $controller('FormDeliveryServiceTargetController', { deliveryService: deliveryService, target: target, $scope: $scope }));
angular.extend(this, $controller('FormDeliveryServiceTargetController', { deliveryService: deliveryService, currentTargets: currentTargets, target: target, $scope: $scope }));

var deleteTarget = function(target) {
deliveryServiceService.deleteDeliveryServiceTarget(target.deliveryServiceId, target.targetId)
Expand Down Expand Up @@ -65,5 +65,5 @@ var FormEditDeliveryServiceTargetController = function(deliveryService, target,

};

FormEditDeliveryServiceTargetController.$inject = ['deliveryService', 'target', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'deliveryServiceService'];
FormEditDeliveryServiceTargetController.$inject = ['deliveryService', 'currentTargets', 'target', '$scope', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'deliveryServiceService'];
module.exports = FormEditDeliveryServiceTargetController;
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* under the License.
*/

var FormNewDeliveryServiceTargetController = function(deliveryService, target, $scope, $controller, deliveryServiceService) {
var FormNewDeliveryServiceTargetController = function(deliveryService, currentTargets, target, $scope, $controller, deliveryServiceService) {

// extends the FormDeliveryServiceTargetController to inherit common methods
angular.extend(this, $controller('FormDeliveryServiceTargetController', { deliveryService: deliveryService, target: target, $scope: $scope }));
angular.extend(this, $controller('FormDeliveryServiceTargetController', { deliveryService: deliveryService, currentTargets: currentTargets, target: target, $scope: $scope }));

$scope.targetName = 'New';

Expand All @@ -35,5 +35,5 @@ var FormNewDeliveryServiceTargetController = function(deliveryService, target, $

};

FormNewDeliveryServiceTargetController.$inject = ['deliveryService', 'target', '$scope', '$controller', 'deliveryServiceService'];
FormNewDeliveryServiceTargetController.$inject = ['deliveryService', 'currentTargets', 'target', '$scope', '$controller', 'deliveryServiceService'];
module.exports = FormNewDeliveryServiceTargetController;
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.targets.
deliveryService: function($stateParams, deliveryServiceService) {
return deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
},
currentTargets: function() {
return [];
},
target: function($stateParams, deliveryServiceService) {
return deliveryServiceService.getDeliveryServiceTarget($stateParams.deliveryServiceId, $stateParams.targetId);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.targets.
deliveryService: function($stateParams, deliveryServiceService) {
return deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
},
currentTargets: function($stateParams, deliveryServiceService) {
return deliveryServiceService.getDeliveryServiceTargets($stateParams.deliveryServiceId);
},
target: function(deliveryService) {
return {
deliveryServiceId: deliveryService.id
Expand Down

0 comments on commit e99a0ff

Please sign in to comment.