From 6d0d8e57a46e10c01fdb607d64af87d21be72d84 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 19 Jul 2022 15:18:25 -0400
Subject: [PATCH] Fix bug where node alias is not remaining after changing the
 template on a wf node

---
 .../Visualizer.js                             |  9 +------
 .../VisualizerNode.js                         | 14 +++++------
 .../VisualizerNode.test.js                    | 25 +++++++++++++++++++
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
index 73c7de7310..170dc59ad1 100644
--- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
+++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/Visualizer.js
@@ -53,14 +53,7 @@ const Wrapper = styled.div`
 `;
 
 const replaceIdentifier = (node) => {
-  if (stringIsUUID(node.originalNodeObject.identifier) && node.identifier) {
-    return true;
-  }
-
-  if (
-    !stringIsUUID(node.originalNodeObject.identifier) &&
-    node.identifier !== node.originalNodeObject.identifier
-  ) {
+  if (stringIsUUID(node.originalNodeObject.identifier) || node.identifier) {
     return true;
   }
 
diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.js b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.js
index ac0802f5a0..88f6346f2b 100644
--- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.js
+++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.js
@@ -170,14 +170,14 @@ function VisualizerNode({
 
   let nodeName;
 
-  if (
-    node?.identifier ||
-    (node?.originalNodeObject?.identifier &&
-      !stringIsUUID(node.originalNodeObject.identifier))
+  if (node?.identifier && node.identifier !== '') {
+    nodeName = node.identifier;
+  } else if (
+    node?.identifier !== '' &&
+    node?.originalNodeObject?.identifier &&
+    !stringIsUUID(node.originalNodeObject.identifier)
   ) {
-    nodeName = node?.identifier
-      ? node?.identifier
-      : node?.originalNodeObject?.identifier;
+    nodeName = node?.originalNodeObject?.identifier;
   } else {
     nodeName =
       node?.fullUnifiedJobTemplate?.name ||
diff --git a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.test.js b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.test.js
index bcf722e8e7..adebb33767 100644
--- a/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.test.js
+++ b/awx/ui/src/screens/Template/WorkflowJobTemplateVisualizer/VisualizerNode.test.js
@@ -270,6 +270,31 @@ describe('VisualizerNode', () => {
     });
   });
 
+  describe('Node with empty string alias', () => {
+    test('Displays unified job template name inside node', () => {
+      const wrapper = mountWithContexts(
+        <svg>
+          <WorkflowStateContext.Provider value={mockedContext}>
+            <VisualizerNode
+              node={{
+                id: 2,
+                identifier: '',
+                fullUnifiedJobTemplate: {
+                  name: 'foobar',
+                },
+              }}
+              readOnly={false}
+              updateHelpText={() => {}}
+              updateNodeHelp={() => {}}
+            />
+          </WorkflowStateContext.Provider>
+        </svg>
+      );
+      expect(wrapper).toHaveLength(1);
+      expect(wrapper.find('NodeResourceName').text()).toBe('foobar');
+    });
+  });
+
   describe('Node should display convergence label', () => {
     test('Should display ALL convergence label', async () => {
       const wrapper = mountWithContexts(