External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 08:37:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Sets the timezone to the api/v2/schedule/:id -> data.timezone

Browse Source 
and moving the data calls from the controller to the route resolve
This commit is contained in:
Jared Tabor
2018-05-02 16:59:14 -07:00
parent 441e5cc9c2
commit 33d4c97156
4 changed files with 363 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/management-jobs/scheduler/main.js
View File

@@ -10,6 +10,8 @@ import controller from '../../scheduler/schedulerList.controller';
import addController from '../../scheduler/schedulerAdd.controller';
import editController from '../../scheduler/schedulerEdit.controller';
import { N_ } from '../../i18n';
import editScheduleResolve from '../../scheduler/editSchedule.resolve';
export default
angular.module('managementJobScheduler', [])
@@ -99,6 +101,7 @@ angular.module('managementJobScheduler', [])
templateUrl: templateUrl('management-jobs/scheduler/schedulerForm'),
controller: 'managementJobEditController'
}
}
},
resolve: editScheduleResolve()
});
}]);

39
awx/ui/client/src/scheduler/editSchedule.resolve.js Normal file
View File

@@ -0,0 +1,39 @@
function editScheduleResolve () {
const resolve = {
scheduleResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
(Rest, $stateParams, GetBasePath, ProcessErrors) => {
var path = `${GetBasePath('schedules')}${parseInt($stateParams.schedule_id)}/`;
// const path = GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
Rest.setUrl(path);
return Rest.get()
.then(function(data) {
return (data.data);
}).catch(function(response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get schedule info. GET returned status: ' +
response.status
});
});
}
],
timezonesResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
(Rest, $stateParams, GetBasePath, ProcessErrors) => {
var path = `${GetBasePath('schedules')}/zoneinfo`;
Rest.setUrl(path);
return Rest.get()
.then(function(data) {
return (data.data);
}).catch(function(response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get zoneinfo. GET returned status: ' +
response.status
});
});
}
]
};
return resolve;
}
export default editScheduleResolve;

10
awx/ui/client/src/scheduler/main.js
View File

