External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix node jobs column sorting. Adds arrows to potential workflow node links

Browse Source
This commit is contained in:
mabashian
2018-11-20 15:51:14 -05:00
parent 1477bbae30
commit 54d56f2284
2 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -997,17 +997,44 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
const targetNodeX = d3.transform(targetNode.attr("transform")).translate[0]; const targetNodeX = d3.transform(targetNode.attr("transform")).translate[0];
const targetNodeY = d3.transform(targetNode.attr("transform")).translate[1]; const targetNodeY = d3.transform(targetNode.attr("transform")).translate[1];
const startX = sourceNodeX + nodeW/2;
const startY = sourceNodeY + nodeH/2;
const finishX = targetNodeX + nodeW/2;
const finishY = targetNodeY + nodeH/2;
const polylinePoints = {
start: {
x: startX,
y: startY
},
third: {
x: startX + (finishX - startX)/3,
y: startY + (finishY - startY)/3
},
midpoint: {
x: startX + (finishX - startX)/2,
y: startY + (finishY - startY)/2
},
twoThird: {
x: startX + 2*(finishX - startX)/3,
y: startY + 2*(finishY - startY)/3
},
finish: {
x: finishX,
y: finishY
}
};
$('.WorkflowChart-potentialLink').remove(); $('.WorkflowChart-potentialLink').remove();
svgGroup.insert("line", '.WorkflowChart-node') svgGroup.insert("polyline", '.WorkflowChart-node')
.attr("class", "WorkflowChart-potentialLink") .attr("class", "WorkflowChart-potentialLink")
.attr("x1", sourceNodeX + nodeW/2) .attr("points", `${polylinePoints.start.x},${polylinePoints.start.y} ${polylinePoints.third.x},${polylinePoints.third.y} ${polylinePoints.midpoint.x},${polylinePoints.midpoint.y} ${polylinePoints.twoThird.x},${polylinePoints.twoThird.y} ${polylinePoints.finish.x},${polylinePoints.finish.y}`)
.attr("x2", targetNodeX + nodeW/2) .attr("stroke-dasharray","5,5")
.attr("y1", sourceNodeY + nodeH/2) .attr("stroke-width", "2")
.attr("y2", targetNodeY + nodeH/2) .attr("stroke", "#D7D7D7")
.style("stroke-dasharray","5,5") .attr('marker-mid', "url(#aw-workflow-chart-arrow)");
.style("stroke-width", "2")
.style("stroke", "#D7D7D7");
} }
d3.select("#node-" + d.id) d3.select("#node-" + d.id)
.classed("WorkflowChart-nodeHovering", true); .classed("WorkflowChart-nodeHovering", true);
@@ -1399,7 +1426,20 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
svgGroup = baseSvg.append("g") svgGroup = baseSvg.append("g")
.attr("id", "aw-workflow-chart-g") .attr("id", "aw-workflow-chart-g")
.attr("transform", "translate(0," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")"); .attr("transform", "translate(0," + (windowHeight/2 - rootH/2 - startNodeOffsetY) + ")");
});
const defs = baseSvg.append("defs");
defs.append("marker")
.attr("id", "aw-workflow-chart-arrow")
.attr("viewBox", "0 -5 10 10")
.attr("refX", 5)
.attr("markerWidth", 6)
.attr("markerHeight", 6)
.attr("orient", "auto")
.append("path")
.attr("d", "M0,-5L10,0L0,5")
.attr('fill', "#D7D7D7");
});
if(scope.mode === 'details') { if(scope.mode === 'details') {
angular.element($window).on('resize', onResize); angular.element($window).on('resize', onResize);

2
awx/ui/client/src/templates/workflows/workflow-maker/forms/workflow-node-form.partial.html
View File

@@ -21,7 +21,7 @@
<thead> <thead>
<tr class="List-tableHeaderRow"> <tr class="List-tableHeaderRow">
<th class="List-tableHeader select-column List-staticColumn--smallStatus" translate=""></th> <th class="List-tableHeader select-column List-staticColumn--smallStatus" translate=""></th>
<th class="col-md-8" base-path="unified_job_templates" collection="templates" dataset="template_dataset" column-sort="" column-field="name" column-iterator="template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="template_queryset"> <th class="col-md-8" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="name" column-iterator="wf_maker_template" column-no-sort="undefined" column-label="Name" column-custom-class="" query-set="wf_maker_template_queryset">
</th> </th>
<th class="List-tableHeader--info col-md-3" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset"> <th class="List-tableHeader--info col-md-3" base-path="unified_job_templates" collection="wf_maker_templates" dataset="wf_maker_template_dataset" column-sort="" column-field="info" column-iterator="wf_maker_template" column-no-sort="true" column-label="" column-custom-class="" query-set="wf_maker_template_queryset">
</th> </th>