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

Merge pull request #4867 from mabashian/4856-delete-wf-node

Browse Source 
Fixed stale workflow node data issue
This commit is contained in:
Michael Abashian 2017-01-23 15:42:40 -05:00 committed by GitHub
commit ce5ac04d97
8 changed files with 76 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/templates/main.js
View File

@ -112,7 +112,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
},
views: {
'modal': {
template: ` <workflow-maker ng-if="includeWorkflowMaker" tree-data="workflowTree" can-add-workflow-job-template="canAddWorkflowJobTemplate"></workflow-maker>`
template: `<workflow-maker ng-if="includeWorkflowMaker" workflow-job-template-obj="workflow_job_template_obj" can-add-workflow-job-template="canAddWorkflowJobTemplate"></workflow-maker>`
},
'jobTemplateList@templates.editWorkflowJobTemplate.workflowMaker': {
templateProvider: function(WorkflowMakerJobTemplateList, generateList) {

49
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
View File

@ -149,54 +149,7 @@
$scope.url = workflowJobTemplateData.url;
$scope.survey_enabled = workflowJobTemplateData.survey_enabled;
let allNodes = [];
let page = 1;
let buildTreeFromNodes = function(){
$scope.workflowTree = WorkflowService.buildTree({
workflowNodes: allNodes
});
// TODO: I think that the workflow chart directive (and eventually d3) is meddling with
// this workflowTree object and removing the children object for some reason (?)
// This happens on occasion and I think is a race condition (?)
if(!$scope.workflowTree.data.children) {
$scope.workflowTree.data.children = [];
}
$scope.workflowTree.workflow_job_template_obj = $scope.workflow_job_template_obj;
// In the partial, the workflow maker directive has an ng-if attribute which is pointed at this scope variable.
// It won't get included until this the tree has been built - I'm open to better ways of doing this.
$scope.includeWorkflowMaker = true;
};
let getNodes = function(){
// Get the workflow nodes
TemplatesService.getWorkflowJobTemplateNodes(id, page)
.then(function(data){
for(var i=0; i<data.data.results.length; i++) {
allNodes.push(data.data.results[i]);
}
if(data.data.next) {
// Get the next page
page++;
getNodes();
}
else {
// This is the last page
buildTreeFromNodes();
}
}, function(error){
ProcessErrors($scope, error.data, error.status, form, {
hdr: 'Error!',
msg: 'Failed to get workflow job template nodes. GET returned ' +
'status: ' + error.status
});
});
};
getNodes();
$scope.includeWorkflowMaker = true;
}, function(error){
ProcessErrors($scope, error.data, error.status, form, {

1
awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.partial.html
View File

@ -1,5 +1,4 @@
<div class="tab-pane" id="workflow_edit">
<div ui-view></div>
<div ng-cloak id="htmlTemplate" class="Panel"></div>
<workflow-maker ng-if="includeWorkflowMaker" tree-data="workflowTree"></workflow-maker>
</div>

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

@ -779,11 +779,15 @@ export default [ '$state','moment',
scope.$watch('canAddWorkflowJobTemplate', function() {
// Redraw the graph if permissions change
update();
if(scope.treeData) {
update();
}
});
scope.$on('refreshWorkflowChart', function(){
update();
scope.$on('refreshWorkflowChart', function(){console.log(scope.treeData);
if(scope.treeData) {
update();
}
});
scope.$on('panWorkflowChart', function(evt, params) {
@ -798,6 +802,13 @@ export default [ '$state','moment',
manualZoom(params.zoom);
});
let clearWatchTreeData = scope.$watch('treeData', function(newVal) {
if(newVal) {
update();
clearWatchTreeData();
}
});
}
};
}];

4
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
View File

@ -154,7 +154,7 @@
padding-left: 20px;
}
.WorkflowLegend-maker--right {
flex: 0 0 206px;
flex: 0 0 215px;
text-align: right;
padding-right: 20px;
position: relative;
@ -226,7 +226,7 @@
}
.WorkflowMaker-manualControls {
position: absolute;
left: -86px;
left: -77px;
height: 60px;
width: 293px;
background-color: @default-bg;

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

@ -40,9 +40,56 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
$scope.disassociateRequests = [];
function init() {
$scope.treeDataMaster = angular.copy($scope.treeData.data);
$scope.showManualControls = false;
$scope.$broadcast("refreshWorkflowChart");
let allNodes = [];
let page = 1;
let buildTreeFromNodes = function(){
WorkflowService.buildTree({
workflowNodes: allNodes
}).then(function(data){
$scope.treeData = data;
// TODO: I think that the workflow chart directive (and eventually d3) is meddling with
// this treeData object and removing the children object for some reason (?)
// This happens on occasion and I think is a race condition (?)
if(!$scope.treeData.data.children) {
$scope.treeData.data.children = [];
}
$scope.treeData.workflow_job_template_obj = $scope.workflowJobTemplateObj;
$scope.treeDataMaster = angular.copy($scope.treeData.data);
$scope.showManualControls = false;
});
};
let getNodes = function(){
// Get the workflow nodes
TemplatesService.getWorkflowJobTemplateNodes($scope.workflowJobTemplateObj.id, page)
.then(function(data){
for(var i=0; i<data.data.results.length; i++) {
allNodes.push(data.data.results[i]);
}
if(data.data.next) {
// Get the next page
page++;
getNodes();
}
else {
// This is the last page
buildTreeFromNodes();
}
}, function(error){
ProcessErrors($scope, error.data, error.status, form, {
hdr: 'Error!',
msg: 'Failed to get workflow job template nodes. GET returned ' +
'status: ' + error.status
});
});
};
getNodes();
}
function resetNodeForm() {
@ -155,6 +202,7 @@ export default ['$scope', 'WorkflowService', 'generateList', 'TemplateList', 'Pr
data: buildSendableNodeData()
})
.then(function(data) {
params.node.isNew = false;
continueRecursing(data.data.id);
}, function(error) {
ProcessErrors($scope, error.data, error.status, form, {

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

@ -10,7 +10,7 @@ export default ['templateUrl', 'CreateDialog', 'Wait', '$state',
function(templateUrl, CreateDialog, Wait, $state) {
return {
scope: {
treeData: '=',
workflowJobTemplateObj: '=',
canAddWorkflowJobTemplate: '='
},
restrict: 'E',

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

@ -1,4 +1,4 @@
export default [function(){
export default ['$q', function($q){
return {
searchTree: function(params) {
// params.element
@ -129,6 +129,8 @@ export default [function(){
buildTree: function(params) {
//params.workflowNodes
let deferred = $q.defer();
let _this = this;
let treeData = {
@ -185,7 +187,9 @@ export default [function(){
treeData.data.children.push(branch);
});
return treeData;
deferred.resolve(treeData);
return deferred.promise;
},
buildBranch: function(params) {
// params.nodeId