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

Add 'ALL' indicator to 'ALL' nodes

Browse Source
This commit is contained in:
Jake McDermott 2020-01-24 15:18:05 -05:00 committed by Rebeccah
parent 1b3fbee38d
commit 04844aa44f
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
View File

@ -115,11 +115,20 @@
fill: @default-icon;
}
.WorkflowChart-convergenceTypeRectangle {
fill: @default-icon;
}
.WorkflowChart-nodeTypeLetter {
fill: @default-bg;
font-size: 10px;
}
.WorkflowChart-convergenceTypeLetter {
fill: @default-bg;
font-size: 10px;
}
.WorkflowChart-nodeStatus--running {
fill: @default-icon;
}

42
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
View File

@ -34,6 +34,7 @@ export default ['moment', '$timeout', '$window', '$filter', 'TemplatesStrings',
nodeH = 60,
rootW = startNodeTextWidth + 25,
rootH = 40,
strokeW = 2, // px
startNodeOffsetY = scope.mode === 'details' ? 17 : 10,
maxNodeTextLength = 27,
windowHeight,
@ -118,6 +119,14 @@ export default ['moment', '$timeout', '$window', '$filter', 'TemplatesStrings',
};
const rounded_rect = (x, y, w, h, r, tl, tr, bl, br) => {
// x, y - position coordinates
// w - width
// h - height
// r - border radius
// round the top-left corner (bool)
// round the top-right corner (bool)
// round the bottom-left corner (bool)
// round the bottom-right corner (bool)
let retval;
retval = "M" + (x + r) + "," + y;
retval += "h" + (w - 2*r);
@ -855,6 +864,9 @@ export default ['moment', '$timeout', '$window', '$filter', 'TemplatesStrings',
.attr("fill", (d) => { return scope.graphState.addLinkSource === d.id ? "#337AB7" : "#D7D7D7"; })
.style("display", (d) => { return scope.graphState.isLinkMode && !d.isInvalidLinkTarget ? null : "none"; });
baseSvg.selectAll(".WorkflowChart-convergenceTypeRectangle")
.style("display", (d) => d.all_parents_must_converge ? null : "none");
// Add new nodes
const nodeEnter = nodes
.enter()
@ -924,7 +936,7 @@ export default ['moment', '$timeout', '$window', '$filter', 'TemplatesStrings',
return "#D7D7D7";
}
})
.attr('stroke-width', "2px")
.attr('stroke-width', `${strokeW}px`)
.attr("class", (d) => {
let classString = d.id === scope.graphState.nodeBeingAdded ? "WorkflowChart-rect WorkflowChart-isNodeBeingAdded" : "WorkflowChart-rect";
classString += !_.get(d, 'unifiedJobTemplate.name') ? " WorkflowChart-dashedNode" : "";
@ -980,6 +992,34 @@ export default ['moment', '$timeout', '$window', '$filter', 'TemplatesStrings',
.html(`<span>${TemplatesStrings.get('workflow_maker.APPROVED')}</span>`)
.style("display", (d) => { return d.job && d.job.type === "workflow_approval" && d.job.status === "successful" && !d.job.timed_out ? null : "none"; });
// Build the 'ALL' symbol for all-convergence nodes
const convergenceTypeHeight = nodeH / 5;
const convergenceTypeWidth = nodeW / 5;
const convergenceTypeXCoord = nodeW / 2 - convergenceTypeWidth / 2;
const convergenceTypeYCoord = -convergenceTypeHeight + (strokeW / 2);
const convergenceTypeBorderRadius = 3;
const convergenceRectangle = rounded_rect(
convergenceTypeXCoord,
convergenceTypeYCoord,
convergenceTypeWidth,
convergenceTypeHeight,
convergenceTypeBorderRadius,
true, // round top-left
true, // round top-right
false, // round bottom-left
false // round bottom-right
);
thisNode.append("path")
.attr("d", convergenceRectangle)
.attr("class", "WorkflowChart-convergenceTypeRectangle")
.style("display", (d) => d.all_parents_must_converge ? null : "none");
thisNode.append("text")
.attr("y", ((convergenceTypeYCoord + convergenceTypeHeight) / 2) - Math.min(strokeW, 2))
.attr("x", convergenceTypeXCoord + (convergenceTypeWidth / 4))
.attr("class", "WorkflowChart-convergenceTypeLetter")
.text("ALL");
thisNode.append("circle")
.attr("cy", nodeH)
.attr("r", 10)

3
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.service.js
View File

@ -28,7 +28,8 @@ export default [function(){
const nodeObj = {
index: nodeIdCounter-1,
id: nodeIdCounter
id: nodeIdCounter,
all_parents_must_converge: node.all_parents_must_converge,
};
if(node.summary_fields.job) {

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

@ -642,6 +642,7 @@ export default ['$scope', 'TemplatesService',
$scope.graphState.arrayOfNodesForChart.map( (node) => {
if (node.id === nodeId) {
node.all_parents_must_converge = nodeFormData.all_parents_must_converge;
if (isPauseNode) {
node.unifiedJobTemplate = {
unified_job_type: 'workflow_approval',
@ -652,7 +653,6 @@ export default ['$scope', 'TemplatesService',
} else {
node.unifiedJobTemplate = selectedTemplate;
}
}
});