From 07dbbd375d8e7c1f5d43e01dff67f2f9371c072f Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Tue, 7 Feb 2017 11:15:27 -0500
Subject: [PATCH 1/2] Disable workflow editor save when currently adding a node

---
 .../workflows/workflow-maker/workflow-maker.partial.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index a27d28eb0e..099d03ae10 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -86,6 +86,6 @@
     </div>
     <div class="WorkflowMaker-buttonHolder">
         <button type="button" class="btn btn-sm WorkflowMaker-cancelButton" ng-click="closeWorkflowMaker()"> Close</button>
-        <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict"> Save</button>
+        <button type="button" class="btn btn-sm WorkflowMaker-saveButton" ng-click="saveWorkflowMaker()" ng-show="workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate" ng-disabled="edgeFlags.conflict || workflowMakerFormConfig.nodeMode === 'add'"> Save</button>
     </div>
 </div>

From a13643ea797a3017958ecf4ee24573c1a50ed181 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Tue, 7 Feb 2017 17:22:50 -0500
Subject: [PATCH 2/2] Handle deleting root node while adding a child to that
 root node

---
 .../workflows/workflow-maker/workflow-maker.controller.js   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index 77caaa6032..e4cbfcd134 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -762,6 +762,12 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
                     nodeToBeDeleted: $scope.nodeToBeDeleted
                 });
 
+                if($scope.workflowMakerFormConfig.nodeMode === "add") {
+                    if($scope.placeholderNode.isRoot) {
+                        $scope.edgeFlags.showTypeOptions = false;
+                    }
+                }
+
                 if ($scope.nodeToBeDeleted.isNew !== true) {
                     $scope.treeData.data.deletedNodes.push($scope.nodeToBeDeleted.nodeId);
                 }