External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-28 16:39:56 -02:30
Code Issues Packages Projects Releases Wiki Activity

WIP integration with smart-search

Browse Source
This commit is contained in:
Leigh Johnson
2016-11-03 17:17:27 -04:00
parent 0c4db0354e
commit 50f0465094
10 changed files with 685 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/forms/Jobs.js
View File

@@ -10,6 +10,8 @@
* @description This form is for adding/editing a Job * @description This form is for adding/editing a Job
*/ */
// @issue PLEASE KILL ME I NEED TO DIE
export default export default
angular.module('JobFormDefinition', []) angular.module('JobFormDefinition', [])
.value('JobForm', { .value('JobForm', {

14
awx/ui/client/src/forms/WorkflowMaker.js
View File

@@ -18,7 +18,7 @@ export default
addTitle: '', addTitle: '',
editTitle: '', editTitle: '',
name: 'workflow_maker', name: 'workflow_maker',
base: 'job_templates', basePath: 'job_templates',
tabs: false, tabs: false,
cancelButton: false, cancelButton: false,
showHeader: false, showHeader: false,
@@ -48,7 +48,9 @@ export default
type: 'lookup', type: 'lookup',
sourceModel: 'inventory', sourceModel: 'inventory',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookUpInventory()', list: 'OrganizationList',
basePath: 'organization',
//ngClick: 'lookUpInventory()',
requiredErrorMsg: "Please select an Inventory.", requiredErrorMsg: "Please select an Inventory.",
column: 1, column: 1,
class: 'Form-formGroup--fullWidth', class: 'Form-formGroup--fullWidth',
@@ -56,10 +58,10 @@ export default
dataTitle: 'Inventory', dataTitle: 'Inventory',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
ngShow: "selectedTemplate.ask_inventory_on_launch", //ngShow: "selectedTemplate.ask_inventory_on_launch",
awRequiredWhen: { // awRequiredWhen: {
reqExpression: 'selectedTemplate.ask_inventory_on_launch' // reqExpression: 'selectedTemplate.ask_inventory_on_launch'
} // }
}, },
job_type: { job_type: {
label: 'Job Type', label: 'Job Type',

2
awx/ui/client/src/job-templates/edit-workflow/workflow-edit.controller.js
View File

@@ -480,7 +480,7 @@
} }
$scope.openWorkflowMaker = function() { $scope.openWorkflowMaker = function() {
$scope.$broadcast("showWorkflowMaker"); $state.go('.workflowMaker');
}; };
$scope.formSave = function () { $scope.formSave = function () {

7
awx/ui/client/src/job-templates/list/job-templates-list.route.js
View File

@@ -10,6 +10,13 @@ export default {
ncyBreadcrumb: { ncyBreadcrumb: {
label: "TEMPLATES" label: "TEMPLATES"
}, },
data: {
socket: {
"groups": {
"jobs": ["status_changed"]
}
}
},
params: { params: {
unified_job_templates_search: { unified_job_templates_search: {
value: { value: {

105
awx/ui/client/src/job-templates/main.js
View File

@@ -4,6 +4,8 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
import { templateUrl } from '../shared/template-url/template-url.factory';
import jobTemplateService from './job-template.service'; import jobTemplateService from './job-template.service';
import surveyMaker from './survey-maker/main'; import surveyMaker from './survey-maker/main';
@@ -27,6 +29,7 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
.config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider', .config(['$stateProvider', 'stateDefinitionsProvider', '$stateExtenderProvider',
function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) { function($stateProvider, stateDefinitionsProvider, $stateExtenderProvider) {
let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow, let stateTree, addJobTemplate, editJobTemplate, addWorkflow, editWorkflow,
workflowMaker, inventoryLookup, credentialLookup,
stateDefinitions = stateDefinitionsProvider.$get(), stateDefinitions = stateDefinitionsProvider.$get(),
stateExtender = $stateExtenderProvider.$get(); stateExtender = $stateExtenderProvider.$get();
@@ -72,6 +75,103 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
} }
}); });
workflowMaker = stateExtender.buildDefinition({
name: 'templates.editWorkflowJobTemplate.workflowMaker',
url: '/workflow-maker',
views: {
'modal': {
template: ` <workflow-maker ng-if="includeWorkflowMaker" tree-data="workflowTree"></workflow-maker>`
},
// 'jobsTemplateList@templates.editWorkflowJobTemplate.workflowMaker': {
// templateProvider: function(JobTemplateList, generateList) {
// let html = generateList.build({
// list: JobTemplateList,
// mode: 'edit'
// });
// return html;
// }
// },
// 'inventorySyncList@templates.editWorkflowJobTemplate.workflowMaker': {
// templateProvider: function(InventoryList, generateList) {
// let html = generateList.build({
// list: InventoryList,
// mode: 'edit'
// });
// return html;
// }
// },
// 'projectList@templates.editWorkflowJobTemplate.workflowMaker': {
// templateProvider: function(ProjectList, generateList) {
// let html = generateList.build({
// list: ProjectList,
// mode: 'edit'
// });
// return html;
// }
// },
'workflowForm@templates.editWorkflowJobTemplate.workflowMaker': {
templateProvider: function(WorkflowMakerForm, GenerateForm) {
let form = WorkflowMakerForm();
let html = GenerateForm.buildHTML(form, {
mode: 'add',
related: false,
});
return html;
}
}
}
});
inventoryLookup = stateExtender.buildDefinition({
searchPrefix: 'inventory',
//squashSearchUrl: true, @issue enable
name: 'templates.editWorkflowJobTemplate.workflowMaker.inventory',
url: '/inventory',
data: {
lookup: true
},
params: {
inventory_search: {
value: { page_size: '5'}
}
},
views: {
'modal@templates.editWorkflowJobTemplate.workflowMaker': {
templateProvider: function(ListDefinition, generateList) {
let list_html = generateList.build({
mode: 'lookup',
list: ListDefinition,
input_type: 'radio'
});
return `<lookup-modal>${list_html}</lookup-modal>`;
}
}
},
resolve: {
// ListDefinition: [InventoryList, function(list) {
// list.iterator = field.sourceModel;
// return list;
// }],
Dataset: ['InventoryList', 'QuerySet', '$stateParams', 'GetBasePath',
(list, qs, $stateParams, GetBasePath) => {
let path = GetBasePath(list.name) || GetBasePath(list.basePath);
return qs.search(path, $stateParams[`${list.iterator}_search`]);
}
]
},
onExit: function($state) {
if ($state.transition) {
$('#form-modal').modal('hide');
$('.modal-backdrop').remove();
$('body').removeClass('modal-open');
}
},
});
return Promise.all([ return Promise.all([
addJobTemplate, addJobTemplate,
editJobTemplate, editJobTemplate,
@@ -82,8 +182,9 @@ angular.module('jobTemplates', [surveyMaker.name, jobTemplatesList.name, jobTemp
states: _.reduce(generated, (result, definition) => { states: _.reduce(generated, (result, definition) => {
return result.concat(definition.states); return result.concat(definition.states);
}, [ }, [
stateExtender.buildDefinition(jobTemplatesListRoute) stateExtender.buildDefinition(jobTemplatesListRoute),
workflowMaker,
//inventoryLookup
]) ])
}; };
}); });

1
awx/ui/client/src/job-templates/workflow-maker/workflow-help.service.js
View File

@@ -14,6 +14,7 @@ export default ['CreateDialog', 'Wait', '$q', function(CreateDialog, Wait, $q){
deferred.resolve(); deferred.resolve();
}); });
Wait('start'); Wait('start');
debugger;
CreateDialog({ CreateDialog({
id: 'workflow-modal-dialog', id: 'workflow-modal-dialog',
scope: params.scope, scope: params.scope,

273
awx/ui/client/src/job-templates/workflow-maker/workflow-maker.controller.js
View File

@@ -4,15 +4,14 @@
* All Rights Reserved * All Rights Reserved
*************************************************/ *************************************************/
export default export default ['$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateList', 'ProjectList',
[ '$scope', 'WorkflowHelpService', 'generateList', 'JobTemplateList', 'ProjectList', 'GetBasePath', 'Wait', 'JobTemplateService',
'GetBasePath', 'SearchInit', 'PaginateInit', 'Wait', 'JobTemplateService',
'ProcessErrors', 'InventorySourcesList', 'CreateSelect2', 'WorkflowMakerForm', 'ProcessErrors', 'InventorySourcesList', 'CreateSelect2', 'WorkflowMakerForm',
'GenerateForm', 'LookUpInit', 'InventoryList', 'CredentialList', '$q', '$timeout', 'GenerateForm', 'InventoryList', 'CredentialList', '$q', '$timeout',
function($scope, WorkflowHelpService, GenerateList, JobTemplateList, ProjectList, function($scope, WorkflowHelpService, GenerateList, JobTemplateList, ProjectList,
GetBasePath, SearchInit, PaginateInit, Wait, JobTemplateService, GetBasePath, Wait, JobTemplateService,
ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm, ProcessErrors, InventorySourcesList, CreateSelect2, WorkflowMakerForm,
GenerateForm, LookUpInit, InventoryList, CredentialList, $q, $timeout) { GenerateForm, InventoryList, CredentialList, $q, $timeout) {
let form = WorkflowMakerForm(), let form = WorkflowMakerForm(),
generator = GenerateForm; generator = GenerateForm;
@@ -26,16 +25,13 @@ export default
// Set the intial edge type to success // Set the intial edge type to success
$scope.edgeType = "success"; $scope.edgeType = "success";
$scope.job_type_options = [ $scope.job_type_options = [{
{
label: "Run", label: "Run",
value: "run" value: "run"
}, }, {
{
label: "Check", label: "Check",
value: "check" value: "check"
} }];
];
let job_template_url = GetBasePath('job_templates'); let job_template_url = GetBasePath('job_templates');
// TODO: we won't be able to rely on this in the future for security purposes. Will need to come up // TODO: we won't be able to rely on this in the future for security purposes. Will need to come up
@@ -45,36 +41,44 @@ export default
//http://localhost:3000/api/v1/job_templates/?not__credential__vault_password=ASK&not__credential__password=ASK //http://localhost:3000/api/v1/job_templates/?not__credential__vault_password=ASK&not__credential__password=ASK
// Set up the lists for the add/edit node form // Set up the lists for the add/edit node form
let jobTemplatesList = _.cloneDeep(JobTemplateList); // let jobTemplatesList = _.cloneDeep(JobTemplateList);
delete jobTemplatesList.fields.type; // delete jobTemplatesList.fields.type;
delete jobTemplatesList.fields.description; // delete jobTemplatesList.fields.description;
delete jobTemplatesList.fields.smart_status; // delete jobTemplatesList.fields.smart_status;
delete jobTemplatesList.fields.labels; // delete jobTemplatesList.fields.labels;
jobTemplatesList.fields.name.columnClass = "col-md-11"; // jobTemplatesList.fields.name.columnClass = "col-md-11";
jobTemplatesList.name = "workflow_job_templates"; // jobTemplatesList.name = "workflow_job_templates";
let project_url = GetBasePath('projects'); // let project_url = GetBasePath('projects');
let projectList = _.cloneDeep(ProjectList); // let projectList = _.cloneDeep(ProjectList);
delete projectList.fields.status; // delete projectList.fields.status;
delete projectList.fields.scm_type; // delete projectList.fields.scm_type;
delete projectList.fields.last_updated; // delete projectList.fields.last_updated;
projectList.fields.name.columnClass = "col-md-11"; // projectList.fields.name.columnClass = "col-md-11";
projectList.name = "workflow_projects"; // projectList.name = "workflow_projects";
let inventory_sources_url = GetBasePath('inventory_sources'); //let inventory_sources_url = GetBasePath('inventory_sources');
let inventorySourcesList = _.cloneDeep(InventorySourcesList); //let inventorySourcesList = _.cloneDeep(InventorySourcesList);
function init() { function init() {
$scope.treeDataMaster = angular.copy($scope.treeData.data);
WorkflowHelpService.openDialog({
scope: $scope
})
.then(function() {
//$scope.$broadcast("refreshWorkflowChart");
});
$scope.$watchCollection('workflow_job_templates', function() { $scope.$watchCollection('workflow_job_templates', function() {
if ($scope.selectedTemplate) { if ($scope.selectedTemplate) {
// Loop across the inventories and see if one of them should be "checked" // Loop across the inventories and see if one of them should be "checked"
$scope.workflow_job_templates.forEach(function(row, i) { $scope.workflow_job_templates.forEach(function(row, i) {
if (row.id === $scope.selectedTemplate.id) { if (row.id === $scope.selectedTemplate.id) {
$scope.workflow_job_templates[i].checked = 1; $scope.workflow_job_templates[i].checked = 1;
} } else {
else {
$scope.workflow_job_templates[i].checked = 0; $scope.workflow_job_templates[i].checked = 0;
} }
}); });
@@ -87,8 +91,7 @@ export default
$scope.workflow_projects.forEach(function(row, i) { $scope.workflow_projects.forEach(function(row, i) {
if (row.id === $scope.selectedTemplate.id) { if (row.id === $scope.selectedTemplate.id) {
$scope.workflow_projects[i].checked = 1; $scope.workflow_projects[i].checked = 1;
} } else {
else {
$scope.workflow_projects[i].checked = 0; $scope.workflow_projects[i].checked = 0;
} }
}); });
@@ -101,8 +104,7 @@ export default
$scope.workflow_inventory_sources.forEach(function(row, i) { $scope.workflow_inventory_sources.forEach(function(row, i) {
if (row.id === $scope.selectedTemplate.id) { if (row.id === $scope.selectedTemplate.id) {
$scope.workflow_inventory_sources[i].checked = 1; $scope.workflow_inventory_sources[i].checked = 1;
} } else {
else {
$scope.workflow_inventory_sources[i].checked = 0; $scope.workflow_inventory_sources[i].checked = 0;
} }
}); });
@@ -112,8 +114,7 @@ export default
$scope.$watchGroup(['selectedTemplate', 'edgeType'], function() { $scope.$watchGroup(['selectedTemplate', 'edgeType'], function() {
if ($scope.selectedTemplate && $scope.edgeType) { if ($scope.selectedTemplate && $scope.edgeType) {
$scope.workflowMakerFormConfig.formIsValid = true; $scope.workflowMakerFormConfig.formIsValid = true;
} } else {
else {
$scope.workflowMakerFormConfig.formIsValid = false; $scope.workflowMakerFormConfig.formIsValid = false;
} }
}); });
@@ -148,64 +149,6 @@ export default
} }
function loadJobTemplates() {
SearchInit({
scope: $scope,
set: jobTemplatesList.name,
list: jobTemplatesList,
url: job_template_url
});
PaginateInit({
scope: $scope,
list: jobTemplatesList,
url: job_template_url,
mode: 'lookup',
pageSize: 5
});
$scope.search(JobTemplateList.iterator);
}
function loadProjects() {
SearchInit({
scope: $scope,
set: projectList.name,
list: projectList,
url: project_url
});
PaginateInit({
scope: $scope,
list: projectList,
url: project_url,
mode: 'lookup',
pageSize: 5
});
$scope.search(ProjectList.iterator);
}
function loadInventorySources() {
SearchInit({
scope: $scope,
set: inventorySourcesList.name,
list: inventorySourcesList,
url: inventory_sources_url
});
PaginateInit({
scope: $scope,
list: inventorySourcesList,
url: inventory_sources_url,
mode: 'lookup',
pageSize: 5
});
$scope.search(InventorySourcesList.iterator);
}
$scope.closeWorkflowMaker = function() { $scope.closeWorkflowMaker = function() {
// Revert the data to the master which was created when the dialog was opened // Revert the data to the master which was created when the dialog was opened
$scope.treeData.data = angular.copy($scope.treeDataMaster); $scope.treeData.data = angular.copy($scope.treeDataMaster);
@@ -237,10 +180,6 @@ export default
$scope.treeData.nextIndex++; $scope.treeData.nextIndex++;
loadJobTemplates();
loadProjects();
loadInventorySources();
let siblingConnectionTypes = WorkflowHelpService.getSiblingConnectionTypes({ let siblingConnectionTypes = WorkflowHelpService.getSiblingConnectionTypes({
tree: $scope.treeData.data, tree: $scope.treeData.data,
parentId: betweenTwoNodes ? parent.source.id : parent.id parentId: betweenTwoNodes ? parent.source.id : parent.id
@@ -251,16 +190,13 @@ export default
// a type as this node will always be executed // a type as this node will always be executed
$scope.edgeType = "always"; $scope.edgeType = "always";
$scope.showTypeOptions = false; $scope.showTypeOptions = false;
} } else {
else {
if ((_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) && _.includes(siblingConnectionTypes, "always")) { if ((_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) && _.includes(siblingConnectionTypes, "always")) {
// This is a problem... // This is a problem...
} } else if (_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
else if(_.includes(siblingConnectionTypes, "success") || _.includes(siblingConnectionTypes, "failure")) {
$scope.edgeTypeRestriction = "successFailure"; $scope.edgeTypeRestriction = "successFailure";
$scope.edgeType = "success"; $scope.edgeType = "success";
} } else if (_.includes(siblingConnectionTypes, "always")) {
else if(_.includes(siblingConnectionTypes, "always")) {
$scope.edgeTypeRestriction = "always"; $scope.edgeTypeRestriction = "always";
$scope.edgeType = "always"; $scope.edgeType = "always";
} }
@@ -304,8 +240,7 @@ export default
$scope.treeData.data.totalNodes++; $scope.treeData.data.totalNodes++;
} }
} } else if ($scope.workflowMakerFormConfig.nodeMode === "edit") {
else if($scope.workflowMakerFormConfig.nodeMode === "edit") {
if ($scope.selectedTemplate && $scope.edgeType) { if ($scope.selectedTemplate && $scope.edgeType) {
$scope.nodeBeingEdited.unifiedJobTemplate = $scope.selectedTemplate; $scope.nodeBeingEdited.unifiedJobTemplate = $scope.selectedTemplate;
$scope.nodeBeingEdited.edgeType = $scope.edgeType; $scope.nodeBeingEdited.edgeType = $scope.edgeType;
@@ -345,8 +280,7 @@ export default
tree: $scope.treeData.data, tree: $scope.treeData.data,
nodeToBeDeleted: $scope.placeholderNode nodeToBeDeleted: $scope.placeholderNode
}); });
} } else if ($scope.workflowMakerFormConfig.nodeMode === "edit") {
else if($scope.workflowMakerFormConfig.nodeMode === "edit") {
$scope.nodeBeingEdited.isActiveEdit = false; $scope.nodeBeingEdited.isActiveEdit = false;
} }
@@ -386,12 +320,10 @@ export default
if ($scope.nodeBeingEdited.promptValues && $scope.nodeBeingEdited.promptValues.credential) { if ($scope.nodeBeingEdited.promptValues && $scope.nodeBeingEdited.promptValues.credential) {
$scope.credential_name = $scope.nodeBeingEdited.promptValues.credential.name; $scope.credential_name = $scope.nodeBeingEdited.promptValues.credential.name;
$scope.credentiial = $scope.nodeBeingEdited.promptValues.credential.id; $scope.credentiial = $scope.nodeBeingEdited.promptValues.credential.id;
} } else if ($scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential) {
else if($scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential) {
$scope.credential_name = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.name ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.name : null; $scope.credential_name = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.name ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.name : null;
$scope.credential = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.id ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.id : null; $scope.credential = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.id ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.credential.id : null;
} } else {
else {
$scope.credential_name = null; $scope.credential_name = null;
$scope.credential = null; $scope.credential = null;
} }
@@ -401,12 +333,10 @@ export default
if ($scope.nodeBeingEdited.promptValues && $scope.nodeBeingEdited.promptValues.inventory) { if ($scope.nodeBeingEdited.promptValues && $scope.nodeBeingEdited.promptValues.inventory) {
$scope.inventory_name = $scope.nodeBeingEdited.promptValues.inventory.name; $scope.inventory_name = $scope.nodeBeingEdited.promptValues.inventory.name;
$scope.inventory = $scope.nodeBeingEdited.promptValues.inventory.id; $scope.inventory = $scope.nodeBeingEdited.promptValues.inventory.id;
} } else if ($scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory) {
else if($scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory) {
$scope.inventory_name = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.name ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.name : null; $scope.inventory_name = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.name ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.name : null;
$scope.inventory = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.id ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.id : null; $scope.inventory = $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.id ? $scope.nodeBeingEdited.unifiedJobTemplate.summary_fields.inventory.id : null;
} } else {
else {
$scope.inventory_name = null; $scope.inventory_name = null;
$scope.inventory = null; $scope.inventory = null;
} }
@@ -417,18 +347,15 @@ export default
$scope.job_type = { $scope.job_type = {
value: $scope.nodeBeingEdited.promptValues.job_type value: $scope.nodeBeingEdited.promptValues.job_type
}; };
} } else if ($scope.nodeBeingEdited.originalNodeObj.job_type) {
else if($scope.nodeBeingEdited.originalNodeObj.job_type) {
$scope.job_type = { $scope.job_type = {
value: $scope.nodeBeingEdited.originalNodeObj.job_type value: $scope.nodeBeingEdited.originalNodeObj.job_type
}; };
} } else if ($scope.nodeBeingEdited.unifiedJobTemplate.job_type) {
else if($scope.nodeBeingEdited.unifiedJobTemplate.job_type) {
$scope.job_type = { $scope.job_type = {
value: $scope.nodeBeingEdited.unifiedJobTemplate.job_type value: $scope.nodeBeingEdited.unifiedJobTemplate.job_type
}; };
} } else {
else {
$scope.job_type = { $scope.job_type = {
value: null value: null
}; };
@@ -446,42 +373,33 @@ export default
if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_limit_on_launch) { if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_limit_on_launch) {
if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.limit === 'string') { if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.limit === 'string') {
$scope.limit = $scope.nodeBeingEdited.promptValues.limit; $scope.limit = $scope.nodeBeingEdited.promptValues.limit;
} } else if (typeof $scope.nodeBeingEdited.originalNodeObj.limit === 'string') {
else if(typeof $scope.nodeBeingEdited.originalNodeObj.limit === 'string') {
$scope.limit = $scope.nodeBeingEdited.originalNodeObj.limit; $scope.limit = $scope.nodeBeingEdited.originalNodeObj.limit;
} } else if (typeof $scope.nodeBeingEdited.unifiedJobTemplate.limit === 'string') {
else if(typeof $scope.nodeBeingEdited.unifiedJobTemplate.limit === 'string') {
$scope.limit = $scope.nodeBeingEdited.unifiedJobTemplate.limit; $scope.limit = $scope.nodeBeingEdited.unifiedJobTemplate.limit;
} } else {
else {
$scope.limit = null; $scope.limit = null;
} }
} }
if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_skip_tags_on_launch) { if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_skip_tags_on_launch) {
if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.skip_tags === 'string') { if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.skip_tags === 'string') {
$scope.skip_tags = $scope.nodeBeingEdited.promptValues.skip_tags; $scope.skip_tags = $scope.nodeBeingEdited.promptValues.skip_tags;
} } else if (typeof $scope.nodeBeingEdited.originalNodeObj.skip_tags === 'string') {
else if(typeof $scope.nodeBeingEdited.originalNodeObj.skip_tags === 'string') {
$scope.skip_tags = $scope.nodeBeingEdited.originalNodeObj.skip_tags; $scope.skip_tags = $scope.nodeBeingEdited.originalNodeObj.skip_tags;
} } else if (typeof $scope.nodeBeingEdited.unifiedJobTemplate.skip_tags === 'string') {
else if(typeof $scope.nodeBeingEdited.unifiedJobTemplate.skip_tags === 'string') {
$scope.skip_tags = $scope.nodeBeingEdited.unifiedJobTemplate.skip_tags; $scope.skip_tags = $scope.nodeBeingEdited.unifiedJobTemplate.skip_tags;
} } else {
else {
$scope.skip_tags = null; $scope.skip_tags = null;
} }
} }
if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_tags_on_launch) { if ($scope.nodeBeingEdited.unifiedJobTemplate.ask_tags_on_launch) {
if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.job_tags === 'string') { if ($scope.nodeBeingEdited.promptValues && typeof $scope.nodeBeingEdited.promptValues.job_tags === 'string') {
$scope.job_tags = $scope.nodeBeingEdited.promptValues.job_tags; $scope.job_tags = $scope.nodeBeingEdited.promptValues.job_tags;
} } else if (typeof $scope.nodeBeingEdited.originalNodeObj.job_tags === 'string') {
else if(typeof $scope.nodeBeingEdited.originalNodeObj.job_tags === 'string') {
$scope.job_tags = $scope.nodeBeingEdited.originalNodeObj.job_tags; $scope.job_tags = $scope.nodeBeingEdited.originalNodeObj.job_tags;
} } else if (typeof $scope.nodeBeingEdited.unifiedJobTemplate.job_tags === 'string') {
else if(typeof $scope.nodeBeingEdited.unifiedJobTemplate.job_tags === 'string') {
$scope.job_tags = $scope.nodeBeingEdited.unifiedJobTemplate.job_tags; $scope.job_tags = $scope.nodeBeingEdited.unifiedJobTemplate.job_tags;
} } else {
else {
$scope.job_tags = null; $scope.job_tags = null;
} }
} }
@@ -504,10 +422,6 @@ export default
break; break;
} }
loadJobTemplates();
loadProjects();
loadInventorySources();
$scope.edgeType = $scope.nodeBeingEdited.edgeType; $scope.edgeType = $scope.nodeBeingEdited.edgeType;
$scope.showTypeOptions = (parent && parent.isStartNode) ? false : true; $scope.showTypeOptions = (parent && parent.isStartNode) ? false : true;
@@ -558,8 +472,7 @@ export default
id: responses[1].data.id id: responses[1].data.id
}; };
} }
} } else if (retrievingInventory) {
else if(retrievingInventory) {
$scope.inventory = responses[0].data.id; $scope.inventory = responses[0].data.id;
$scope.inventory_name = responses[0].data.name; $scope.inventory_name = responses[0].data.name;
$scope.nodeBeingEdited.promptValues.inventory = { $scope.nodeBeingEdited.promptValues.inventory = {
@@ -578,8 +491,7 @@ export default
'status: ' + error.status 'status: ' + error.status
}); });
}); });
} } else {
else {
finishConfiguringEdit(); finishConfiguringEdit();
} }
@@ -653,8 +565,7 @@ export default
if ($scope.selectedTemplate.summary_fields.credential) { if ($scope.selectedTemplate.summary_fields.credential) {
$scope.credential_name = $scope.selectedTemplate.summary_fields.credential.name ? $scope.selectedTemplate.summary_fields.credential.name : null; $scope.credential_name = $scope.selectedTemplate.summary_fields.credential.name ? $scope.selectedTemplate.summary_fields.credential.name : null;
$scope.credential = $scope.selectedTemplate.summary_fields.credential.id ? $scope.selectedTemplate.summary_fields.credential.id : null; $scope.credential = $scope.selectedTemplate.summary_fields.credential.id ? $scope.selectedTemplate.summary_fields.credential.id : null;
} } else {
else {
$scope.credential_name = null; $scope.credential_name = null;
$scope.credential = null; $scope.credential = null;
} }
@@ -664,8 +575,7 @@ export default
if ($scope.selectedTemplate.summary_fields.inventory) { if ($scope.selectedTemplate.summary_fields.inventory) {
$scope.inventory_name = $scope.selectedTemplate.summary_fields.inventory.name ? $scope.selectedTemplate.summary_fields.inventory.name : null; $scope.inventory_name = $scope.selectedTemplate.summary_fields.inventory.name ? $scope.selectedTemplate.summary_fields.inventory.name : null;
$scope.inventory = $scope.selectedTemplate.summary_fields.inventory.id ? $scope.selectedTemplate.summary_fields.inventory.id : null; $scope.inventory = $scope.selectedTemplate.summary_fields.inventory.id ? $scope.selectedTemplate.summary_fields.inventory.id : null;
} } else {
else {
$scope.inventory_name = null; $scope.inventory_name = null;
$scope.inventory = null; $scope.inventory = null;
} }
@@ -749,65 +659,6 @@ export default
}; };
$scope.$on('showWorkflowMaker', function(){
$scope.treeDataMaster = angular.copy($scope.treeData.data);
WorkflowHelpService.openDialog({
scope: $scope
})
.then(function(){
$scope.$broadcast("refreshWorkflowChart");
generator.inject(form, {
mode: 'add',
related: false,
scope: $scope,
id: 'workflow-maker-form'
});
LookUpInit({
scope: $scope,
form: form,
list: InventoryList,
field: 'inventory',
input_type: "radio"
});
LookUpInit({
url: GetBasePath('credentials') + '?kind=ssh',
scope: $scope,
form: form,
current_item: null,
list: CredentialList,
field: 'credential',
hdr: 'Select Machine Credential',
input_type: "radio"
});
GenerateList.inject(jobTemplatesList, {
mode: 'lookup',
id: 'workflow-jobs-list',
scope: $scope,
input_type: 'radio'
});
GenerateList.inject(projectList, {
mode: 'lookup',
id: 'workflow-project-sync-list',
scope: $scope,
input_type: 'radio'
});
GenerateList.inject(inventorySourcesList, {
mode: 'lookup',
id: 'workflow-inventory-sync-list',
scope: $scope,
input_type: 'radio'
});
});
});
init(); init();
} }

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

