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

add completed job section on host page

Browse Source 
host completed jobs added on both host page and related section under inventory edit
This commit is contained in:
Haokun-Chen 2018-06-05 10:29:09 -04:00
parent 769e714f71
commit 069c5dacaa
5 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
awx/ui/client/features/jobs/routes/hostCompletedJobs.route.js Normal file
View File

@ -0,0 +1,58 @@
import { N_ } from '../../../src/i18n';
import jobsListController from '../jobsList.controller';
const jobsListTemplate = require('~features/jobs/jobsList.view.html');
export default {
url: '/completed_jobs',
params: {
job_search: {
value: {
page_size: '20',
job__hosts: '',
order_by: '-id'
},
dynamic: true,
squash: ''
}
},
ncyBreadcrumb: {
label: N_('COMPLETED JOBS')
},
views: {
related: {
templateUrl: jobsListTemplate,
controller: jobsListController,
controllerAs: 'vm'
}
},
resolve: {
resolvedModels: [
'UnifiedJobModel',
(UnifiedJob) => {
const models = [
new UnifiedJob(['options']),
];
return Promise.all(models);
},
],
Dataset: [
'$stateParams',
'Wait',
'GetBasePath',
'QuerySet',
($stateParams, Wait, GetBasePath, qs) => {
const hostId = $stateParams.host_id;
const searchParam = _.assign($stateParams
.job_search, { job__hosts: hostId });
const searchPath = GetBasePath('unified_jobs');
Wait('start');
return qs.search(searchPath, searchParam)
.finally(() => Wait('stop'));
}
]
}
};

5
awx/ui/client/src/inventories-hosts/hosts/host.form.js
View File

@ -123,6 +123,11 @@ function(i18n) {
title: i18n._('Insights'),
skipGenerator: true,
ngIf: "host.insights_system_id!==null && host.summary_fields.inventory.hasOwnProperty('insights_credential_id')"
},
completed_jobs: {
name: 'completed_jobs',
title: i18n._('Completed Jobs'),
skipGenerator: true
}
}
};

7
awx/ui/client/src/inventories-hosts/hosts/main.js
View File

@ -14,6 +14,7 @@
import insightsRoute from '../inventories/insights/insights.route';
import hostGroupsRoute from './related/groups/hosts-related-groups.route';
import hostGroupsAssociateRoute from './related/groups/hosts-related-groups-associate.route';
import hostCompletedJobsRoute from '~features/jobs/routes/hostCompletedJobs.route.js';
import hostGroups from './related/groups/main';
export default
@ -87,6 +88,9 @@ angular.module('host', [
let hostInsights = _.cloneDeep(insightsRoute);
hostInsights.name = 'hosts.edit.insights';
let hostCompletedJobs = _.cloneDeep(hostCompletedJobsRoute);
hostCompletedJobs.name = 'hosts.edit.completed_jobs';
return Promise.all([
hostTree
]).then((generated) => {
@ -97,7 +101,8 @@ angular.module('host', [
stateExtender.buildDefinition(hostAnsibleFacts),
stateExtender.buildDefinition(hostInsights),
stateExtender.buildDefinition(hostGroupsRoute),
stateExtender.buildDefinition(hostGroupsAssociateRoute)
stateExtender.buildDefinition(hostGroupsAssociateRoute),
stateExtender.buildDefinition(hostCompletedJobs)
])
};
});

7
awx/ui/client/src/inventories-hosts/inventories/main.js
View File

@ -45,6 +45,7 @@ import hostNestedGroupsAssociateRoute from './related/hosts/related/nested-group
import groupNestedGroupsAssociateRoute from './related/groups/related/nested-groups/group-nested-groups-associate.route';
import nestedHostsAssociateRoute from './related/groups/related/nested-hosts/group-nested-hosts-associate.route';
import nestedHostsAddRoute from './related/groups/related/nested-hosts/group-nested-hosts-add.route';
import hostCompletedJobsRoute from '~features/jobs/routes/hostCompletedJobs.route.js';
export default
angular.module('inventory', [
@ -292,6 +293,9 @@ angular.module('inventory', [
let smartInventoryAdhocCredential = _.cloneDeep(adhocCredentialRoute);
smartInventoryAdhocCredential.name = 'inventories.editSmartInventory.adhoc.credential';
let relatedHostCompletedJobs = _.cloneDeep(hostCompletedJobsRoute);
relatedHostCompletedJobs.name = 'inventories.edit.hosts.edit.completed_jobs';
return Promise.all([
standardInventoryAdd,
standardInventoryEdit,
@ -339,7 +343,8 @@ angular.module('inventory', [
stateExtender.buildDefinition(hostNestedGroupsAssociateRoute),
stateExtender.buildDefinition(nestedHostsAssociateRoute),
stateExtender.buildDefinition(nestedGroupsAdd),
stateExtender.buildDefinition(nestedHostsAddRoute)
stateExtender.buildDefinition(nestedHostsAddRoute),
stateExtender.buildDefinition(relatedHostCompletedJobs)
])
};
});

5
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.form.js
View File

@ -122,6 +122,11 @@ function(i18n) {
title: i18n._('Insights'),
skipGenerator: true,
ngIf: "host.insights_system_id!==null && host.summary_fields.inventory.hasOwnProperty('insights_credential_id')"
},
completed_jobs: {
name: 'completed_jobs',
title: i18n._('Completed Jobs'),
skipGenerator: true
}
}
};