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 2697a3fd29 TP fix child DS tables not loading (#7104)
2697a3fd29 is described below
commit 2697a3fd297aa199d1b2e3b76cb1b1820b5cf79a
Author: Steve Hamrick <[email protected]>
AuthorDate: Tue Oct 11 16:09:24 2022 -0600
TP fix child DS tables not loading (#7104)
* Fix broken tables
* Remove log
* Readd sensitive columns
* Wrong table
* Tabs
---
.../TableServerDeliveryServicesController.js | 6 +++---
.../TableServiceCategoryDeliveryServicesController.js | 6 +++---
.../TableTopologyDeliveryServicesController.js | 6 +++---
.../TableTypeDeliveryServicesController.js | 6 +++---
.../src/modules/private/servers/deliveryServices/index.js | 11 +++++++----
.../private/serviceCategories/deliveryServices/index.js | 3 +++
.../modules/private/topologies/deliveryServices/index.js | 15 +++++++++------
.../src/modules/private/types/deliveryServices/index.js | 13 ++++++++-----
8 files changed, 39 insertions(+), 27 deletions(-)
diff --git
a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
index 8f5397c6d6..254e4dda16 100644
---
a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-function TableServerDeliveryServicesController(server, deliveryServices,
filter, $controller, $scope, $uibModal, locationUtils, serverUtils,
deliveryServiceService, serverService) {
+function TableServerDeliveryServicesController(server, deliveryServices,
steeringTargets, filter, $controller, $scope, $uibModal, locationUtils,
serverUtils, deliveryServiceService, serverService) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "serverDS", deliveryServices, filter, $scope }));
+ angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "serverDS", deliveryServices, steeringTargets, filter, $scope }));
server = Array.isArray(server) ? server[0] : server;
@@ -158,5 +158,5 @@ function TableServerDeliveryServicesController(server,
deliveryServices, filter,
};
-TableServerDeliveryServicesController.$inject = ["server", "deliveryServices",
"filter", "$controller", "$scope", "$uibModal", "locationUtils", "serverUtils",
"deliveryServiceService", "serverService"];
+TableServerDeliveryServicesController.$inject = ["server", "deliveryServices",
"steeringTargets", "filter", "$controller", "$scope", "$uibModal",
"locationUtils", "serverUtils", "deliveryServiceService", "serverService"];
module.exports = TableServerDeliveryServicesController;
diff --git
a/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/TableServiceCategoryDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/TableServiceCategoryDeliveryServicesController.js
index 36aff62dc5..329a303435 100644
---
a/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/TableServiceCategoryDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/TableServiceCategoryDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-var TableServiceCategoryDeliveryServicesController = function(serviceCategory,
deliveryServices, filter, $controller, $scope) {
+const TableServiceCategoryDeliveryServicesController =
function(serviceCategory, deliveryServices, steeringTargets, filter,
$controller, $scope) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'scDS', deliveryServices: deliveryServices, filter: filter, $scope:
$scope }));
+ angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'scDS', deliveryServices: deliveryServices, steeringTargets:
steeringTargets, filter: filter, $scope: $scope }));
$scope.serviceCategory = serviceCategory;
$scope.breadCrumbs = [
@@ -38,5 +38,5 @@ var TableServiceCategoryDeliveryServicesController =
function(serviceCategory, d
]
};
-TableServiceCategoryDeliveryServicesController.$inject = ['serviceCategory',
'deliveryServices', 'filter', '$controller', '$scope'];
+TableServiceCategoryDeliveryServicesController.$inject = ['serviceCategory',
'deliveryServices', 'steeringTargets', 'filter', '$controller', '$scope'];
module.exports = TableServiceCategoryDeliveryServicesController;
diff --git
a/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/TableTopologyDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/TableTopologyDeliveryServicesController.js
index 2168ab7ab9..aebfdd8213 100644
---
a/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/TableTopologyDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/TableTopologyDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-function TableTopologyDeliveryServicesController(topologies, deliveryServices,
filter, $controller, $scope) {
+function TableTopologyDeliveryServicesController(topologies, deliveryServices,
steeringTargets, filter, $controller, $scope) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "topDS", deliveryServices, filter, $scope }));
+ angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "topDS", deliveryServices, steeringTargets, filter, $scope }));
const topology = topologies[0];
$scope.breadCrumbs = [
@@ -38,5 +38,5 @@ function TableTopologyDeliveryServicesController(topologies,
deliveryServices, f
];
};
-TableTopologyDeliveryServicesController.$inject = ["topologies",
"deliveryServices", "filter", "$controller", "$scope"];
+TableTopologyDeliveryServicesController.$inject = ["topologies",
"deliveryServices", "steeringTargets", "filter", "$controller", "$scope"];
module.exports = TableTopologyDeliveryServicesController;
diff --git
a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
index 383eff365f..2f3d1bc133 100644
---
a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/TableTypeDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-var TableTypeDeliveryServicesController = function(type, deliveryServices,
filter, $controller, $scope) {
+const TableTypeDeliveryServicesController = function(type, deliveryServices,
steeringTargets, filter, $controller, $scope) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "typeDS", deliveryServices, filter, $scope }));
+ angular.extend(this, $controller("TableDeliveryServicesController", {
tableName: "typeDS", deliveryServices, steeringTargets, filter, $scope }));
$scope.breadCrumbs = [
{
@@ -37,5 +37,5 @@ var TableTypeDeliveryServicesController = function(type,
deliveryServices, filte
]
};
-TableTypeDeliveryServicesController.$inject = ["type", "deliveryServices",
"filter", "$controller", "$scope"];
+TableTypeDeliveryServicesController.$inject = ["type", "deliveryServices",
"steeringTargets", "filter", "$controller", "$scope"];
module.exports = TableTypeDeliveryServicesController;
diff --git
a/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js
index b9268975f0..e4c8d1828e 100644
--- a/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js
+++ b/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js
@@ -18,7 +18,7 @@
*/
module.exports =
angular.module('trafficPortal.private.servers.deliveryServices', [])
- .config(function($stateProvider, $urlRouterProvider) {
+ .config(function ($stateProvider, $urlRouterProvider) {
$stateProvider
.state('trafficPortal.private.servers.deliveryServices', {
url: '/{serverId}/delivery-services',
@@ -27,13 +27,16 @@ module.exports =
angular.module('trafficPortal.private.servers.deliveryServices'
templateUrl:
'common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html',
controller:
'TableServerDeliveryServicesController',
resolve: {
- server:
function($stateParams, serverService) {
+ server: function
($stateParams, serverService) {
return
serverService.getServers({id: $stateParams.serverId});
},
- deliveryServices:
function($stateParams, deliveryServiceService) {
+ deliveryServices:
function ($stateParams, deliveryServiceService) {
return
deliveryServiceService.getServerDeliveryServices($stateParams.serverId);
},
- filter: function() {
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
+ filter: function () {
return null;
}
}
diff --git
a/traffic_portal/app/src/modules/private/serviceCategories/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/serviceCategories/deliveryServices/index.js
index 49733cbc05..263a9fb00f 100644
---
a/traffic_portal/app/src/modules/private/serviceCategories/deliveryServices/index.js
+++
b/traffic_portal/app/src/modules/private/serviceCategories/deliveryServices/index.js
@@ -33,6 +33,9 @@ module.exports =
angular.module('trafficPortal.private.serviceCategories.deliver
deliveryServices:
function(serviceCategory, deliveryServiceService) {
return
deliveryServiceService.getDeliveryServices({ serviceCategory:
serviceCategory.name });
},
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
filter:
function(serviceCategory) {
return {
serviceCategory: {
diff --git
a/traffic_portal/app/src/modules/private/topologies/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/topologies/deliveryServices/index.js
index c3ffbc3564..afcea94394 100644
---
a/traffic_portal/app/src/modules/private/topologies/deliveryServices/index.js
+++
b/traffic_portal/app/src/modules/private/topologies/deliveryServices/index.js
@@ -18,7 +18,7 @@
*/
module.exports =
angular.module('trafficPortal.private.topologies.deliveryServices', [])
- .config(function($stateProvider, $urlRouterProvider) {
+ .config(function ($stateProvider, $urlRouterProvider) {
$stateProvider
.state('trafficPortal.private.topologies.deliveryServices', {
url: '/delivery-services?name',
@@ -27,13 +27,16 @@ module.exports =
angular.module('trafficPortal.private.topologies.deliveryServic
templateUrl:
'common/modules/table/topologyDeliveryServices/table.topologyDeliveryServices.tpl.html',
controller:
'TableTopologyDeliveryServicesController',
resolve: {
- topologies:
function($stateParams, topologyService) {
- return
topologyService.getTopologies({ name: $stateParams.name });
+ topologies: function
($stateParams, topologyService) {
+ return
topologyService.getTopologies({name: $stateParams.name});
},
- deliveryServices:
function(topologies, deliveryServiceService) {
- return
deliveryServiceService.getDeliveryServices({ topology: topologies[0].name });
+ deliveryServices:
function (topologies, deliveryServiceService) {
+ return
deliveryServiceService.getDeliveryServices({topology: topologies[0].name});
},
- filter:
function(topologies) {
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
+ filter: function
(topologies) {
return {
topology: {
filterType: "text",
diff --git
a/traffic_portal/app/src/modules/private/types/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/types/deliveryServices/index.js
index 157194b5dc..2a24c59f90 100644
--- a/traffic_portal/app/src/modules/private/types/deliveryServices/index.js
+++ b/traffic_portal/app/src/modules/private/types/deliveryServices/index.js
@@ -18,7 +18,7 @@
*/
module.exports =
angular.module('trafficPortal.private.types.deliveryServices', [])
- .config(function($stateProvider, $urlRouterProvider) {
+ .config(function ($stateProvider, $urlRouterProvider) {
$stateProvider
.state('trafficPortal.private.types.deliveryServices', {
url: '/{typeId}/delivery-services',
@@ -27,13 +27,16 @@ module.exports =
angular.module('trafficPortal.private.types.deliveryServices',
templateUrl:
'common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html',
controller:
'TableTypeDeliveryServicesController',
resolve: {
- type:
function($stateParams, typeService) {
+ type: function
($stateParams, typeService) {
return
typeService.getType($stateParams.typeId);
},
- deliveryServices:
function($stateParams, deliveryServiceService) {
- return
deliveryServiceService.getDeliveryServices({ type: $stateParams.typeId });
+ deliveryServices:
function ($stateParams, deliveryServiceService) {
+ return
deliveryServiceService.getDeliveryServices({type: $stateParams.typeId});
},
- filter: function(type) {
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
+ filter: function (type)
{
return {
type: {
filterType: "text",
