This is an automated email from the ASF dual-hosted git repository.
rawlin 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 99bdf78 Removes invalid 'ALL cdn' options from TP (#6437)
99bdf78 is described below
commit 99bdf78bab435b74be514b38e710998e2ad9eb6d
Author: Jeremy Mitchell <[email protected]>
AuthorDate: Mon Dec 20 09:16:07 2021 -0700
Removes invalid 'ALL cdn' options from TP (#6437)
* removes the ALL cdn from the list of snappable and queueable cdns
* removes invalid UI options from the ALL cdn
* changelog.md entry
---
CHANGELOG.md | 1 +
.../app/src/common/modules/form/cdn/form.cdn.tpl.html | 12 ++++++------
.../app/src/common/modules/header/HeaderController.js | 8 ++++++--
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c88d991..d147dce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Traffic Vault: Added additional flag to TV Riak (Deprecated) Util
### Fixed
+- [#6411](https://github.com/apache/trafficcontrol/pull/6411) Removes invalid
'ALL cdn' options from TP
- [#6197](https://github.com/apache/trafficcontrol/issues/6197) - TO
`/deliveryservices/:id/routing` makes requests to all TRs instead of by CDN.
- Fixed Traffic Router crs/stats to prevent overflow and to correctly record
the time used in averages.
- [#6209](https://github.com/apache/trafficcontrol/pull/6209) Updated Traffic
Router to use Java 11 to compile and run
diff --git a/traffic_portal/app/src/common/modules/form/cdn/form.cdn.tpl.html
b/traffic_portal/app/src/common/modules/form/cdn/form.cdn.tpl.html
index 534f591..14c0853 100644
--- a/traffic_portal/app/src/common/modules/form/cdn/form.cdn.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/cdn/form.cdn.tpl.html
@@ -24,8 +24,8 @@ under the License.
<li class="active">{{cdnName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
- <button name="diffCDNbtn" class="btn btn-primary" title="Diff CDN
Snapshot" ng-click="viewConfig()"><i class="fa fa-camera"></i> Diff
CDN Config Snapshot</button>
- <div class="btn-group" role="group" uib-dropdown
is-open="queue.isopen">
+ <button ng-show="cdn.name != 'ALL'" name="diffCDNbtn" class="btn
btn-primary" title="Diff CDN Snapshot" ng-click="viewConfig()"><i class="fa
fa-camera"></i> Diff CDN Config Snapshot</button>
+ <div ng-show="cdn.name != 'ALL'" class="btn-group" role="group"
uib-dropdown is-open="queue.isopen">
<button type="button" class="btn btn-primary dropdown-toggle"
uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
Queue Updates
<span class="caret"></span>
@@ -41,10 +41,10 @@ under the License.
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li role="menuitem"><a ng-click="manageDNSSEC()">Manage
DNSSEC Keys</a></li>
- <li role="menuitem"><a
ng-click="manageFederations()">Manage Federations</a></li>
- <li class="divider"></li>
- <li role="menuitem"><a
ng-click="viewDeliveryServices()">View Delivery Services</a></li>
+ <li ng-show="cdn.name != 'ALL'" role="menuitem"><a
ng-click="manageDNSSEC()">Manage DNSSEC Keys</a></li>
+ <li ng-show="cdn.name != 'ALL'" role="menuitem"><a
ng-click="manageFederations()">Manage Federations</a></li>
+ <li ng-show="cdn.name != 'ALL'" class="divider"></li>
+ <li ng-show="cdn.name != 'ALL'" role="menuitem"><a
ng-click="viewDeliveryServices()">View Delivery Services</a></li>
<li role="menuitem"><a ng-click="viewProfiles()">View
Profiles</a></li>
<li role="menuitem"><a ng-click="viewServers()">View
Servers</a></li>
<li class="divider"></li>
diff --git a/traffic_portal/app/src/common/modules/header/HeaderController.js
b/traffic_portal/app/src/common/modules/header/HeaderController.js
index 98f003f..2168553 100644
--- a/traffic_portal/app/src/common/modules/header/HeaderController.js
+++ b/traffic_portal/app/src/common/modules/header/HeaderController.js
@@ -113,7 +113,9 @@ var HeaderController = function($rootScope, $scope, $state,
$uibModal, $location
return params;
},
collection: function() {
- return $scope.cdns;
+ return $scope.cdns.filter(function(cdn) {
+ return cdn.name != 'ALL';
+ });
}
}
});
@@ -161,7 +163,9 @@ var HeaderController = function($rootScope, $scope, $state,
$uibModal, $location
return params;
},
collection: function() {
- return $scope.cdns;
+ return $scope.cdns.filter(function(cdn) {
+ return cdn.name != 'ALL';
+ });
}
}
});
