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

Added cancel job logic to the jobs list

Browse Source
This commit is contained in:
mabashian 2018-04-11 16:53:03 -04:00
parent 4cc84d020d
commit fab3f3d592
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -118,6 +118,48 @@ function ListJobsController (
actionText: 'DELETE'
});
};
vm.cancelJob = (job) => {
const action = () => {
$('#prompt-modal').modal('hide');
Wait('start');
Rest.setUrl(job.related.cancel);
Rest.post()
.then(() => {
let reloadListStateParams = null;
if ($scope.jobs.length === 1 && $state.params.job_search &&
!_.isEmpty($state.params.job_search.page) &&
$state.params.job_search.page !== '1') {
const page = `${(parseInt(reloadListStateParams
.job_search.page, 10) - 1)}`;
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.job_search.page = page;
}
$state.go('.', reloadListStateParams, { reload: true });
})
.catch(({ data, status }) => {
ProcessErrors($scope, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${job.url}`, status })
});
})
.finally(() => {
Wait('stop');
});
};
const deleteModalBody = `<div class="Prompt-bodyQuery">${strings.get('cancelJob.SUBMIT_REQUEST')}</div>`;
Prompt({
hdr: strings.get('cancelJob.HEADER'),
resourceName: $filter('sanitize')(job.name),
body: deleteModalBody,
action,
actionText: strings.get('CANCEL')
});
};
}
ListJobsController.$inject = [

13
awx/ui/client/features/jobs/jobsList.view.html
View File

@ -71,8 +71,19 @@
<at-relaunch job="job"
ng-show="job.summary_fields.user_capabilities.start">
</at-relaunch>
<at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)"
ng-show="job.summary_fields.user_capabilities.start &&
(job.status === 'new' ||
job.status === 'pending' ||
job.status === 'waiting' ||
job.status === 'running')">
</at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)"
ng-show="job.summary_fields.user_capabilities.delete">
ng-show="job.summary_fields.user_capabilities.delete &&
!(job.status === 'new' ||
job.status === 'pending' ||
job.status === 'waiting' ||
job.status === 'running')">
</at-row-action>
</div>
</at-row>

5
awx/ui/client/lib/services/base-string.service.js
View File

@ -76,6 +76,11 @@ function BaseStringService (namespace) {
CONFIRM: resourceType => t.s('Are you sure you want to delete this {{ resourceType }}?', { resourceType })
};
this.cancelJob = {
HEADER: t.s('Cancel'),
SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?')
};
this.error = {
HEADER: t.s('Error!'),
CALL: ({ path, action, status }) => t.s('Call to {{ path }} failed. {{ action }} returned status: {{ status }}.', { path, action, status }),