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

Merge branch 'mabashian-4164-details-view-audit' into release_3.1.0

Browse Source
This commit is contained in:
Michael Abashian
2016-12-14 13:49:23 -05:00
parent 7c9dc5194c 32001521be
commit 8d067172bb
4 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,3 +105,11 @@
.WorkflowChart-activeNode { .WorkflowChart-activeNode {
fill: @default-link; fill: @default-link;
} }
.WorkflowChart-elapsedHolder {
background-color: @b7grey;
color: @default-bg;
height: 13px;
width: 39px;
padding: 1px 3px;
border-radius: 4px;
}

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

@@ -190,6 +190,7 @@ export default [ '$state',
.attr("dy", ".35em") .attr("dy", ".35em")
.attr("class", "WorkflowChart-startText") .attr("class", "WorkflowChart-startText")
.text(function () { return "START"; }) .text(function () { return "START"; })
.attr("display", function() { return scope.mode === 'details' ? 'none' : null;})
.call(add_node); .call(add_node);
} }
else { else {
@@ -225,10 +226,10 @@ export default [ '$state',
.style("display", function(d) { return d.isActiveEdit ? null : "none"; }); .style("display", function(d) { return d.isActiveEdit ? null : "none"; });
thisNode.append("text") thisNode.append("text")
.attr("x", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? 20 : nodeW / 2; }) .attr("x", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? 20 : nodeW / 2; })
.attr("y", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? 10 : nodeH / 2; }) .attr("y", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? 10 : nodeH / 2; })
.attr("dy", ".35em") .attr("dy", ".35em")
.attr("text-anchor", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? "inherit" : "middle"; }) .attr("text-anchor", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? "inherit" : "middle"; })
.attr("class", "WorkflowChart-defaultText WorkflowChart-nameText") .attr("class", "WorkflowChart-defaultText WorkflowChart-nameText")
.text(function (d) { .text(function (d) {
return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? d.unifiedJobTemplate.name : ""; return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? d.unifiedJobTemplate.name : "";
@@ -293,7 +294,7 @@ export default [ '$state',
.attr("y", nodeH - 10) .attr("y", nodeH - 10)
.attr("dy", ".35em") .attr("dy", ".35em")
.attr("class", "WorkflowChart-detailsLink") .attr("class", "WorkflowChart-detailsLink")
.style("display", function(d){ return d.job && d.job.jobStatus && d.job.unified_job_id ? null : "none"; }) .style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; })
.text(function () { .text(function () {
return "DETAILS"; return "DETAILS";
}) })
@@ -388,7 +389,7 @@ export default [ '$state',
let statusClass = "WorkflowChart-nodeStatus "; let statusClass = "WorkflowChart-nodeStatus ";
if(d.job){ if(d.job){
switch(d.job.jobStatus) { switch(d.job.status) {
case "pending": case "pending":
statusClass = "workflowChart-nodeStatus--running"; statusClass = "workflowChart-nodeStatus--running";
break; break;
@@ -404,15 +405,37 @@ export default [ '$state',
case "failed": case "failed":
statusClass = "workflowChart-nodeStatus--failed"; statusClass = "workflowChart-nodeStatus--failed";
break; break;
case "error":
statusClass = "workflowChart-nodeStatus--failed";
break;
} }
} }
return statusClass; return statusClass;
}) })
.style("display", function(d) { return d.job && d.job.jobStatus ? null : "none"; }) .style("display", function(d) { return d.job && d.job.status ? null : "none"; })
.attr("cy", 10) .attr("cy", 10)
.attr("cx", 10) .attr("cx", 10)
.attr("r", 6); .attr("r", 6);
thisNode.append("foreignObject")
.attr("x", 5)
.attr("y", 43)
.style("font-size","0.7em")
.attr("class", "WorkflowChart-elapsed")
.html(function (d) {
if(d.job && d.job.elapsed) {
let elapsedMs = d.job.elapsed * 1000;
let elapsedMoment = moment.duration(elapsedMs);
let paddedElapsedMoment = Math.floor(elapsedMoment.asHours()) < 10 ? "0" + Math.floor(elapsedMoment.asHours()) : Math.floor(elapsedMoment.asHours());
let elapsedString = paddedElapsedMoment + moment.utc(elapsedMs).format(":mm:ss");
return "<div class=\"WorkflowChart-elapsedHolder\"><span>" + elapsedString + "</span></div>";
}
else {
return "";
}
})
.style("display", function(d) { return (d.job && d.job.elapsed) ? null : "none"; });
} }
}); });
@@ -608,7 +631,7 @@ export default [ '$state',
let statusClass = "WorkflowChart-nodeStatus "; let statusClass = "WorkflowChart-nodeStatus ";
if(d.job){ if(d.job){
switch(d.job.jobStatus) { switch(d.job.status) {
case "pending": case "pending":
statusClass += "workflowChart-nodeStatus--running"; statusClass += "workflowChart-nodeStatus--running";
break; break;
@@ -624,17 +647,20 @@ export default [ '$state',
case "failed": case "failed":
statusClass += "workflowChart-nodeStatus--failed"; statusClass += "workflowChart-nodeStatus--failed";
break; break;
case "error":
statusClass = "workflowChart-nodeStatus--failed";
break;
} }
} }
return statusClass; return statusClass;
}) })
.style("display", function(d) { return d.job && d.job.jobStatus ? null : "none"; }) .style("display", function(d) { return d.job && d.job.status ? null : "none"; })
.transition() .transition()
.duration(0) .duration(0)
.attr("r", 6) .attr("r", 6)
.each(function(d) { .each(function(d) {
if(d.job && d.job.jobStatus && (d.job.jobStatus === "pending" || d.job.jobStatus === "waiting" || d.job.jobStatus === "running")) { if(d.job && d.job.status && (d.job.status === "pending" || d.job.status === "waiting" || d.job.status === "running")) {
// Pulse the circle // Pulse the circle
var circle = d3.select(this); var circle = d3.select(this);
(function repeat() { (function repeat() {
@@ -651,15 +677,15 @@ export default [ '$state',
}); });
t.selectAll(".WorkflowChart-nameText") t.selectAll(".WorkflowChart-nameText")
.attr("x", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? 20 : nodeW / 2; }) .attr("x", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? 20 : nodeW / 2; })
.attr("y", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? 10 : nodeH / 2; }) .attr("y", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? 10 : nodeH / 2; })
.attr("text-anchor", function(d){ return (scope.mode === 'details' && d.job && d.job.jobStatus) ? "inherit" : "middle"; }) .attr("text-anchor", function(d){ return (scope.mode === 'details' && d.job && d.job.status) ? "inherit" : "middle"; })
.text(function (d) { .text(function (d) {
return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? wrap(d.unifiedJobTemplate.name) : ""; return (d.unifiedJobTemplate && d.unifiedJobTemplate.name) ? wrap(d.unifiedJobTemplate.name) : "";
}); });
t.selectAll(".WorkflowChart-detailsLink") t.selectAll(".WorkflowChart-detailsLink")
.style("display", function(d){ return d.job && d.job.jobStatus && d.job.unified_job_id ? null : "none"; }); .style("display", function(d){ return d.job && d.job.status && d.job.id ? null : "none"; });
t.selectAll(".WorkflowChart-incompleteText") t.selectAll(".WorkflowChart-incompleteText")
.style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; }); .style("display", function(d){ return d.unifiedJobTemplate || d.placeholder ? "none" : null; });
@@ -670,6 +696,9 @@ export default [ '$state',
t.selectAll(".WorkflowChart-activeNode") t.selectAll(".WorkflowChart-activeNode")
.style("display", function(d) { return d.isActiveEdit ? null : "none"; }); .style("display", function(d) { return d.isActiveEdit ? null : "none"; });
t.selectAll(".WorkflowChart-elapsed")
.style("display", function(d) { return (d.job && d.job.elapsed) ? null : "none"; });
} }
function add_node() { function add_node() {
@@ -722,15 +751,15 @@ export default [ '$state',
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.unified_job_id && d.unifiedJobTemplate) { if(d.job.id && d.unifiedJobTemplate) {
if(d.unifiedJobTemplate.unified_job_type === 'job') { if(d.unifiedJobTemplate.unified_job_type === 'job') {
$state.go('jobDetail', {id: d.job.unified_job_id}); $state.go('jobDetail', {id: d.job.id});
} }
else if(d.unifiedJobTemplate.unified_job_type === 'inventory_update') { else if(d.unifiedJobTemplate.unified_job_type === 'inventory_update') {
$state.go('inventorySyncStdout', {id: d.job.unified_job_id}); $state.go('inventorySyncStdout', {id: d.job.id});
} }
else if(d.unifiedJobTemplate.unified_job_type === 'project_update') { else if(d.unifiedJobTemplate.unified_job_type === 'project_update') {
$state.go('scmUpdateStdout', {id: d.job.unified_job_id}); $state.go('scmUpdateStdout', {id: d.job.id});
} }
} }
}); });

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