@@ -14,7 +14,7 @@ export default [ 'templateUrl',
}, },
restrict: 'E', restrict: 'E',
templateUrl: templateUrl('job-templates/workflow-maker/workflow-maker'), templateUrl: templateUrl('job-templates/workflow-maker/workflow-maker'),
controller: workflowMakerController controller: workflowMakerController,
}; };
} }
]; ];

12
awx/ui/client/src/job-templates/workflow-maker/workflow-maker.partial.html
View File

@@ -60,21 +60,23 @@
<span class="badge List-titleBadge" ng-bind="treeData.data.totalNodes"></span> <span class="badge List-titleBadge" ng-bind="treeData.data.totalNodes"></span>
</div> </div>
</div> </div>
<!--
<workflow-chart tree-data="treeData.data" add-node="startAddNode(parent, betweenTwoNodes)" edit-node="startEditNode(nodeToEdit)" delete-node="startDeleteNode(nodeToDelete)" class="WorkflowMaker-chart"></workflow-chart> <workflow-chart tree-data="treeData.data" add-node="startAddNode(parent, betweenTwoNodes)" edit-node="startEditNode(nodeToEdit)" delete-node="startDeleteNode(nodeToDelete)" class="WorkflowMaker-chart"></workflow-chart>
-->
</div> </div>
<div class="WorkflowMaker-contentRight"> <div class="WorkflowMaker-contentRight">
<div class="WorkflowMaker-formTitle">{{(workflowMakerFormConfig.nodeMode === 'edit' && nodeBeingEdited && nodeBeingEdited.unifiedJobTemplate && nodeBeingEdited.unifiedJobTemplate.name) ? nodeBeingEdited.unifiedJobTemplate.name : "ADD A TEMPLATE"}}</div> <div class="WorkflowMaker-formTitle">{{(workflowMakerFormConfig.nodeMode === 'edit' && nodeBeingEdited && nodeBeingEdited.unifiedJobTemplate && nodeBeingEdited.unifiedJobTemplate.name) ? nodeBeingEdited.unifiedJobTemplate.name : "ADD A TEMPLATE"}}</div>
<div class="WorkflowMaker-formHelp" ng-show="workflowMakerFormConfig.nodeMode === 'idle'">Please hover over a template and click the Add button.</div> <div class="WorkflowMaker-formHelp" ng-show="workflowMakerFormConfig.nodeMode === 'idle'">Please hover over a template and click the Add button.</div>
<div class="WorkflowMaker-form" ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'"> <div class="WorkflowMaker-form" > <!-- ng-show="workflowMakerFormConfig.nodeMode === 'add' || workflowMakerFormConfig.nodeMode === 'edit'" -->
<div class="Form-tabHolder"> <div class="Form-tabHolder">
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'jobs'}" ng-click="toggleFormTab('jobs')">JOBS</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'jobs'}" ng-click="toggleFormTab('jobs')">JOBS</div>
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'project_sync'}" ng-click="toggleFormTab('project_sync')">PROJECT SYNC</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'project_sync'}" ng-click="toggleFormTab('project_sync')">PROJECT SYNC</div>
<div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'inventory_sync'}" ng-click="toggleFormTab('inventory_sync')">INVENTORY SYNC</div> <div class="Form-tab" ng-class="{'is-selected': workflowMakerFormConfig.activeTab === 'inventory_sync'}" ng-click="toggleFormTab('inventory_sync')">INVENTORY SYNC</div>
</div> </div>
<div class="WorkflowMaker-formLists"> <div class="WorkflowMaker-formLists">
<div id="workflow-jobs-list" ng-show="workflowMakerFormConfig.activeTab === 'jobs'"></div> <div id="workflow-jobs-list" ui-view="jobsTemplateList"></div> <!-- ng-show="workflowMakerFormConfig.activeTab === 'jobs'" -->
<div id="workflow-project-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'"></div> <div id="workflow-project-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'" ui-view="projectSyncList"></div>
<div id="workflow-inventory-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'"></div> <div id="workflow-inventory-sync-list" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'" ui-view="inventorySyncList"></div>
</div> </div>
<div ng-show="showTypeOptions" class="WorkflowMaker-formElement"> <div ng-show="showTypeOptions" class="WorkflowMaker-formElement">
<label class="Form-inputLabelContainer"> <label class="Form-inputLabelContainer">
@@ -95,7 +97,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="workflow-maker-form"></div> <div id="workflow-maker-form" ui-view="workflowForm"></div>
</div> </div>
</div> </div>
</div> </div>

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -178,7 +178,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
// html = GenerateForm.buildHTML(JobVarsPromptForm, { mode: 'edit', modal: true, scope: scope }); // html = GenerateForm.buildHTML(JobVarsPromptForm, { mode: 'edit', modal: true, scope: scope });
this.mode = options.mode; this.mode = options.mode;
this.modal = (options.modal) ? true : false; //this.modal = (options.modal) ? true : false;
this.setForm(form); this.setForm(form);
return this.build(options); return this.build(options);
}, },