diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js index f29769b222..aa87c91556 100644 --- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js +++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js @@ -10,6 +10,7 @@ export default function BuildAnchor($log, $filter) { // catch-all case to avoid generating urls if a resource has been deleted // if a resource still exists, it'll be serialized in the activity's summary_fields if (!activity.summary_fields[resource]){ + console.log(activity); throw {name : 'ResourceDeleted', message: 'The referenced resource no longer exists'}; } let name; diff --git a/awx/ui/client/src/activity-stream/factories/build-description.factory.js b/awx/ui/client/src/activity-stream/factories/build-description.factory.js index 967ff8bb5a..20fcb4c7b3 100644 --- a/awx/ui/client/src/activity-stream/factories/build-description.factory.js +++ b/awx/ui/client/src/activity-stream/factories/build-description.factory.js @@ -85,8 +85,12 @@ export default function BuildDescription(BuildAnchor, $log, i18n) { 'from ' + activity.object1 + BuildAnchor(activity.summary_fields.group[0], activity.object1, activity); } else { - activity.description += activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity) + - 'from ' + activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity); + if (activity.object1 === 'workflow_job_template_node' && activity.object2 === 'workflow_job_template_node') { + activity.description += 'two nodes on workflow' + BuildAnchor(activity.summary_fields[activity.object1[0]], activity.object1, activity); + } else { + activity.description += activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity) + + 'from ' + activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity); + } } break; // expected outcome "associated to " @@ -97,8 +101,12 @@ export default function BuildDescription(BuildAnchor, $log, i18n) { 'to ' + activity.object2 + BuildAnchor(activity.summary_fields.group[1], activity.object2, activity); } else { - activity.description += activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity) + - 'to ' + activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity); + if (activity.object1 === 'workflow_job_template_node' && activity.object2 === 'workflow_job_template_node') { + activity.description += 'two nodes on workflow' + BuildAnchor(activity.summary_fields[activity.object1[0]], activity.object1, activity); + } else { + activity.description += activity.object1 + BuildAnchor(activity.summary_fields[activity.object1][0], activity.object1, activity) + + 'to ' + activity.object2 + BuildAnchor(activity.summary_fields[activity.object2][0], activity.object2, activity); + } } break; case 'delete':