External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 10:11:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed some delete workflow node bugs

Browse Source
This commit is contained in:
mabashian
2017-08-16 13:59:18 -04:00
parent 2bccb5e753
commit dfc4070dba
2 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
View File

@@ -183,11 +183,13 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
}) })
.then(function(data) { .then(function(data) {
$scope.associateRequests.push({ if(!params.node.isRoot) {
parentId: params.parentId, $scope.associateRequests.push({
nodeId: data.data.id, parentId: params.parentId,
edge: params.node.edgeType nodeId: data.data.id,
}); edge: params.node.edgeType
});
}
params.node.isNew = false; params.node.isNew = false;
continueRecursing(data.data.id); continueRecursing(data.data.id);
@@ -370,7 +372,7 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
edgeType = "always"; edgeType = "always";
$scope.edgeFlags.showTypeOptions = false; $scope.edgeFlags.showTypeOptions = false;
} else { } else {
if ((_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) && _.includes(siblingConnectionTypes, "always")) { if ($scope.placeholderNode.edgeConflict) {
// This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving // This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving
$scope.edgeFlags.typeRestriction = null; $scope.edgeFlags.typeRestriction = null;
} else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) { } else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
@@ -644,12 +646,12 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
// a type as this node will always be executed // a type as this node will always be executed
$scope.edgeFlags.showTypeOptions = false; $scope.edgeFlags.showTypeOptions = false;
} else { } else {
if ((_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) && _.includes(siblingConnectionTypes, "always")) { if (nodeToEdit.edgeConflict) {
// This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving // This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving
$scope.edgeFlags.typeRestriction = null; $scope.edgeFlags.typeRestriction = null;
} else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure") && (nodeToEdit.edgeType === "success" || nodeToEdit.edgeType === "failure")) { } else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
$scope.edgeFlags.typeRestriction = "successFailure"; $scope.edgeFlags.typeRestriction = "successFailure";
} else if (_.includes(siblingConnectionTypes, "always") && nodeToEdit.edgeType === "always") { } else if (_.includes(siblingConnectionTypes, "always")) {
$scope.edgeFlags.typeRestriction = "always"; $scope.edgeFlags.typeRestriction = "always";
} else { } else {
$scope.edgeFlags.typeRestriction = null; $scope.edgeFlags.typeRestriction = null;
@@ -759,12 +761,6 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
nodeToBeDeleted: $scope.nodeToBeDeleted nodeToBeDeleted: $scope.nodeToBeDeleted
}); });
if($scope.workflowMakerFormConfig.nodeMode === "add") {
if($scope.placeholderNode.isRoot) {
$scope.edgeFlags.showTypeOptions = false;
}
}
if ($scope.nodeToBeDeleted.isNew !== true) { if ($scope.nodeToBeDeleted.isNew !== true) {
$scope.treeData.data.deletedNodes.push($scope.nodeToBeDeleted.nodeId); $scope.treeData.data.deletedNodes.push($scope.nodeToBeDeleted.nodeId);
} }
@@ -780,6 +776,65 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
$scope.$broadcast("refreshWorkflowChart"); $scope.$broadcast("refreshWorkflowChart");
if($scope.placeholderNode) {
let edgeType = "success";
if($scope.placeholderNode.isRoot) {
$scope.edgeFlags.showTypeOptions = false;
edgeType = "always";
}
else {
// we need to update the possible edges based on any new siblings
let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
tree: $scope.treeData.data,
parentId: $scope.placeholderNode.parent.id,
childId: $scope.placeholderNode.id
});
if ($scope.placeholderNode.edgeConflict) {
// This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving
$scope.edgeFlags.typeRestriction = null;
} else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
$scope.edgeFlags.typeRestriction = "successFailure";
} else if (_.includes(siblingConnectionTypes, "always")) {
$scope.edgeFlags.typeRestriction = "always";
edgeType = "always";
} else {
$scope.edgeFlags.typeRestriction = null;
}
$scope.edgeFlags.showTypeOptions = true;
}
$scope.$broadcast("setEdgeType", edgeType);
}
else if($scope.nodeBeingEdited) {
if($scope.nodeBeingEdited.isRoot) {
$scope.edgeFlags.showTypeOptions = false;
}
else {
let siblingConnectionTypes = WorkflowService.getSiblingConnectionTypes({
tree: $scope.treeData.data,
parentId: $scope.nodeBeingEdited.parent.id,
childId: $scope.nodeBeingEdited.id
});
if ($scope.nodeBeingEdited.edgeConflict) {
// This is a conflicted scenario but we'll just let the user keep building - they will have to remediate before saving
$scope.edgeFlags.typeRestriction = null;
} else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
$scope.edgeFlags.typeRestriction = "successFailure";
} else if (_.includes(siblingConnectionTypes, "always") && $scope.nodeBeingEdited.edgeType === "always") {
$scope.edgeFlags.typeRestriction = "always";
} else {
$scope.edgeFlags.typeRestriction = null;
}
$scope.edgeFlags.showTypeOptions = true;
}
$scope.$broadcast("setEdgeType", $scope.nodeBeingEdited.edgeType);
}
$scope.treeData.data.totalNodes--; $scope.treeData.data.totalNodes--;
} }

2
awx/ui/client/src/templates/workflows/workflow.service.js
View File

@@ -45,9 +45,7 @@ export default ['$q', function($q){
child.isRoot = true; child.isRoot = true;
child.edgeType = "always"; child.edgeType = "always";
} }
child.parent = parentNode; child.parent = parentNode;
parentNode.children.push(child); parentNode.children.push(child);
}); });
} }