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

Merge pull request #2938 from mabashian/wf-details-click

Browse Source 
Updates to workflow node details link

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-12-18 12:06:33 +00:00 committed by GitHub
commit 7628ef01f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
awx/ui/client/features/output/legacy.route.js
View File

@ -1,4 +1,4 @@
function LegacyRedirect ($stateRegistry) {
function LegacyRedirect ($http, $stateRegistry) {
const destination = 'output';
const routes = [
{
@ -66,11 +66,43 @@ function LegacyRedirect ($stateRegistry) {
return { state: 'schedules.edit', params: { schedule_id, schedule_search } };
}
},
{
name: 'workflowNodeRedirect',
url: '/workflow_node_results/:id',
redirectTo: (trans) => {
// The workflow job viewer uses this route for playbook job nodes. The provided id
// is used to lookup the corresponding unified job, which is then inspected to
// determine if we need to redirect to a split (workflow) job or a playbook job.
const { id } = trans.params();
const endpoint = '/api/v2/unified_jobs/';
return $http.get(endpoint, { params: { id } })
.then(({ data }) => {
const { results } = data;
const [obj] = results;
if (obj) {
if (obj.type === 'workflow_job') {
return { state: 'workflowResults', params: { id } };
} else if (obj.type === 'job') {
return { state: 'output', params: { type: 'playbook', id } };
} else if (obj.type === 'inventory_update') {
return { state: 'output', params: { type: 'inventory', id } };
} else if (obj.type === 'project_update') {
return { state: 'output', params: { type: 'project', id } };
}
}
return { state: 'jobs' };
})
.catch(() => ({ state: 'dashboard' }));
}
},
];
routes.forEach(state => $stateRegistry.register(state));
}
LegacyRedirect.$inject = ['$stateRegistry'];
LegacyRedirect.$inject = ['$http', '$stateRegistry'];
export default LegacyRedirect;

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

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

7
awx/ui/client/src/workflow-results/workflow-results.controller.js
View File

@ -281,13 +281,12 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
if (nodeRef[node.id] && nodeRef[node.id].originalNodeObject.id === data.workflow_node_id) {
node.job = {
id: data.unified_job_id,
status: data.status,
type: nodeRef[node.id].unifiedJobTemplate.unified_job_type
status: data.status
};
$scope.$broadcast("refreshWorkflowChart");
}
});
$scope.$broadcast("refreshWorkflowChart");
}
getLabelsAndTooltips();
});

2
awx/ui/client/src/workflow-results/workflow-results.service.js
View File

@ -132,7 +132,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
return true;
}
return false;
},
}
};
return val;
}];