diff --git a/awx/ui/client/features/index.js b/awx/ui/client/features/index.js
index 01216e575f..763894c93c 100644
--- a/awx/ui/client/features/index.js
+++ b/awx/ui/client/features/index.js
@@ -6,6 +6,7 @@ import atFeaturesApplications from '~features/applications';
import atFeaturesCredentials from '~features/credentials';
import atFeaturesTemplates from '~features/templates';
import atFeaturesUsers from '~features/users';
+import atFeaturesJobs from '~features/jobs';
const MODULE_NAME = 'at.features';
@@ -16,7 +17,8 @@ angular.module(MODULE_NAME, [
atFeaturesApplications,
atFeaturesCredentials,
atFeaturesTemplates,
- atFeaturesUsers
+ atFeaturesUsers,
+ atFeaturesJobs
]);
export default MODULE_NAME;
diff --git a/awx/ui/client/features/jobs/index.js b/awx/ui/client/features/jobs/index.js
new file mode 100644
index 0000000000..c26f2b9d8f
--- /dev/null
+++ b/awx/ui/client/features/jobs/index.js
@@ -0,0 +1,13 @@
+import JobsStrings from './jobs.strings';
+import jobsRoute from './routes/jobs.route';
+
+const MODULE_NAME = 'at.features.jobs';
+
+angular
+ .module(MODULE_NAME, [])
+ .service('JobsStrings', JobsStrings)
+ .run(['$stateExtender', ($stateExtender) => {
+ $stateExtender.addState(jobsRoute);
+ }]);
+
+export default MODULE_NAME;
diff --git a/awx/ui/client/features/jobs/index.view.html b/awx/ui/client/features/jobs/index.view.html
new file mode 100644
index 0000000000..054e26c2ba
--- /dev/null
+++ b/awx/ui/client/features/jobs/index.view.html
@@ -0,0 +1,19 @@
+
diff --git a/awx/ui/client/features/jobs/jobs.strings.js b/awx/ui/client/features/jobs/jobs.strings.js
new file mode 100644
index 0000000000..a21c2b62e9
--- /dev/null
+++ b/awx/ui/client/features/jobs/jobs.strings.js
@@ -0,0 +1,20 @@
+function JobsStrings (BaseString) {
+ BaseString.call(this, 'jobs');
+
+ const { t } = this;
+ const ns = this.jobs;
+
+ ns.list = {
+ ROW_ITEM_LABEL_STARTED: t.s('Started'),
+ ROW_ITEM_LABEL_FINISHED: t.s('Finished'),
+ ROW_ITEM_LABEL_LAUNCHED_BY: t.s('Launched By'),
+ ROW_ITEM_LABEL_JOB_TEMPLATE: t.s('Job Template'),
+ ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'),
+ ROW_ITEM_LABEL_PROJECT: t.s('Project'),
+ ROW_ITEM_LABEL_CREDENTIALS: t.s('Credentials'),
+ };
+}
+
+JobsStrings.$inject = ['BaseStringService'];
+
+export default JobsStrings;
diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
new file mode 100644
index 0000000000..b78a1b77b6
--- /dev/null
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -0,0 +1,137 @@
+/** ***********************************************
+ * Copyright (c) 2018 Ansible, Inc.
+ *
+ * All Rights Reserved
+ ************************************************ */
+const mapChoices = choices => Object
+ .assign(...choices.map(([k, v]) => ({ [k]: v })));
+
+function ListJobsController (
+ $scope,
+ $state,
+ Dataset,
+ resolvedModels,
+ strings,
+ qs,
+ Prompt,
+ $filter,
+ ProcessErrors,
+ Wait,
+ Rest
+) {
+ const vm = this || {};
+ const [unifiedJob] = resolvedModels;
+
+ vm.strings = strings;
+
+ // smart-search
+ const name = 'jobs';
+ const iterator = 'job';
+ const key = 'job_dataset';
+
+ $scope.list = { iterator, name };
+ $scope.collection = { iterator, basePath: 'unified_jobs' };
+ $scope[key] = Dataset.data;
+ $scope[name] = Dataset.data.results;
+ $scope.$on('updateDataset', (e, dataset) => {
+ $scope[key] = dataset;
+ $scope[name] = dataset.results;
+ });
+ $scope.$on('ws-jobs', () => {
+ qs.search(unifiedJob.path, $state.params.job_search)
+ .then(({ data }) => {
+ $scope.$emit('updateDataset', data);
+ });
+ });
+
+ vm.jobTypes = mapChoices(unifiedJob
+ .options('actions.GET.type.choices'));
+
+ vm.getLink = ({ type, id }) => {
+ let link;
+
+ switch (type) {
+ case 'job':
+ link = `/#/jobs/${id}`;
+ break;
+ case 'ad_hoc_command':
+ link = `/#/ad_hoc_commands/${id}`;
+ break;
+ case 'system_job':
+ link = `/#/management_jobs/${id}`;
+ break;
+ case 'project_update':
+ link = `/#/scm_update/${id}`;
+ break;
+ case 'inventory_update':
+ link = `/#/inventory_sync/${id}`;
+ break;
+ case 'workflow_job':
+ link = `/#/workflows/${id}`;
+ break;
+ default:
+ link = '';
+ break;
+ }
+
+ return link;
+ };
+
+ vm.deleteJob = (job) => {
+ const action = () => {
+ $('#prompt-modal').modal('hide');
+ Wait('start');
+ Rest.setUrl(job.url);
+ Rest.destroy()
+ .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 = `${strings.get('deleteResource.CONFIRM', 'job')}
`;
+
+ Prompt({
+ hdr: strings.get('deleteResource.HEADER'),
+ resourceName: $filter('sanitize')(job.name),
+ body: deleteModalBody,
+ action,
+ actionText: 'DELETE'
+ });
+ };
+}
+
+ListJobsController.$inject = [
+ '$scope',
+ '$state',
+ 'Dataset',
+ 'resolvedModels',
+ 'JobsStrings',
+ 'QuerySet',
+ 'Prompt',
+ '$filter',
+ 'ProcessErrors',
+ 'Wait',
+ 'Rest'
+];
+
+export default ListJobsController;
diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html
new file mode 100644
index 0000000000..6031a956ab
--- /dev/null
+++ b/awx/ui/client/features/jobs/jobsList.view.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,4 +49,4 @@
{{ tag.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
" + i18n._("Are you sure you want to submit the request to cancel this job?") + "
";
- var deleteBody = "" + i18n._("Are you sure you want to delete this job?") + "
";
- Prompt({
- hdr: hdr,
- resourceName: `#${job.id} ` + $filter('sanitize')(job.name),
- body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
- action: action,
- actionText: (action_label === 'cancel' || job.status === 'new') ? i18n._("OK") : i18n._("DELETE")
- });
- });
-
- if (action_label === 'cancel') {
- Rest.setUrl(url);
- Rest.get()
- .then(({data}) => {
- if (data.can_cancel) {
- scope.$emit('CancelJob');
- }
- else {
- scope.$emit('CancelNotAllowed');
- }
- })
- .catch(({data, status}) => {
- ProcessErrors(scope, data, status, null, { hdr: 'Error!', msg: 'Call to ' + url +
- ' failed. GET returned: ' + status });
- });
- }
- else {
- scope.$emit('CancelJob');
- }
- };
- }
-
-DeleteJob.$inject =
- [ '$state', 'Find', 'Rest', 'Wait',
- 'ProcessErrors', 'Prompt', 'Alert', '$filter', 'i18n'
- ];
diff --git a/awx/ui/client/src/jobs/jobs-list.controller.js b/awx/ui/client/src/jobs/jobs-list.controller.js
deleted file mode 100644
index 9707c87d87..0000000000
--- a/awx/ui/client/src/jobs/jobs-list.controller.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-/**
- * @ngdoc function
- * @name controllers.function:Jobs
- * @description This controller's for the jobs page
- */
-
- export default ['$state', '$rootScope', '$scope', '$stateParams', 'Find', 'DeleteJob',
- 'GetBasePath', 'Dataset', 'QuerySet', 'ListDefinition', '$interpolate',
- function($state, $rootScope, $scope, $stateParams, Find, DeleteJob,
- GetBasePath, Dataset, qs, ListDefinition, $interpolate) {
-
- var list = ListDefinition;
-
- init();
-
- function init() {
- // search init
- $scope.list = list;
- $scope[`${list.iterator}_dataset`] = Dataset.data;
- $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
-
- $scope.showJobType = true;
- }
-
- $scope.$on(`${list.iterator}_options`, function(event, data){
- $scope.options = data.data.actions.GET;
- optionsRequestDataProcessing();
- });
-
- $scope.$watchCollection(`${$scope.list.name}`, function() {
- optionsRequestDataProcessing();
- }
- );
-
- // iterate over the list and add fields like type label, after the
- // OPTIONS request returns, or the list is sorted/paginated/searched
- function optionsRequestDataProcessing(){
-
- if($scope[list.name] && $scope[list.name].length > 0) {
- $scope[list.name].forEach(function(item, item_idx) {
- var itm = $scope[list.name][item_idx];
-
- switch (item.type) {
- case 'job':
- item.linkToDetails = `jobResult({id: ${item.id}})`;
- break;
- case 'ad_hoc_command':
- item.linkToDetails = `adHocJobStdout({id: ${item.id}})`;
- break;
- case 'system_job':
- item.linkToDetails = `managementJobStdout({id: ${item.id}})`;
- break;
- case 'project_update':
- item.linkToDetails = `scmUpdateStdout({id: ${item.id}})`;
- break;
- case 'inventory_update':
- item.linkToDetails = `inventorySyncStdout({id: ${item.id}})`;
- break;
- case 'workflow_job':
- item.linkToDetails = `workflowResults({id: ${item.id}})`;
- break;
- }
-
- if(item.summary_fields && item.summary_fields.source_workflow_job &&
- item.summary_fields.source_workflow_job.id){
- item.workflow_result_link = `/#/workflows/${item.summary_fields.source_workflow_job.id}`;
- }
-
- // Set the item type label
- if (list.fields.type && $scope.options &&
- $scope.options.hasOwnProperty('type')) {
- $scope.options.type.choices.forEach(function(choice) {
- if (choice[0] === item.type) {
- itm.type_label = choice[1];
- }
- });
- }
- buildTooltips(itm);
- });
- }
- }
- function buildTooltips(job) {
- job.status_tip = 'Job ' + job.status + ". Click for details.";
- }
-
- $scope.deleteJob = function(id) {
- DeleteJob({ scope: $scope, id: id });
- };
-
- $scope.viewjobResults = function(job) {
-
- var goTojobResults = function(state) {
- $state.go(state, { id: job.id }, { reload: true });
- };
- switch (job.type) {
- case 'job':
- goTojobResults('jobResult');
- break;
- case 'ad_hoc_command':
- goTojobResults('adHocJobStdout');
- break;
- case 'system_job':
- goTojobResults('managementJobStdout');
- break;
- case 'project_update':
- goTojobResults('scmUpdateStdout');
- break;
- case 'inventory_update':
- goTojobResults('inventorySyncStdout');
- break;
- case 'workflow_job':
- goTojobResults('workflowResults');
- break;
- }
-
- };
-
- $scope.$on('ws-jobs', function(){
- let path;
- if (GetBasePath(list.basePath) || GetBasePath(list.name)) {
- path = GetBasePath(list.basePath) || GetBasePath(list.name);
- } else {
- // completed jobs base path involves $stateParams
- let interpolator = $interpolate(list.basePath);
- path = interpolator({ $rootScope: $rootScope, $stateParams: $stateParams });
- }
- qs.search(path, $state.params[`${list.iterator}_search`])
- .then(function(searchResponse) {
- $scope[`${list.iterator}_dataset`] = searchResponse.data;
- $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
- });
- });
-
- $scope.$on('ws-schedules', function(){
- $state.reload();
- });
-}];
diff --git a/awx/ui/client/src/jobs/jobs.partial.html b/awx/ui/client/src/jobs/jobs.partial.html
deleted file mode 100644
index 46f7b09761..0000000000
--- a/awx/ui/client/src/jobs/jobs.partial.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
diff --git a/awx/ui/client/src/jobs/jobs.route.js b/awx/ui/client/src/jobs/jobs.route.js
deleted file mode 100644
index 27d6631153..0000000000
--- a/awx/ui/client/src/jobs/jobs.route.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************
- * Copyright (c) 2016 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
- import { N_ } from '../i18n';
- import {templateUrl} from '../shared/template-url/template-url.factory';
-
-export default {
- searchPrefix: 'job',
- name: 'jobs',
- url: '/jobs',
- ncyBreadcrumb: {
- label: N_("JOBS")
- },
- params: {
- job_search: {
- value: {
- not__launch_type: 'sync',
- order_by: '-finished'
- },
- dynamic: true,
- squash: false
- }
- },
- data: {
- socket: {
- "groups": {
- "jobs": ["status_changed"],
- "schedules": ["changed"]
- }
- }
- },
- resolve: {
- Dataset: ['AllJobsList', 'QuerySet', '$stateParams', 'GetBasePath', (list, qs, $stateParams, GetBasePath) => {
- let path = GetBasePath(list.basePath) || GetBasePath(list.name);
- return qs.search(path, $stateParams[`${list.iterator}_search`]);
- }],
- ListDefinition: ['AllJobsList', (list) => {
- return list;
- }]
- },
- views: {
- '@': {
- templateUrl: templateUrl('jobs/jobs')
- },
- 'list@jobs': {
- templateProvider: function(AllJobsList, generateList) {
- let html = generateList.build({
- list: AllJobsList,
- mode: 'edit'
- });
- return html;
- },
- controller: 'JobsList'
- }
- }
-};
diff --git a/awx/ui/client/src/jobs/main.js b/awx/ui/client/src/jobs/main.js
deleted file mode 100644
index 7aaf97035c..0000000000
--- a/awx/ui/client/src/jobs/main.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*************************************************
- * Copyright (c) 2017 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-import jobsList from './jobs-list.controller';
-import jobsRoute from './jobs.route';
-import DeleteJob from './factories/delete-job.factory';
-import AllJobsList from './all-jobs.list';
-
-export default
- angular.module('JobsModule', [])
- .run(['$stateExtender', function($stateExtender) {
- $stateExtender.addState(jobsRoute);
- }])
- .controller('JobsList', jobsList)
- .factory('DeleteJob', DeleteJob)
- .factory('AllJobsList', AllJobsList);
diff --git a/awx/ui/client/src/management-jobs/main.js b/awx/ui/client/src/management-jobs/main.js
index 12d25fbc6b..ef291e1ee5 100644
--- a/awx/ui/client/src/management-jobs/main.js
+++ b/awx/ui/client/src/management-jobs/main.js
@@ -6,7 +6,6 @@
import managementJobsCard from './card/main';
import managementJobsScheduler from './scheduler/main';
-import list from './management-jobs.list';
import managementJobsNotifications from './notifications/main';
export default
@@ -14,5 +13,4 @@ export default
managementJobsCard.name,
managementJobsScheduler.name,
managementJobsNotifications.name
- ])
- .factory('managementJobsListObject', list);
+ ]);
diff --git a/awx/ui/client/src/management-jobs/management-jobs.list.js b/awx/ui/client/src/management-jobs/management-jobs.list.js
deleted file mode 100644
index 7ad1af547a..0000000000
--- a/awx/ui/client/src/management-jobs/management-jobs.list.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export default function(){
- return {
- name: 'configure_jobs',
- iterator: 'configure_job',
- index: false,
- hover: true,
- listTitle: 'MANAGEMENT JOBS',
-
- fields: {
- name: {
- label: 'Name',
- columnClass: 'col-sm-4 col-xs-4',
- awToolTip: '{{configure_job.description | sanitize}}',
- dataPlacement: 'top'
- }
- },
- actions: {
-
- },
- fieldActions: {
- submit: {
- label: 'Launch',
- mode: 'all',
- ngClick: 'submitJob(configure_job.id, configure_job.name)',
- awToolTip: 'Start a job using this template',
- dataPlacement: 'top'
- },
- schedule: {
- label: 'Schedule',
- mode: 'all',
- ngClick: 'configureSchedule()',
- awToolTip: 'Schedule job template runs',
- dataPlacement: 'top',
- }
- }
- };
-}
diff --git a/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js b/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
deleted file mode 100644
index 582f806b89..0000000000
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { PortalModeJobsController } from '../portal-mode-jobs.controller';
-
-// Using multiple named views requires a parent layout
-// https://github.com/angular-ui/ui-router/wiki/Multiple-Named-Views
-export default {
- name: 'portalMode.allJobs',
- url: '/alljobs?{job_search:queryset}',
- ncyBreadcrumb: {
- skip: true
- },
- params: {
- job_search: {
- value: {
- page_size: '20',
- order_by: '-finished'
- },
- dynamic: true
- }
- },
- data: {
- socket: {
- "groups": {
- "jobs": ["status_changed"]
- }
- }
- },
- views: {
- 'jobs@portalMode': {
- templateProvider: function(PortalJobsList, generateList) {
- let html = generateList.build({
- list: PortalJobsList,
- mode: 'edit'
- });
- return html;
- },
- controller: PortalModeJobsController
- }
- },
- resolve: {
- jobsDataset: ['PortalJobsList', 'QuerySet', '$rootScope', '$stateParams', 'GetBasePath',
- function(list, qs, $rootScope, $stateParams, GetBasePath) {
- let path = GetBasePath(list.basePath) || GetBasePath(list.name);
- return $rootScope.loginConfig.promise.then(() => {
- return qs.search(path, $stateParams[`${list.iterator}_search`]);
- });
- }
- ]
- }
-};
diff --git a/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js b/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
deleted file mode 100644
index 9d5c0382f3..0000000000
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { PortalModeJobsController } from '../portal-mode-jobs.controller';
-
-// Using multiple named views requires a parent layout
-// https://github.com/angular-ui/ui-router/wiki/Multiple-Named-Views
-export default {
- name: 'portalMode.myJobs',
- url: '/myjobs?{job_search:queryset}',
- ncyBreadcrumb: {
- skip: true
- },
- params: {
- job_search: {
- value: {
- page_size: '20',
- order_by: '-finished',
- created_by: null
- },
- dynamic: true
- }
- },
- data: {
- socket: {
- "groups": {
- "jobs": ["status_changed"]
- }
- }
- },
- views: {
- 'jobs@portalMode': {
- templateProvider: function(PortalJobsList, generateList) {
- let html = generateList.build({
- list: PortalJobsList,
- mode: 'edit'
- });
- return html;
- },
- controller: PortalModeJobsController
- }
- },
- resolve: {
- jobsDataset: ['PortalJobsList', 'QuerySet', '$rootScope', '$stateParams', 'GetBasePath',
- function(list, qs, $rootScope, $stateParams, GetBasePath) {
- let path = GetBasePath(list.basePath) || GetBasePath(list.name);
- return $rootScope.loginConfig.promise.then(() => {
- $stateParams[`${list.iterator}_search`].created_by = $rootScope.current_user.id;
- return qs.search(path, $stateParams[`${list.iterator}_search`]);
- });
- }
- ]
- }
-};
diff --git a/awx/ui/client/src/portal-mode/main.js b/awx/ui/client/src/portal-mode/main.js
index a88d3f86b9..e4e1dc2a2c 100644
--- a/awx/ui/client/src/portal-mode/main.js
+++ b/awx/ui/client/src/portal-mode/main.js
@@ -5,17 +5,15 @@
*************************************************/
import route from './portal-mode.route';
-import myJobsRoute from './jobs/portal-mode-my-jobs.route';
-import allJobsRoute from './jobs/portal-mode-all-jobs.route';
-import PortalJobsList from './portal-jobs.list';
+import myJobsRoute from '~features/jobs/routes/portalModeMyJobs.route.js';
+import allJobsRoute from '~features/jobs/routes/portalModeAllJobs.route.js';
import PortalJobTemplateList from './portal-job-templates.list';
export default
angular.module('portalMode', [])
- .factory('PortalJobsList', PortalJobsList)
.factory('PortalJobTemplateList', PortalJobTemplateList)
.run(['$stateExtender', function($stateExtender){
- $stateExtender.addState(route);
- $stateExtender.addState(myJobsRoute);
- $stateExtender.addState(allJobsRoute);
+ $stateExtender.addState(route);
+ $stateExtender.addState(myJobsRoute);
+ $stateExtender.addState(allJobsRoute);
}]);
diff --git a/awx/ui/client/src/portal-mode/portal-jobs.list.js b/awx/ui/client/src/portal-mode/portal-jobs.list.js
deleted file mode 100644
index 24f9b2afe3..0000000000
--- a/awx/ui/client/src/portal-mode/portal-jobs.list.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-
-export default ['i18n', function(i18n) {
- return {
-
- name: 'jobs',
- iterator: 'job',
- editTitle: i18n._('JOBS'),
- index: false,
- hover: true,
- well: true,
- listTitle: i18n._('JOBS'),
- emptyListText: i18n._('There are no jobs to display at this time'),
- searchBarFullWidth: true,
-
- fields: {
- status: {
- label: '',
- columnClass: 'List-staticColumn--smallStatus',
- dataTitle: "{{ job.status_popover_title }}",
- icon: 'icon-job-{{ job.status }}',
- iconOnly: true,
- nosort: true,
- awTipPlacement: "top",
- awToolTip: "{{ job.status_tip }}",
- dataTipWatch: 'job.status_tip',
- ngClick:"viewjobResults(job)",
- },
- name: {
- label: i18n._('Name'),
- columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6 List-staticColumnAdjacent',
- linkTo: '/#/jobs/{{job.id}}',
- },
- finished: {
- label: i18n._('Finished'),
- noLink: true,
- filter: "longDate",
- key: true,
- desc: true,
- columnClass: "col-lg-4 col-md-4 col-sm-3"
- }
- },
-
- actions: { }
- };}];
diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js b/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
deleted file mode 100644
index b297e126eb..0000000000
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.controller.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************
- * Copyright (c) 2016 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export function PortalModeJobsController($scope, $state, qs, GetBasePath, PortalJobsList, Dataset) {
-
- var list = PortalJobsList;
-
- $scope.$on('ws-jobs', function() {
- let path = GetBasePath(list.basePath) || GetBasePath(list.name);
- qs.search(path, $state.params[`${list.iterator}_search`])
- .then(function(searchResponse) {
- $scope[`${list.iterator}_dataset`] = searchResponse.data;
- $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
- });
- });
-
- init();
-
- function init(data) {
- let d = (!data) ? Dataset : data;
- // search init
- $scope.list = list;
- $scope[`${list.iterator}_dataset`] = d.data;
- $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
-
- $scope.iterator = list.iterator;
- }
-
- $scope.refresh = function() {
- $state.go('.', null, {reload: true});
- };
-
- $scope.$on(`${list.iterator}_options`, function(event, data){
- $scope.options = data.data.actions.GET;
- optionsRequestDataProcessing();
- });
-
- $scope.$watchCollection(`${$scope.list.name}`, function() {
- optionsRequestDataProcessing();
- }
- );
-
- // iterate over the list and add fields like type label, after the
- // OPTIONS request returns, or the list is sorted/paginated/searched
- function optionsRequestDataProcessing(){
-
- if($scope[list.name] && $scope[list.name].length > 0) {
- $scope[list.name].forEach(function(item, item_idx) {
- var itm = $scope[list.name][item_idx];
-
- if(item.summary_fields && item.summary_fields.source_workflow_job &&
- item.summary_fields.source_workflow_job.id){
- item.workflow_result_link = `/#/workflows/${item.summary_fields.source_workflow_job.id}`;
- }
-
- // Set the item type label
- if (list.fields.type && $scope.options &&
- $scope.options.hasOwnProperty('type')) {
- $scope.options.type.choices.forEach(function(choice) {
- if (choice[0] === item.type) {
- itm.type_label = choice[1];
- }
- });
- }
- buildTooltips(itm);
- });
- }
- }
- function buildTooltips(job) {
- job.status_tip = `Job ${job.status}. Click for details.`;
- }
-
- $scope.viewjobResults = function(job) {
-
- var goTojobResults = function(state) {
- $state.go(state, { id: job.id }, { reload: true });
- };
- switch (job.type) {
- case 'job':
- goTojobResults('jobResult');
- break;
- case 'ad_hoc_command':
- goTojobResults('adHocJobStdout');
- break;
- case 'system_job':
- goTojobResults('managementJobStdout');
- break;
- case 'project_update':
- goTojobResults('scmUpdateStdout');
- break;
- case 'inventory_update':
- goTojobResults('inventorySyncStdout');
- break;
- case 'workflow_job':
- goTojobResults('workflowResults');
- break;
- }
-
- };
-}
-
-PortalModeJobsController.$inject = ['$scope', '$state', 'QuerySet', 'GetBasePath', 'PortalJobsList', 'jobsDataset'];
diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html b/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html
deleted file mode 100644
index 8543683d7c..0000000000
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 7671614054..93357de409 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -349,7 +349,7 @@ export default
}]
},
views: {
- 'list@jobs': {
+ 'schedulesList@jobs': {
templateProvider: function(ScheduleList, generateList){
let html = generateList.build({
list: ScheduleList,
diff --git a/awx/ui/client/src/templates/completed-jobs.list.js b/awx/ui/client/src/templates/completed-jobs.list.js
deleted file mode 100644
index 54ba53a48e..0000000000
--- a/awx/ui/client/src/templates/completed-jobs.list.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-
-export default ['i18n', function(i18n) {
- return {
- // These tooltip fields are consumed to build disabled related tabs tooltips in the form > add view
- awToolTip: i18n._('Please save and run a job to view.'),
- dataPlacement: 'top',
- name: 'completed_jobs',
- basePath: 'api/v2/job_templates/{{$stateParams.job_template_id}}/jobs',
- search: {
- or__status__in: "successful,failed,error,canceled",
- order_by: "-id"
- },
- iterator: 'completed_job',
- editTitle: i18n._('COMPLETED JOBS'),
- index: false,
- hover: true,
- well: false,
- emptyListText: i18n._('No completed jobs'),
-
- fields: {
- status: {
- label: '',
- columnClass: 'List-staticColumn--smallStatus',
- awToolTip: "{{ completed_job.status_tip }}",
- awTipPlacement: "right",
- dataTitle: "{{ completed_job.status_popover_title }}",
- icon: 'icon-job-{{ completed_job.status }}',
- iconOnly: true,
- uiSref: '{{completed_job.linkToDetails}}',
- nosort: true
- },
- id: {
- label: 'ID',
- uiSref: '{{completed_job.linkToDetails}}',
- columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2 List-staticColumnAdjacent',
- awToolTip: "{{ completed_job.status_tip }}",
- dataPlacement: 'top'
- },
- name: {
- label: i18n._('Name'),
- columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6',
- uiSref: '{{completed_job.linkToDetails}}',
- awToolTip: "{{ completed_job.name | sanitize }}",
- dataPlacement: 'top'
- },
- type: {
- label: i18n._('Type'),
- ngBind: 'completed_job.type_label',
- link: false,
- columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs",
- },
- finished: {
- label: i18n._('Finished'),
- noLink: true,
- filter: "longDate",
- columnClass: "col-lg-3 col-md-3 col-sm-3 hidden-xs",
- key: true,
- desc: true
- }
- },
-
- actions: { },
-
- fieldActions: {
-
- columnClass: 'col-lg-2 col-md-2 col-sm-3 col-xs-4',
-
- submit: {
- ngShow: "!completed_job.type == 'system_job' || completed_job.summary_fields.user_capabilities.start",
- // uses the at-relaunch directive
- relaunch: true
- },
- "delete": {
- mode: 'all',
- ngClick: 'deleteJob(completed_job.id)',
- awToolTip: i18n._('Delete the job'),
- dataPlacement: 'top',
- ngShow: 'completed_job.summary_fields.user_capabilities.delete'
- }
- }
- };}];
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 422d722c3a..fc24852e2d 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -11,8 +11,8 @@
*/
-export default ['NotificationsList', 'CompletedJobsList', 'i18n',
-function(NotificationsList, CompletedJobsList, i18n) {
+export default ['NotificationsList', 'i18n',
+function(NotificationsList, i18n) {
return function() {
var JobTemplateFormObject = {
@@ -433,7 +433,9 @@ function(NotificationsList, CompletedJobsList, i18n) {
include: "NotificationsList"
},
"completed_jobs": {
- include: "CompletedJobsList"
+ title: i18n._('Completed Jobs'),
+ skipGenerator: true,
+ ngClick: "$state.go('templates.editJobTemplate.completed_jobs')"
}
},
@@ -473,11 +475,6 @@ function(NotificationsList, CompletedJobsList, i18n) {
JobTemplateFormObject.related[itm].ngClick = "$state.go('templates.editJobTemplate.notifications')";
JobTemplateFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list
}
- if (JobTemplateFormObject.related[itm].include === "CompletedJobsList") {
- JobTemplateFormObject.related[itm] = CompletedJobsList;
- JobTemplateFormObject.related[itm].ngClick = "$state.go('templates.editJobTemplate.completed_jobs')";
- JobTemplateFormObject.related[itm].generateList = true;
- }
}
return JobTemplateFormObject;
diff --git a/awx/ui/client/src/templates/labels/labelsList.directive.js b/awx/ui/client/src/templates/labels/labelsList.directive.js
index 208c111b80..8402a14dd2 100644
--- a/awx/ui/client/src/templates/labels/labelsList.directive.js
+++ b/awx/ui/client/src/templates/labels/labelsList.directive.js
@@ -95,6 +95,11 @@ export default
if (scope.$parent.$parent.template) {
scope.labels = scope.$parent.$parent.template.summary_fields.labels.results.slice(0, 5);
scope.count = scope.$parent.$parent.template.summary_fields.labels.count;
+ } else if (scope.$parent.$parent.job) {
+ if (_.has(scope, '$parent.$parent.job.summary_fields.labels.results')) {
+ scope.labels = scope.$parent.$parent.job.summary_fields.labels.results.slice(0, 5);
+ scope.count = scope.$parent.$parent.job.summary_fields.labels.count;
+ }
} else {
scope.$watchCollection(scope.$parent.list.iterator, function() {
// To keep the array of labels fresh, we need to set up a watcher - otherwise, the
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index c2f2d0e9a6..f9280252a0 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -16,11 +16,11 @@ import workflowMaker from './workflows/workflow-maker/main';
import workflowControls from './workflows/workflow-controls/main';
import workflowService from './workflows/workflow.service';
import WorkflowForm from './workflows.form';
-import CompletedJobsList from './completed-jobs.list';
import InventorySourcesList from './inventory-sources.list';
import TemplateList from './templates.list';
import TemplatesStrings from './templates.strings';
import listRoute from '~features/templates/list.route.js';
+import templateCompletedJobsRoute from '~features/jobs/routes/templateCompletedJobs.route.js';
export default
angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, prompt.name, workflowAdd.name, workflowEdit.name,
@@ -29,7 +29,6 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
.service('TemplatesService', templatesService)
.service('WorkflowService', workflowService)
.factory('WorkflowForm', WorkflowForm)
- .factory('CompletedJobsList', CompletedJobsList)
// TODO: currently being kept arround for rbac selection, templates within projects and orgs, etc.
.factory('TemplateList', TemplateList)
.value('InventorySourcesList', InventorySourcesList)
@@ -151,10 +150,7 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
modes: ['edit'],
form: 'JobTemplateForm',
controllers: {
- edit: 'JobTemplateEdit',
- related: {
- completed_jobs: 'JobsList'
- }
+ edit: 'JobTemplateEdit'
},
data: {
activityStream: true,
@@ -742,6 +738,7 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
return result.concat(definition.states);
}, [
stateExtender.buildDefinition(listRoute),
+ stateExtender.buildDefinition(templateCompletedJobsRoute),
stateExtender.buildDefinition(workflowMaker)
])
};
diff --git a/tower-license b/tower-license
new file mode 160000
index 0000000000..009cc73a80
--- /dev/null
+++ b/tower-license
@@ -0,0 +1 @@
+Subproject commit 009cc73a80e5123143e9c780c7011903d4c2a331