[trafficcontrol] branch master updated: Add the ability to view linked Delivery Service Requests for a Delivery Service in TP (#6888)

[ocket8888]

This is an automated email from the ASF dual-hosted git repository.

ocket8888 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 d8be50eacf Add the ability to view linked Delivery Service Requests 
for a Delivery Service in TP (#6888)
d8be50eacf is described below

commit d8be50eacfb07b225176daa1da5f67d9e6f1ea40
Author: Srijeet Chatterjee <30329068+srijeet0...@users.noreply.github.com>
AuthorDate: Thu Jun 9 09:51:30 2022 -0600

    Add the ability to view linked Delivery Service Requests for a Delivery 
Service in TP (#6888)
    
    * Add the ability to view linked Delivery Service Requests for a Delivery 
Service in TP
    
    * fix changelog
---
 CHANGELOG.md                                                        | 1 +
 .../modules/form/deliveryService/form.deliveryService.DNS.tpl.html  | 1 +
 .../modules/form/deliveryService/form.deliveryService.HTTP.tpl.html | 1 +
 .../form/deliveryService/form.deliveryService.Steering.tpl.html     | 1 +
 .../form/deliveryService/form.deliveryService.anyMap.tpl.html       | 1 +
 .../app/src/modules/private/deliveryServiceRequests/list/index.js   | 6 +++---
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6251ab280e..2e0f3c833d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a 
Changelog](http://keepachangelog.com/en/1.0.0/).
 - Replaces all Traffic Portal Tenant select boxes with a novel tree select box 
[#6427](https://github.com/apache/trafficcontrol/issues/6427).
 - Traffic Monitor: Add support for `access.log` to TM.
 - Added functionality for login to provide a Bearer token and for that token 
to be later used for authorization.
+- [Traffic Portal] Added the ability for users to view Delivery Service 
Requests corresponding to individual Delivery Services in TP.
 - [Traffic Ops] Added support for backend configurations so that Traffic Ops 
can act as a reverse proxy for these services 
[#6754](https://github.com/apache/trafficcontrol/pull/6754).
 - Added functionality for CDN locks, so that they can be shared amongst a list 
of specified usernames.
 - [Traffic Ops | Traffic Go Clients | T3C] Add additional timestamp fields to 
server for queuing and dequeueing config and revalidate updates.
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 80708c4f07..1f4bacad5c 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
@@ -42,6 +42,7 @@ under the License.
             <button type="button" class="btn btn-danger" 
ng-if="!settings.isNew && !settings.isRequest" ng-disabled="!deletable()" 
ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
             <button class="btn btn-success" ng-if="!settings.isRequest" 
ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || 
!saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
             <button type="button" class="btn btn-primary" 
ng-if="!settings.isRequest && !settings.isNew" title="Delivery Service Charts" 
ng-if="showChartsButton" ng-click="openCharts(deliveryService)"><i class="fa 
fa-bar-chart fa-fw"></i></button>
+            <a class="btn btn-primary" ng-if="!settings.isRequest" 
ng-href="/#!/delivery-service-requests?xmlId={{deliveryService.xmlId}}">View 
Linked Delivery Service Requests</a>
             <div class="btn-group" ng-if="!settings.isRequest && 
!settings.isNew" role="group" uib-dropdown is-open="more.isopen">
                 <button name="moreBtn" type="button" class="btn btn-default 
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                     More&nbsp;
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 6c50f6481f..5888df3660 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
@@ -42,6 +42,7 @@ under the License.
             <button type="button" class="btn btn-danger" 
ng-if="!settings.isNew && !settings.isRequest" ng-disabled="!deletable()" 
ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
             <button class="btn btn-success" ng-if="!settings.isRequest" 
ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || 
!saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
             <button type="button" class="btn btn-primary" 
ng-if="!settings.isRequest && !settings.isNew" title="Delivery Service Charts" 
ng-if="showChartsButton" ng-click="openCharts(deliveryService)"><i class="fa 
fa-bar-chart fa-fw"></i></button>
+            <a class="btn btn-primary" ng-if="!settings.isRequest" 
ng-href="/#!/delivery-service-requests?xmlId={{deliveryService.xmlId}}">View 
Linked Delivery Service Requests</a>
             <div class="btn-group" ng-if="!settings.isRequest && 
!settings.isNew" role="group" uib-dropdown is-open="more.isopen">
                 <button name="moreBtn" type="button" class="btn btn-default 
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                     More&nbsp;
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 1952fadf59..e68ff6beb2 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
@@ -42,6 +42,7 @@ under the License.
             <button type="button" class="btn btn-danger" 
ng-if="!settings.isNew && !settings.isRequest" ng-disabled="!deletable()" 
ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
             <button class="btn btn-success" ng-if="!settings.isRequest" 
ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || 
!saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
             <button type="button" class="btn btn-primary" 
ng-if="!settings.isRequest && !settings.isNew" title="Delivery Service Charts" 
ng-if="showChartsButton" ng-click="openCharts(deliveryService)"><i class="fa 
fa-bar-chart fa-fw"></i></button>
+            <a class="btn btn-primary" ng-if="!settings.isRequest" 
ng-href="/#!/delivery-service-requests?xmlId={{deliveryService.xmlId}}">View 
Linked Delivery Service Requests</a>
             <div class="btn-group" ng-if="!settings.isRequest && 
!settings.isNew" role="group" uib-dropdown is-open="more.isopen">
                 <button name="moreBtn" type="button" class="btn btn-default 
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                     More&nbsp;
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 1be6c16890..9f85a27476 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
@@ -42,6 +42,7 @@ under the License.
             <button type="button" class="btn btn-danger" 
ng-if="!settings.isNew && !settings.isRequest" ng-disabled="!deletable()" 
ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
             <button class="btn btn-success" ng-if="!settings.isRequest" 
ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || 
!saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
             <button type="button" class="btn btn-primary" 
ng-if="!settings.isRequest && !settings.isNew" title="Delivery Service Charts" 
ng-if="showChartsButton" ng-click="openCharts(deliveryService)"><i class="fa 
fa-bar-chart fa-fw"></i></button>
+            <a class="btn btn-primary" ng-if="!settings.isRequest" 
ng-href="/#!/delivery-service-requests?xmlId={{deliveryService.xmlId}}">View 
Linked Delivery Service Requests</a>
             <div class="btn-group" ng-if="!settings.isRequest && 
!settings.isNew" role="group" uib-dropdown is-open="more.isopen">
                 <button name="moreBtn" type="button" class="btn btn-default 
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
                     More&nbsp;
diff --git 
a/traffic_portal/app/src/modules/private/deliveryServiceRequests/list/index.js 
b/traffic_portal/app/src/modules/private/deliveryServiceRequests/list/index.js
index 1dc1004465..d558a23437 100644
--- 
a/traffic_portal/app/src/modules/private/deliveryServiceRequests/list/index.js
+++ 
b/traffic_portal/app/src/modules/private/deliveryServiceRequests/list/index.js
@@ -21,7 +21,7 @@ module.exports = 
angular.module('trafficPortal.private.deliveryServiceRequests.l
        .config(function($stateProvider, $urlRouterProvider) {
                $stateProvider
                        
.state('trafficPortal.private.deliveryServiceRequests.list', {
-                               url: '',
+                               url: '?xmlId',
                                views: {
                                        deliveryServiceRequestsContent: {
                                                templateUrl: 
'common/modules/table/deliveryServiceRequests/table.deliveryServiceRequests.tpl.html',
@@ -30,8 +30,8 @@ module.exports = 
angular.module('trafficPortal.private.deliveryServiceRequests.l
                                                        tableName: function() {
                                                                return 
'ds-requests';
                                                        },
-                                                       dsRequests: 
function(deliveryServiceRequestService) {
-                                                               return 
deliveryServiceRequestService.getDeliveryServiceRequests({ orderby: 
'createdAt', sortOrder: 'desc' });
+                                                       dsRequests: 
function($stateParams, deliveryServiceRequestService) {
+                                                               return 
deliveryServiceRequestService.getDeliveryServiceRequests({ xmlId: 
$stateParams.xmlId, orderby: 'createdAt', sortOrder: 'desc' });
                                                        }
                                                }
                                        }