External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-24 00:57:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Changed workflow node details link to href so that i can be opened in new tab

Browse Source
This commit is contained in:
mabashian
2018-12-14 14:59:19 -05:00
parent e6f654b568
commit 7f66053654
1 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,7 +764,24 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
}); });
baseSvg.selectAll(".WorkflowChart-detailsLink") baseSvg.selectAll(".WorkflowChart-detailsLink")
.style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; }); .style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; })
.html(function (d) {
let href = "";
if (d.job) {
if(d.job.type === 'job') {
href = `/#/jobs/playbook/${d.job.id}`;
}
else if(d.job.type === 'inventory_update') {
href = `/#/jobs/inventory/${d.job.id}`;
}
else if(d.job.type === 'project_update') {
href = `/#/jobs/project/${d.job.id}`;
} else if (d.job.type === 'workflow_job') {
href = `/#/workflows/${d.job.id}`;
}
}
return `<a href="${href}">${TemplatesStrings.get('workflow_maker.DETAILS')}</a>`;
});
baseSvg.selectAll(".WorkflowChart-deletedText") baseSvg.selectAll(".WorkflowChart-deletedText")
.style("display", function(d){ return d.unifiedJobTemplate || d.id === scope.graphState.nodeBeingAdded ? "none" : null; }); .style("display", function(d){ return d.unifiedJobTemplate || d.id === scope.graphState.nodeBeingAdded ? "none" : null; });
@@ -1043,16 +1060,29 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
.classed("WorkflowChart-nodeHovering", false); .classed("WorkflowChart-nodeHovering", false);
} }
}); });
thisNode.append("text") thisNode.append("foreignObject")
.attr("x", nodeW - 45) .attr("x", nodeW - 45)
.attr("y", nodeH - 10) .attr("y", nodeH - 15)
.attr("dy", ".35em") .attr("dy", ".35em")
.attr("class", "WorkflowChart-detailsLink") .attr("class", "WorkflowChart-detailsLink")
.style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; }) .style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; })
.text(function () { .html(function () {
return TemplatesStrings.get('workflow_maker.DETAILS'); let href = "";
}) if (d.job) {
.call(details); if(d.job.type === 'job') {
href = `/#/jobs/playbook/${d.job.id}`;
}
else if(d.job.type === 'inventory_update') {
href = `/#/jobs/inventory/${d.job.id}`;
}
else if(d.job.type === 'project_update') {
href = `/#/jobs/project/${d.job.id}`;
} else if (d.job.type === 'workflow_job') {
href = `/#/workflows/${d.job.id}`;
}
}
return `<a href="${href}">${TemplatesStrings.get('workflow_maker.DETAILS')}</a>`;
});
thisNode.append("circle") thisNode.append("circle")
.attr("id", function(d){return "node-" + d.id + "-add";}) .attr("id", function(d){return "node-" + d.id + "-add";})
.attr("cx", nodeW) .attr("cx", nodeW)
@@ -1328,29 +1358,29 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
}); });
} }
function details() { // function details() {
this.on("mouseover", function() { // this.on("mouseover", function() {
d3.select(this).style("text-decoration", "underline"); // d3.select(this).style("text-decoration", "underline");
}); // });
this.on("mouseout", function() { // this.on("mouseout", function() {
d3.select(this).style("text-decoration", null); // d3.select(this).style("text-decoration", null);
}); // });
this.on("click", function(d) { // this.on("click", function(d) {
if(d.job.type === 'job') { // if(d.job.type === 'job') {
$state.go('output', {id: d.job.id, type: 'playbook'}); // $state.go('output', {id: d.job.id, type: 'playbook'});
} // }
else if(d.job.type === 'inventory_update') { // else if(d.job.type === 'inventory_update') {
$state.go('output', {id: d.job.id, type: 'inventory'}); // $state.go('output', {id: d.job.id, type: 'inventory'});
} // }
else if(d.job.type === 'project_update') { // else if(d.job.type === 'project_update') {
$state.go('output', {id: d.job.id, type: 'project'}); // $state.go('output', {id: d.job.id, type: 'project'});
} else if (d.job.type === 'workflow_job') { // } else if (d.job.type === 'workflow_job') {
$state.go('workflowResults', { // $state.go('workflowResults', {
id: d.job.id, // id: d.job.id,
}); // });
} // }
}); // });
} // }
scope.$on('refreshWorkflowChart', function(){ scope.$on('refreshWorkflowChart', function(){
if(scope.graphState) { if(scope.graphState) {