@@ -224,10 +224,7 @@ export default [function(){
} }
if(params.nodesObj[params.nodeId].summary_fields.job) { if(params.nodesObj[params.nodeId].summary_fields.job) {
treeNode.job = { treeNode.job = _.clone(params.nodesObj[params.nodeId].summary_fields.job);
jobStatus: params.nodesObj[params.nodeId].summary_fields.job.status,
unified_job_id: params.nodesObj[params.nodeId].summary_fields.job.id
};
} }
if(params.nodesObj[params.nodeId].summary_fields.unified_job_template) { if(params.nodesObj[params.nodeId].summary_fields.unified_job_template) {
@@ -282,8 +279,8 @@ export default [function(){
if(matchingNode) { if(matchingNode) {
matchingNode.job = { matchingNode.job = {
jobStatus: params.status, status: params.status,
unified_job_id: params.unified_job_id id: params.unified_job_id
}; };
} }

28
awx/ui/client/src/workflow-results/workflow-results.partial.html
View File

@@ -98,32 +98,6 @@
</div> </div>
</div> </div>
<!-- TEMPLATE DETAIL -->
<div class="WorkflowResults-resultRow"
ng-show="workflow.name">
<label class="WorkflowResults-resultRowLabel">
Template
</label>
<div class="WorkflowResults-resultRowText">
<a href="{{ workflow_template_link }}"
aw-tool-tip="Edit the job template"
data-placement="top">
{{ workflow.name }}
</a>
</div>
</div>
<!-- JOB TYPE DETAIL -->
<div class="WorkflowResults-resultRow"
ng-show="workflow.type">
<label class="WorkflowResults-resultRowLabel">
Job Type
</label>
<div class="WorkflowResults-resultRowText">
Workflow Job
</div>
</div>
<!-- CREATED BY DETAIL --> <!-- CREATED BY DETAIL -->
<div class="WorkflowResults-resultRow" <div class="WorkflowResults-resultRow"
ng-show="workflow.summary_fields.created_by.username"> ng-show="workflow.summary_fields.created_by.username">
@@ -281,7 +255,7 @@
</div> </div>
</div> </div>
</div> </div>
<workflow-chart tree-data="treeData.data" can-add-workflow-job-template="canAddWorkflowJobTemplate" mode="details" class="WorkflowMaker-chart"></workflow-chart> <workflow-chart tree-data="treeData.data" workflow-zoomed="workflowZoomed(zoom)" can-add-workflow-job-template="canAddWorkflowJobTemplate" mode="details" class="WorkflowMaker-chart"></workflow-chart>
</div> </div>
</div> </div>