Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

TP: changes query param that dictates ds form template from type to dsType #6910

Merged
ocket8888 merged 1 commit into from
Jun 24, 2022
Merged

TP: changes query param that dictates ds form template from type to dsType #6910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, origin,
];

$scope.clone = function(ds) {
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?type=' + ds.type);
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?dsType=' + ds.type);
};

$scope.changeSigningAlgorithm = function(signingAlgorithm) {
Expand Down
4 changes: 2 additions & 2 deletions ...ortal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog
function(result) {
createDeliveryServiceCreateRequest(dsRequest, options.comment, true);
messageModel.setMessages(result.data.alerts, true);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type);
},
function(fault) {
$anchorScroll(); // scrolls window to top
Expand All @@ -133,7 +133,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog
then(
function(result) {
messageModel.setMessages(result.data.alerts, true);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type);
},
function(fault) {
$anchorScroll(); // scrolls window to top
Expand Down
2 changes: 1 addition & 1 deletion .../form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li class="active">Consistent Hash Regex Test Tool</li>
</ol>
<div class="clearfix"></div>
Expand Down
2 changes: 1 addition & 1 deletion ...ic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '/jobs')">Invalidation Requests</a></li>
<li class="active">{{jobName}}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion ...ortal/app/src/common/modules/form/deliveryServiceRegex/form.deliveryServiceRegex.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '/regexes')">Regexes</a></li>
<li class="active">{{regexPattern}}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion ...l/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li class="active">SSL keys</li>
</ol>
<div class="pull-right" role="group">
Expand Down
2 changes: 1 addition & 1 deletion ...modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '/ssl-keys')">SSL Keys</a></li>
<li class="active">generate</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion ...on/modules/form/deliveryServiceStaticDnsEntry/form.deliveryServiceStaticDnsEntry.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '/static-dns-entries')">Static DNS Entries</a></li>
<li class="active">{{host}}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion ...tal/app/src/common/modules/form/deliveryServiceTarget/form.deliveryServiceTarget.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '/targets')">Targets</a></li>
<li class="active">{{targetName}}</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion traffic_portal/app/src/common/modules/form/origin/FormOriginController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var FormOriginController = function(origin, $scope, $window, $location, formUtil

$scope.editDeliveryService = function(deliveryServiceId) {
ds = _.findWhere($scope.deliveryServices, { id: deliveryServiceId });
$window.open('/#!/delivery-services/' + ds.id + '?type=' + ds.type, '_blank');
$window.open('/#!/delivery-services/' + ds.id + '?dsType=' + ds.type, '_blank');
};

$scope.hasError = formUtils.hasError;
Expand Down
24 changes: 12 additions & 12 deletions ...ortal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
<menu id="context-menu" class="dropdown-menu" ng-style="menuStyle" type="contextmenu" ng-show="showMenu">
<ul>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}?type={{deliveryService.type}}" target="_blank">Open {{ deliveryService.xmlId }} in New Tab</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}?dsType={{deliveryService.type}}" target="_blank">Open {{ deliveryService.xmlId }} in New Tab</a>
</li>
<hr class="divider"/>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}?type={{deliveryService.type}}">Edit</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}?dsType={{deliveryService.type}}">Edit</a>
</li>
<li role="menuitem">
<button type="button" ng-click="clone(deliveryService, $event)">Clone</button>
Expand All @@ -86,35 +86,35 @@
</li>
<hr class="divider"/>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/ssl-keys?type={{deliveryService.type}}">Manage SSL Keys</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/ssl-keys?dsType={{deliveryService.type}}">Manage SSL Keys</a>
</li>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/url-sig-keys?type={{deliveryService.type}}">Manage URL Sig Keys</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/url-sig-keys?dsType={{deliveryService.type}}">Manage URL Sig Keys</a>
</li>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/uri-signing-keys?type={{deliveryService.type}}">Manage URI Signing Keys</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/uri-signing-keys?dsType={{deliveryService.type}}">Manage URI Signing Keys</a>
</li>
<hr class="divider"/>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/jobs?type={{deliveryService.type}}">Manage Invalidation Requests</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/jobs?dsType={{deliveryService.type}}">Manage Invalidation Requests</a>
</li>
<li role="menuitem" ng-if="deliveryService.type.indexOf('STEERING') == -1">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/origins?type={{deliveryService.type}}">Manage Origins</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/origins?dsType={{deliveryService.type}}">Manage Origins</a>
</li>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/regexes?type={{deliveryService.type}}">Manage Regexes</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/regexes?dsType={{deliveryService.type}}">Manage Regexes</a>
</li>
<li role="menuitem" ng-if="deliveryService.type.indexOf('DNS') != -1 || deliveryService.type.indexOf('HTTP') != -1">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/required-server-capabilities?type={{deliveryService.type}}">Manage Required Server Capabilities</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/required-server-capabilities?dsType={{deliveryService.type}}">Manage Required Server Capabilities</a>
</li>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/servers?type={{deliveryService.type}}">Manage Servers</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/servers?dsType={{deliveryService.type}}">Manage Servers</a>
</li>
<li role="menuitem" ng-if="deliveryService.type.indexOf('STEERING') != -1">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/targets?type={{deliveryService.type}}">Manage Targets</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/targets?dsType={{deliveryService.type}}">Manage Targets</a>
</li>
<li role="menuitem">
<a ng-href="#!/delivery-services/{{deliveryService.id}}/static-dns-entries?type={{deliveryService.type}}">Manage Static DNS Entries</a>
<a ng-href="#!/delivery-services/{{deliveryService.id}}/static-dns-entries?dsType={{deliveryService.type}}">Manage Static DNS Entries</a>
</li>
</ul>
</menu>
2 changes: 1 addition & 1 deletion ...mmon/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a name="dsLink" ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a name="dsLink" ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Required Server Capabilities</li>
</ol>
<div class="pull-right">
Expand Down
2 changes: 1 addition & 1 deletion ...al/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var TableDeliveryServiceJobsController = function(deliveryService, jobs, $contro
return $scope.deliveryService.xmlId;
},
getHref: function () {
return "#!/delivery-services/" + $scope.deliveryService.id + "?type=" + encodeURIComponent($scope.deliveryService.type);
return "#!/delivery-services/" + $scope.deliveryService.id + "?dsType=" + encodeURIComponent($scope.deliveryService.type);
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion ...app/src/common/modules/table/deliveryServiceOrigins/table.deliveryServiceOrigins.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Origins</li>
</ol>
<div class="pull-right" role="group">
Expand Down
2 changes: 1 addition & 1 deletion ...app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Regexes</li>
</ol>
<div class="pull-right">
Expand Down
2 changes: 1 addition & 1 deletion ...les/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
var TableDeliveryServicesRequestsController = function (request, $scope, $state, $stateParams, $uibModal, $anchorScroll, dateUtils, locationUtils, deliveryServiceRequestService, messageModel) {

$scope.request = request[0];
$scope.type = $stateParams.type;
$scope.type = $stateParams.dsType;
$scope.defaultParams = {
placeholder: '',
text: null,
Expand Down
4 changes: 2 additions & 2 deletions ...rc/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ var TableDeliveryServicesRequestsController = function (tableName, dsRequests, $
if(selection === "" || selection === $scope.mouseDownSelectionText) {
const typeId = (params.data.requested) ? params.data.requested.typeId : params.data.original.typeId;

let path = '/delivery-service-requests/' + params.data.id + '?type=';
let path = '/delivery-service-requests/' + params.data.id + '?dsType=';
typeService.getType(typeId)
.then(function (result) {
path += result.name;
Expand Down Expand Up @@ -542,7 +542,7 @@ var TableDeliveryServicesRequestsController = function (tableName, dsRequests, $

const typeId = (request.requested) ? request.requested.typeId : request.original.typeId;

let path = '/delivery-service-requests/' + request.id + '?type=';
let path = '/delivery-service-requests/' + request.id + '?dsType=';
typeService.getType(typeId)
.then(function (result) {
path += result.name;
Expand Down
2 changes: 1 addition & 1 deletion .../src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, f
},
{
getHref: function() {
return "#!/delivery-services/" + $scope.deliveryService.id + "?type=" + encodeURIComponent($scope.deliveryService.type);
return "#!/delivery-services/" + $scope.deliveryService.id + "?dsType=" + encodeURIComponent($scope.deliveryService.type);
},
getText: function() {
return $scope.deliveryService.xmlId;
Expand Down
2 changes: 1 addition & 1 deletion ...ules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a name="dsLink" ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a name="dsLink" ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Static DNS Entries</li>
</ol>
<div class="pull-right">
Expand Down
2 changes: 1 addition & 1 deletion ...app/src/common/modules/table/deliveryServiceTargets/table.deliveryServiceTargets.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Targets</li>
</ol>
<div class="pull-right">
Expand Down
2 changes: 1 addition & 1 deletion ...tal/app/src/common/modules/table/deliveryServiceUsers/table.deliveryServiceUsers.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/delivery-services')">Delivery Services</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?type=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li><a ng-click="navigateToPath('/delivery-services/' + deliveryService.id + '?dsType=' + deliveryService.type)">{{::deliveryService.xmlId}}</a></li>
<li class="active">Users</li>
</ol>
<div class="pull-right">
Expand Down
8 changes: 4 additions & 4 deletions ...c_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt
let showCustomCharts = propertiesModel.properties.deliveryServices.charts.customLink.show;

var createDeliveryService = function(typeName) {
var path = '/delivery-services/new?type=' + typeName;
var path = '/delivery-services/new?dsType=' + typeName;
locationUtils.navigateToPath(path);
};

Expand Down Expand Up @@ -425,7 +425,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt
}
});
modalInstance.result.then(function(type) {
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?type=' + type.name);
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?dsType=' + type.name);
});
};

Expand Down Expand Up @@ -592,7 +592,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt
if (showCustomCharts) {
deliveryServiceUtils.openCharts(ds);
} else {
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/charts?type=' + ds.type);
locationUtils.navigateToPath('/delivery-services/' + ds.id + '/charts?dsType=' + ds.type);
}
};

Expand Down Expand Up @@ -725,7 +725,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt
onRowClicked: function(params) {
const selection = window.getSelection().toString();
if(selection === "" || selection === $scope.mouseDownSelectionText) {
locationUtils.navigateToPath('/delivery-services/' + params.data.id + '?type=' + params.data.type);
locationUtils.navigateToPath('/delivery-services/' + params.data.id + '?dsType=' + params.data.type);
// Event is outside the digest cycle, so we need to trigger one.
$scope.$apply();
}
Expand Down
Loading