shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Code Releases Activity

Adds prompting to workflow schedules when a survey is present on the wfjt

Browse Source
This commit is contained in:
mabashian 2018-04-23 15:53:16 -04:00
parent e4ffdeb0b5
commit 6241290733
2 changed files with 144 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
awx/ui/client/src/scheduler/schedulerAdd.controller.js
View File

@ -8,10 +8,13 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
'$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'GetBasePath',
'Rest', 'ParentObject', 'JobTemplateModel', '$q', 'Empty', 'SchedulePost',
'ProcessErrors', 'SchedulerInit', '$location', 'PromptService', 'RRuleToAPI', 'moment',
'WorkflowJobTemplateModel',
function($filter, $state, $stateParams, $http, Wait,
$scope, $rootScope, CreateSelect2, ParseTypeChange, GetBasePath,
Rest, ParentObject, JobTemplate, $q, Empty, SchedulePost,
ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI, moment) {
ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI, moment,
WorkflowJobTemplate
) {
var base = $scope.base || $location.path().replace(/^\//, '').split('/')[0],
scheduler,
@ -200,22 +203,74 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
}
}
});
}
else if ($state.current.name === 'workflowJobTemplateSchedules.add'){
$scope.parseType = 'yaml';
// grab any existing extra_vars from parent workflow_job_template
let defaultUrl = GetBasePath('workflow_job_templates') + $stateParams.id + '/';
Rest.setUrl(defaultUrl);
Rest.get().then(function(res){
var data = res.data.extra_vars;
$scope.extraVars = data === '' ? '---' : data;
ParseTypeChange({
scope: $scope,
variable: 'extraVars',
parse_variable: 'parseType',
field_id: 'SchedulerForm-extraVars'
} else if ($state.current.name === 'workflowJobTemplateSchedules.add'){
let workflowJobTemplate = new WorkflowJobTemplate();
$q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
.then((responses) => {
let launchConf = responses[1].data;
let watchForPromptChanges = () => {
$scope.$watch('missingSurveyValue', function() {
$scope.promptModalMissingReqFields = $scope.missingSurveyValue ? true : false;
});
};
if(!launchConf.survey_enabled) {
$scope.showPromptButton = false;
} else {
$scope.showPromptButton = true;
if(launchConf.survey_enabled) {
// go out and get the survey questions
workflowJobTemplate.getSurveyQuestions(ParentObject.id)
.then((surveyQuestionRes) => {
let processed = PromptService.processSurveyQuestions({
surveyQuestions: surveyQuestionRes.data.spec
});
$scope.missingSurveyValue = processed.missingSurveyValue;
$scope.promptData = {
launchConf: responses[1].data,
launchOptions: responses[0].data,
surveyQuestions: processed.surveyQuestions,
template: ParentObject.id,
prompts: PromptService.processPromptValues({
launchConf: responses[1].data,
launchOptions: responses[0].data
}),
};
$scope.$watch('promptData.surveyQuestions', () => {
let missingSurveyValue = false;
_.each($scope.promptData.surveyQuestions, (question) => {
if(question.required && (Empty(question.model) || question.model === [])) {
missingSurveyValue = true;
}
});
$scope.missingSurveyValue = missingSurveyValue;
}, true);
watchForPromptChanges();
});
}
else {
$scope.promptData = {
launchConf: responses[1].data,
launchOptions: responses[0].data,
template: ParentObject.id,
prompts: PromptService.processPromptValues({
launchConf: responses[1].data,
launchOptions: responses[0].data
}),
};
watchForPromptChanges();
}
}
});
});
}
else if ($state.current.name === 'projectSchedules.add'){
$scope.noVars = true;

74
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@ -1,9 +1,12 @@
export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', 'moment',
'$rootScope', '$http', 'CreateSelect2', 'ParseTypeChange', 'ParentObject', 'ProcessErrors', 'Rest',
'GetBasePath', 'SchedulerInit', 'SchedulePost', 'JobTemplateModel', '$q', 'Empty', 'PromptService', 'RRuleToAPI',
'WorkflowJobTemplateModel',
function($filter, $state, $stateParams, Wait, $scope, moment,
$rootScope, $http, CreateSelect2, ParseTypeChange, ParentObject, ProcessErrors, Rest,
GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI) {
GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI,
WorkflowJobTemplate
) {
let schedule, scheduler, scheduleCredentials = [];
@ -396,6 +399,75 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
}
}
});
} else if ($state.current.name === 'workflowJobTemplateSchedules.edit') {
let workflowJobTemplate = new WorkflowJobTemplate();
$q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
.then((responses) => {
let launchOptions = responses[0].data,
launchConf = responses[1].data;
let watchForPromptChanges = () => {
$scope.$watch('missingSurveyValue', function() {
$scope.promptModalMissingReqFields = $scope.missingSurveyValue ? true : false;
});
};
let prompts = PromptService.processPromptValues({
launchConf: responses[1].data,
launchOptions: responses[0].data,
currentValues: data
});
if(!launchConf.survey_enabled) {
$scope.showPromptButton = false;
} else {
$scope.showPromptButton = true;
if(responses[1].data.survey_enabled) {
// go out and get the survey questions
workflowJobTemplate.getSurveyQuestions(ParentObject.id)
.then((surveyQuestionRes) => {
let processed = PromptService.processSurveyQuestions({
surveyQuestions: surveyQuestionRes.data.spec,
extra_data: _.cloneDeep(data.extra_data)
});
$scope.missingSurveyValue = processed.missingSurveyValue;
$scope.promptData = {
launchConf: launchConf,
launchOptions: launchOptions,
prompts: prompts,
surveyQuestions: surveyQuestionRes.data.spec,
template: ParentObject.id
};
$scope.$watch('promptData.surveyQuestions', () => {
let missingSurveyValue = false;
_.each($scope.promptData.surveyQuestions, (question) => {
if(question.required && (Empty(question.model) || question.model === [])) {
missingSurveyValue = true;
}
});
$scope.missingSurveyValue = missingSurveyValue;
}, true);
watchForPromptChanges();
});
}
else {
$scope.promptData = {
launchConf: launchConf,
launchOptions: launchOptions,
prompts: prompts,
template: ParentObject.id
};
watchForPromptChanges();
}
}
});
}
// extra_data field is not manifested in the UI when scheduling a Management Job