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 2018/06/20 18:35:53 UTC
[GitHub] mitchell852 closed pull request #2435: Filter the list of potential
Steering Targets in Traffic Portal
mitchell852 closed pull request #2435: Filter the list of potential Steering Targets in Traffic Portal
URL: https://github.com/apache/trafficcontrol/pull/2435
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/FormDeliveryServiceTargetController.js b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/FormDeliveryServiceTargetController.js
index a01526ce5..b2ab1ad78 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/FormDeliveryServiceTargetController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/FormDeliveryServiceTargetController.js
@@ -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;
+ });
});
};
@@ -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;
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/edit/FormEditDeliveryServiceTargetController.js b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/edit/FormEditDeliveryServiceTargetController.js
index 77ffa8b6c..4be2219c6 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/edit/FormEditDeliveryServiceTargetController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/edit/FormEditDeliveryServiceTargetController.js
@@ -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)
@@ -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;
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/new/FormNewDeliveryServiceTargetController.js b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/new/FormNewDeliveryServiceTargetController.js
index 581909b5b..b3f2dd088 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/new/FormNewDeliveryServiceTargetController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/new/FormNewDeliveryServiceTargetController.js
@@ -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';
@@ -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;
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/targets/edit/index.js b/traffic_portal/app/src/modules/private/deliveryServices/targets/edit/index.js
index 3f67710de..2bb3b9825 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/targets/edit/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/targets/edit/index.js
@@ -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);
}
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/targets/new/index.js b/traffic_portal/app/src/modules/private/deliveryServices/targets/new/index.js
index 8a957c136..5579f55a3 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/targets/new/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/targets/new/index.js
@@ -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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on 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