From 685f4018f263642988ceb1dde4603e2144760983 Mon Sep 17 00:00:00 2001
From: Keith Grant <kegrant@redhat.com>
Date: Mon, 25 Mar 2019 10:58:49 -0400
Subject: [PATCH] improve verbiage in activity stream for
 associating/disassociating wf nodes

---
 .../factories/build-anchor.factory.js            |  1 +
 .../factories/build-description.factory.js       | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

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 <object2> to <object1>"
@@ -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':