@@ -16,6 +16,7 @@ import SchedulePost from './factories/schedule-post.factory';
import ToggleSchedule from './factories/toggle-schedule.factory';
import SchedulesList from './schedules.list';
import ScheduledJobsList from './scheduled-jobs.list';
import editScheduleResolve from './editSchedule.resolve';
export default
angular.module('scheduler', [])
@@ -121,7 +122,8 @@ export default
ncyBreadcrumb: {
parent: 'jobTemplateSchedules',
label: '{{schedule_obj.name}}'
}
},
resolve: editScheduleResolve()
});
// workflows
@@ -212,7 +214,8 @@ export default
ncyBreadcrumb: {
parent: 'workflowJobTemplateSchedules',
label: '{{schedule_obj.name}}'
}
},
resolve: editScheduleResolve()
});
// projects
$stateExtender.addState({
@@ -301,7 +304,8 @@ export default
controller: 'schedulerEditController',
templateUrl: templateUrl("scheduler/schedulerForm"),
}
}
},
resolve: editScheduleResolve()
});
// upcoming scheduled jobs
$stateExtender.addState({

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

@@ -1,11 +1,11 @@
export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', 'moment',
'$rootScope', '$http', 'CreateSelect2', 'ParseTypeChange', 'ParentObject', 'ProcessErrors', 'Rest',
'GetBasePath', 'SchedulerInit', 'SchedulePost', 'JobTemplateModel', '$q', 'Empty', 'PromptService', 'RRuleToAPI',
'WorkflowJobTemplateModel', 'TemplatesStrings',
'WorkflowJobTemplateModel', 'TemplatesStrings', 'scheduleResolve', 'timezonesResolve',
function($filter, $state, $stateParams, Wait, $scope, moment,
$rootScope, $http, CreateSelect2, ParseTypeChange, ParentObject, ProcessErrors, Rest,
GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI,
WorkflowJobTemplate, TemplatesStrings
WorkflowJobTemplate, TemplatesStrings, scheduleResolve, timezonesResolve
) {
let schedule, scheduler, scheduleCredentials = [];
@@ -118,41 +118,37 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
Wait('start');
// Get the existing record
Rest.setUrl(GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
Rest.get()
.then(({data}) => {
schedule = data;
//sets the timezone dropdown to the timezone specified by the API
function setTimezone () {
$scope.schedulerTimeZone = _.find($scope.timeZones, function(x) {
return x.name === scheduleResolve.timezone;
});
}
function init() {
schedule = scheduleResolve;
try {
schedule.extra_data = JSON.parse(schedule.extra_data);
} catch(e) {
// do nothing
}
$scope.extraVars = (data.extra_data === '' || _.isEmpty(data.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(data.extra_data);
$scope.extraVars = (scheduleResolve.extra_data === '' || _.isEmpty(scheduleResolve.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(scheduleResolve.extra_data);
if (_.has(schedule, 'summary_fields.unified_job_template.unified_job_type') &&
schedule.summary_fields.unified_job_template.unified_job_type === 'system_job'){
$scope.cleanupJob = true;
}
$scope.schedule_obj = data;
$scope.schedule_obj = scheduleResolve;
$('#form-container').empty();
scheduler = SchedulerInit({ scope: $scope, requireFutureStartTime: false });
$http.get('/api/v2/schedules/zoneinfo/').then(({data}) => {
scheduler.scope.timeZones = data;
scheduler.scope.schedulerTimeZone = _.find(data, function(x) {
let tz = $scope.schedule_obj.rrule.match(/TZID=\s*(.*?)\s*:/);
if (_.has(tz, '1')) {
return x.name === tz[1];
} else {
return false;
}
scheduler.scope.timeZones = timezonesResolve;
setTimezone();
});
});
scheduler.inject('form-container', false);
scheduler.injectDetail('occurrences', false);
@@ -164,6 +160,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
$scope.$on("htmlDetailReady", function() {
scheduler.setRRule(schedule.rrule);
scheduler.setName(schedule.name);
setTimezone();
$scope.hideForm = false;
$scope.$watchGroup(["schedulerName",
@@ -202,7 +199,8 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
$scope.showRRuleDetail = false;
scheduler.setRRule(schedule.rrule);
scheduler.setName(schedule.name);
scheduler.scope.timeZones = timezonesResolve;
scheduler.scope.schedulerTimeZone = scheduleResolve.timezone;
if ($scope.cleanupJob){
$scope.schedulerPurgeDays = Number(schedule.extra_data.days);
}
@@ -211,7 +209,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let jobTemplate = new JobTemplate();
Rest.setUrl(data.related.credentials);
Rest.setUrl(scheduleResolve.related.credentials);
$q.all([jobTemplate.optionsLaunch(ParentObject.id), jobTemplate.getLaunch(ParentObject.id), Rest.get()])
.then((responses) => {
@@ -242,7 +240,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let prompts = PromptService.processPromptValues({
launchConf: responses[1].data,
launchOptions: responses[0].data,
currentValues: data
currentValues: scheduleResolve
});
let defaultCredsWithoutOverrides = [];
@@ -299,7 +297,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
// Promptable variables will happen in the schedule form
launchConf.ignore_ask_variables = true;
if (launchConf.ask_inventory_on_launch && !_.has(launchConf, 'defaults.inventory') && !_.has(data, 'summary_fields.inventory')) {
if (launchConf.ask_inventory_on_launch && !_.has(launchConf, 'defaults.inventory') && !_.has(scheduleResolve, 'summary_fields.inventory')) {
$scope.promptModalMissingReqFields = true;
}
@@ -310,7 +308,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let processed = PromptService.processSurveyQuestions({
surveyQuestions: surveyQuestionRes.data.spec,
extra_data: _.cloneDeep(data.extra_data)
extra_data: _.cloneDeep(scheduleResolve.extra_data)
});
$scope.missingSurveyValue = processed.missingSurveyValue;
@@ -373,7 +371,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let prompts = PromptService.processPromptValues({
launchConf: responses[1].data,
launchOptions: responses[0].data,
currentValues: data
currentValues: scheduleResolve
});
if(!launchConf.survey_enabled) {
@@ -388,7 +386,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
let processed = PromptService.processSurveyQuestions({
surveyQuestions: surveyQuestionRes.data.spec,
extra_data: _.cloneDeep(data.extra_data)
extra_data: _.cloneDeep(scheduleResolve.extra_data)
});
$scope.missingSurveyValue = processed.missingSurveyValue;
@@ -444,11 +442,8 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
});
}
}
})
.catch(({data, status}) => {
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
msg: 'Failed to retrieve schedule ' + parseInt($stateParams.schedule_id) + ' GET returned: ' + status });
});
}
init();
callSelect2();
}];