From 17cc82d946e4cd083c227d4965cd9477f28bc895 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 27 Nov 2018 12:08:00 -0500
Subject: [PATCH] Ensure that selected row is cleared when adding new node
 after editing existing node

---
 .../forms/workflow-node-form.controller.js    | 33 ++-----------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
index 4b424b7ff4..067842abe2 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.controller.js
@@ -115,6 +115,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
         };
 
         const finishConfiguringAdd = () => {
+            $scope.selectedTemplate = null;
             $scope.activeTab = "jobs";
             const alwaysOption = {
                 label: $scope.strings.get('workflow_maker.ALWAYS'),
@@ -660,36 +661,6 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
 
         $scope.toggle_row = (selectedRow) => {
             if (!$scope.readOnly) {
-                switch($scope.activeTab) {
-                    case 'jobs':
-                        $scope.wf_maker_templates.forEach((row, i) => {
-                            if (row.id === selectedRow.id) {
-                                $scope.wf_maker_templates[i].checked = 1;
-
-                            } else {
-                                $scope.wf_maker_templates[i].checked = 0;
-                            }
-                        });
-                        break;
-                    case 'project_syncs':
-                        $scope.wf_maker_projects.forEach((row, i) => {
-                            if (row.id === selectedRow.id) {
-                                $scope.wf_maker_projects[i].checked = 1;
-                            } else {
-                                $scope.wf_maker_projects[i].checked = 0;
-                            }
-                        });
-                        break;
-                    case 'inventory_syncs':
-                        $scope.wf_maker_inventory_sources.forEach((row, i) => {
-                            if (row.id === selectedRow.id) {
-                                $scope.wf_maker_inventory_sources[i].checked = 1;
-                            } else {
-                                $scope.wf_maker_inventory_sources[i].checked = 0;
-                            }
-                        });
-                        break;
-                }
                 templateManuallySelected(selectedRow);
             }
         };
@@ -700,7 +671,7 @@ export default ['$scope', 'TemplatesService', 'JobTemplateModel', 'PromptService
             }
         });
 
-        $scope.$watchGroup(['wf_maker_templates', 'wf_maker_projects', 'wf_maker_inventory_sources', 'activeTab'], () => {
+        $scope.$watchGroup(['wf_maker_templates', 'wf_maker_projects', 'wf_maker_inventory_sources', 'activeTab', 'selectedTemplate.id'], () => {
             const unifiedJobTemplateId = _.get($scope, 'selectedTemplate.id') || null;
             switch($scope.activeTab) {
                 case 'jobs':