This is an automated email from the ASF dual-hosted git repository.
shamrick 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 d97eb277ad TP: adds a hyperlink to the DSR page to the DS itself for
ease of navigation (#7870)
d97eb277ad is described below
commit d97eb277ad007786a8706ec99b2296c4107fd06c
Author: Jeremy Mitchell <[email protected]>
AuthorDate: Tue Nov 28 20:21:18 2023 -0700
TP: adds a hyperlink to the DSR page to the DS itself for ease of
navigation (#7870)
* adds a hyperlink to the DSR page to the DS itself for ease of navigation
* adds changelog entry
---
CHANGELOG.md | 1 +
.../modules/form/deliveryService/FormDeliveryServiceController.js | 6 ++++--
.../modules/form/deliveryService/form.deliveryService.DNS.tpl.html | 2 +-
.../modules/form/deliveryService/form.deliveryService.HTTP.tpl.html | 2 +-
.../form/deliveryService/form.deliveryService.Steering.tpl.html | 2 +-
.../form/deliveryService/form.deliveryService.anyMap.tpl.html | 2 +-
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f98b979aff..3044683b48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
## [unreleased]
### Added
- [#7812](https://github.com/apache/trafficcontrol/pull/7812) *Traffic
Portal*: Expose the `configUpdateFailed` and `revalUpdateFailed` fields on the
server table.
+- [#7870](https://github.com/apache/trafficcontrol/pull/7870) *Traffic
Portal*: Adds a hyperlink to the DSR page to the DS itself for ease of
navigation.
### Changed
- [#7614](https://github.com/apache/trafficcontrol/pull/7614) *Traffic Ops*
The database upgrade process no longer overwrites changes users may have made
to the initially seeded data.
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index 97ee2e7d6c..679d29542e 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -40,7 +40,7 @@
* @param {import("../../../api/ServerCapabilityService")}
serverCapabilityService
* @param {import("../../../api/ServiceCategoryService")}
serviceCategoryService
*/
-var FormDeliveryServiceController = function(deliveryService, dsCurrent,
origin, topologies, type, types, $scope, formUtils, tenantUtils,
deliveryServiceUtils, deliveryServiceService, cdnService, profileService,
tenantService, propertiesModel, userModel, serverCapabilityService,
serviceCategoryService) {
+var FormDeliveryServiceController = function(deliveryService, dsCurrent,
origin, topologies, type, types, $scope, formUtils, tenantUtils,
deliveryServiceUtils, locationUtils, deliveryServiceService, cdnService,
profileService, tenantService, propertiesModel, userModel,
serverCapabilityService, serviceCategoryService) {
/**
* This is used to cache TLS version settings when the checkbox is
toggled.
@@ -101,6 +101,8 @@ var FormDeliveryServiceController =
function(deliveryService, dsCurrent, origin,
return ds !== undefined && (ds.geoLimit === 1 || ds.geoLimit
=== 2);
}
+ $scope.navigateToPath = (path, unsavedChanges) =>
locationUtils.navigateToPath(path, unsavedChanges);
+
$scope.loadGeoLimitCountriesRaw = function (ds) {
if($scope.hasGeoLimitCountries(ds)) {
ds.geoLimitCountriesRaw = (ds.geoLimitCountries ??
[]).join(",");
@@ -559,5 +561,5 @@ var FormDeliveryServiceController =
function(deliveryService, dsCurrent, origin,
}
};
-FormDeliveryServiceController.$inject = ["deliveryService", "dsCurrent",
"origin", "topologies", "type", "types", "$scope", "formUtils", "tenantUtils",
"deliveryServiceUtils", "deliveryServiceService", "cdnService",
"profileService", "tenantService", "propertiesModel", "userModel",
"serverCapabilityService", "serviceCategoryService"];
+FormDeliveryServiceController.$inject = ["deliveryService", "dsCurrent",
"origin", "topologies", "type", "types", "$scope", "formUtils", "tenantUtils",
"deliveryServiceUtils", "locationUtils", "deliveryServiceService",
"cdnService", "profileService", "tenantService", "propertiesModel",
"userModel", "serverCapabilityService", "serviceCategoryService"];
module.exports = FormDeliveryServiceController;
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 0aeb7bc9ea..089c535a9e 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -23,7 +23,7 @@ under the License.
<li ng-if="!settings.isRequest"><a
href="/#!/delivery-services">Delivery Services</a></li>
<li ng-if="settings.isRequest"><a
href="/#!/delivery-service-requests">Delivery Service Requests</a></li>
<li ng-if="settings.isRequest"
class="active">{{dsRequest.changeType}}</li>
- <li class="active">{{deliveryServiceName}}</li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?dsType=' +
deliveryService.type)">{{deliveryServiceName}}</a></li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
<div class="btn-group" role="group" uib-dropdown
is-open="status.isopen">
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 56609873d3..581278e68d 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -23,7 +23,7 @@ under the License.
<li ng-if="!settings.isRequest"><a
href="/#!/delivery-services">Delivery Services</a></li>
<li ng-if="settings.isRequest"><a
href="/#!/delivery-service-requests">Delivery Service Requests</a></li>
<li ng-if="settings.isRequest"
class="active">{{dsRequest.changeType}}</li>
- <li class="active">{{deliveryServiceName}}</li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?dsType=' +
deliveryService.type)">{{deliveryServiceName}}</a></li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
<div class="btn-group" role="group" uib-dropdown
is-open="status.isopen">
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 8c98aad1e6..266feed958 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -23,7 +23,7 @@ under the License.
<li ng-if="!settings.isRequest"><a
href="/#!/delivery-services">Delivery Services</a></li>
<li ng-if="settings.isRequest"><a
href="/#!/delivery-service-requests">Delivery Service Requests</a></li>
<li ng-if="settings.isRequest"
class="active">{{dsRequest.changeType}}</li>
- <li class="active">{{deliveryServiceName}}</li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?dsType=' +
deliveryService.type)">{{deliveryServiceName}}</a></li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
<div class="btn-group" role="group" uib-dropdown
is-open="status.isopen">
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index 5bb3b56328..e529e2f533 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -23,7 +23,7 @@ under the License.
<li ng-if="!settings.isRequest"><a
href="/#!/delivery-services">Delivery Services</a></li>
<li ng-if="settings.isRequest"><a
href="/#!/delivery-service-requests">Delivery Service Requests</a></li>
<li ng-if="settings.isRequest"
class="active">{{dsRequest.changeType}}</li>
- <li class="active">{{deliveryServiceName}}</li>
+ <li><a ng-click="navigateToPath('/delivery-services/' +
deliveryService.id + '?dsType=' +
deliveryService.type)">{{deliveryServiceName}}</a></li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
<div class="btn-group" role="group" uib-dropdown
is-open="status.isopen">
