You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2022/06/01 14:47:02 UTC
[trafficcontrol] branch master updated: Remove hardcoded success message from Traffic Portal when creating/updating and deleting a delivery service (#6860)
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 37a5be337d Remove hardcoded success message from Traffic Portal when creating/updating and deleting a delivery service (#6860)
37a5be337d is described below
commit 37a5be337d97c11be66574cd06a4339bf63e0f53
Author: Rima Shah <22...@users.noreply.github.com>
AuthorDate: Wed Jun 1 08:46:56 2022 -0600
Remove hardcoded success message from Traffic Portal when creating/updating and deleting a delivery service (#6860)
* Removed hardcoded success message when creating/updating and deleting a DS. Also update associated integration tests that check validationMessage.
* Update DS.po.ts file.
---
.../edit/FormEditDeliveryServiceController.js | 15 +++++-------
.../new/FormNewDeliveryServiceController.js | 4 ++--
.../integration/Data/deliveryservicerequest.ts | 4 ++--
.../test/integration/Data/deliveryservices.ts | 28 +++++++++++-----------
.../PageObjects/DeliveryServicePage.po.ts | 6 -----
5 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index 49d83c2bbe..ce9c7be8fa 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -242,9 +242,9 @@ var FormEditDeliveryServiceController = function(deliveryService, origin, topolo
function() {
deliveryServiceService.updateDeliveryService(deliveryService).
then(
- function() {
+ function(response) {
$state.reload(); // reloads all the resolves for the view
- messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + deliveryService.xmlId + ' ] updated' } ], false);
+ messageModel.setMessages(response.data.alerts, false);
}
).catch(function(fault) {
// if the ds update fails, send to dsr view w/ error message
@@ -265,9 +265,9 @@ var FormEditDeliveryServiceController = function(deliveryService, origin, topolo
} else {
deliveryServiceService.updateDeliveryService(deliveryService).
then(
- function() {
+ function(response) {
$state.reload(); // reloads all the resolves for the view
- messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + deliveryService.xmlId + ' ] updated' } ], false);
+ messageModel.setMessages(response.data.alerts, false);
},
function(fault) {
$anchorScroll(); // scrolls window to top
@@ -298,11 +298,8 @@ var FormEditDeliveryServiceController = function(deliveryService, origin, topolo
} else {
deliveryServiceService.deleteDeliveryService(deliveryService)
.then(
- function() {
- messageModel.setMessages([
- { level: 'success', text: 'Delivery service [ ' + deliveryService.xmlId + ' ] deleted.' },
- { level: 'info', text: 'Perform a CDN snapshot then queue updates on all servers in the cdn for the changes to take effect.' }
- ], true);
+ function(response) {
+ messageModel.setMessages(response.data.alerts, true);
locationUtils.navigateToPath('/delivery-services');
},
function(fault) {
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index 1f9e808f90..8199aa2169 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -112,7 +112,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog
then(
function(result) {
createDeliveryServiceCreateRequest(dsRequest, options.comment, true);
- messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + deliveryService.xmlId + ' ] created' } ], true);
+ messageModel.setMessages(result.data.alerts, true);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type);
},
function(fault) {
@@ -132,7 +132,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog
deliveryServiceService.createDeliveryService(deliveryService).
then(
function(result) {
- messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + deliveryService.xmlId + ' ] created' } ], true);
+ messageModel.setMessages(result.data.alerts, true);
locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type);
},
function(fault) {
diff --git a/traffic_portal/test/integration/Data/deliveryservicerequest.ts b/traffic_portal/test/integration/Data/deliveryservicerequest.ts
index 81f997f469..ce74c531cb 100644
--- a/traffic_portal/test/integration/Data/deliveryservicerequest.ts
+++ b/traffic_portal/test/integration/Data/deliveryservicerequest.ts
@@ -37,7 +37,7 @@ export const deliveryservicerequest = {
CDN: "dummycdn",
RawText: "test",
validationMessage: "Created request to create the cdntesting delivery service",
- FullfillMessage: "Delivery Service [ cdntesting ] created",
+ FullfillMessage: "Delivery Service creation was successful",
CompleteMessage: "Delivery service request status was updated"
}
],
@@ -67,7 +67,7 @@ export const deliveryservicerequest = {
RawText: "test",
validationMessage: "Created request to create the cdntesting3 delivery service",
UpdateMessage: "Updated delivery service request for cdntesting3 and set status to submitted",
- FullfillMessage: "Delivery Service [ cdntesting3 ] created",
+ FullfillMessage: "Delivery Service creation was successful",
CompleteMessage: "Delivery service request status was updated"
}
]
diff --git a/traffic_portal/test/integration/Data/deliveryservices.ts b/traffic_portal/test/integration/Data/deliveryservices.ts
index 4f20f4b38c..cc90d8d177 100644
--- a/traffic_portal/test/integration/Data/deliveryservices.ts
+++ b/traffic_portal/test/integration/Data/deliveryservices.ts
@@ -312,21 +312,21 @@ export const deliveryservices = {
Name: "tpdservice1",
Tenant: "tenantSame",
Type: "ANY_MAP",
- validationMessage: "Delivery Service [ tpdservice1 ] created"
+ validationMessage: "Delivery Service creation was successful"
},
{
description: "create DNS delivery service",
Name: "tpdservice2",
Tenant: "tenantSame",
Type: "DNS",
- validationMessage: "Delivery Service [ tpdservice2 ] created"
+ validationMessage: "Delivery Service creation was successful"
},
{
description: "create STEERING delivery service",
Name: "tpdservice3",
Tenant: "tenantSame",
Type: "STEERING",
- validationMessage: "Delivery Service [ tpdservice3 ] created"
+ validationMessage: "Delivery Service creation was successful"
}
],
update: [
@@ -334,7 +334,7 @@ export const deliveryservices = {
description: "update delivery service display name",
Name: "tpdservice1",
NewName: "TPServiceNew1",
- validationMessage: "Delivery Service [ tpdservice1 ] updated"
+ validationMessage: "Delivery Service update was successful"
}
],
assignserver: [
@@ -357,17 +357,17 @@ export const deliveryservices = {
{
description: "delete a delivery service",
Name: "tpdservice1",
- validationMessage: "Delivery service [ tpdservice1 ] deleted."
+ validationMessage: "ds was deleted."
},
{
description: "delete a delivery service",
Name: "tpdservice2",
- validationMessage: "Delivery service [ tpdservice2 ] deleted."
+ validationMessage: "ds was deleted."
},
{
description: "delete a delivery service",
Name: "tpdservice3",
- validationMessage: "Delivery service [ tpdservice3 ] deleted."
+ validationMessage: "ds was deleted."
}
]
},
@@ -434,21 +434,21 @@ export const deliveryservices = {
Name: "optpdservice1",
Tenant: "tenantSame",
Type: "ANY_MAP",
- validationMessage: "Delivery Service [ optpdservice1 ] created"
+ validationMessage: "Delivery Service creation was successful"
},
{
description: "create DNS delivery service",
Name: "optpdservice2",
Tenant: "tenantSame",
Type: "DNS",
- validationMessage: "Delivery Service [ optpdservice2 ] created"
+ validationMessage: "Delivery Service creation was successful"
},
{
description: "create STEERING delivery service",
Name: "optpdservice3",
Tenant: "tenantSame",
Type: "STEERING",
- validationMessage: "Delivery Service [ optpdservice3 ] created"
+ validationMessage: "Delivery Service creation was successful"
}
],
update: [
@@ -456,7 +456,7 @@ export const deliveryservices = {
description: "update delivery service display name",
Name: "optpdservice1",
NewName: "opTPServiceNew1",
- validationMessage: "Delivery Service [ optpdservice1 ] updated"
+ validationMessage: "Delivery Service update was successful"
}
],
assignserver: [
@@ -479,17 +479,17 @@ export const deliveryservices = {
{
description: "delete a delivery service",
Name: "optpdservice1",
- validationMessage: "Delivery service [ optpdservice1 ] deleted."
+ validationMessage: "ds was deleted."
},
{
description: "delete a delivery service",
Name: "optpdservice2",
- validationMessage: "Delivery service [ optpdservice2 ] deleted."
+ validationMessage: "ds was deleted."
},
{
description: "delete a delivery service",
Name: "optpdservice3",
- validationMessage: "Delivery service [ optpdservice3 ] deleted."
+ validationMessage: "ds was deleted."
}
]
}
diff --git a/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts b/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
index ac98c1526f..8176ad8f7f 100644
--- a/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
+++ b/traffic_portal/test/integration/PageObjects/DeliveryServicePage.po.ts
@@ -87,9 +87,6 @@ export class DeliveryServicePage extends BasePage {
let result = false;
let type: string = deliveryservice.Type;
const basePage = new BasePage();
- if (deliveryservice.validationMessage.includes("created")) {
- deliveryservice.validationMessage = deliveryservice.validationMessage.replace(deliveryservice.Name, deliveryservice.Name + this.randomize)
- }
await this.btnMore.click();
await this.btnCreateNewDeliveryServices.click();
await this.mnuFormDropDown.sendKeys(type);
@@ -164,9 +161,6 @@ export class DeliveryServicePage extends BasePage {
public async UpdateDeliveryService(deliveryservice: UpdateDeliveryService): Promise<boolean | undefined> {
let result: boolean | undefined = false;
const basePage = new BasePage();
- if (deliveryservice.validationMessage.includes("updated")) {
- deliveryservice.validationMessage = deliveryservice.validationMessage.replace(deliveryservice.Name, deliveryservice.Name + this.randomize)
- }
switch (deliveryservice.description) {
case "update delivery service display name":
await this.txtDisplayName.clear();