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

Added templates activity stream view which is a combination of JT events and WFJT events

Browse Source
This commit is contained in:
Michael Abashian
2016-12-05 09:45:27 -05:00
parent f0e7385f54
commit 8ec2662f2e
7 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/activity-stream/activitystream.route.js
View File

@@ -16,8 +16,8 @@ export default {
value: { value: {
// default params will not generate search tags // default params will not generate search tags
order_by: '-timestamp', order_by: '-timestamp',
or__object1: null, or__object1_in: null,
or__object2: null or__object2_in: null
} }
} }
}, },

8
awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
View File

@@ -26,7 +26,9 @@ export default ['templateUrl', function(templateUrl) {
{label: 'Projects', value: 'project'}, {label: 'Projects', value: 'project'},
{label: 'Schedules', value: 'schedule'}, {label: 'Schedules', value: 'schedule'},
{label: 'Teams', value: 'team'}, {label: 'Teams', value: 'team'},
{label: 'Users', value: 'user'} {label: 'Templates', value: 'template'},
{label: 'Users', value: 'user'},
{label: 'Workflow Job Templates', value: 'workflow_job_template'}
]; ];
CreateSelect2({ CreateSelect2({
@@ -41,8 +43,8 @@ export default ['templateUrl', function(templateUrl) {
} }
else { else {
let search = _.merge($stateParams.activity_search, { let search = _.merge($stateParams.activity_search, {
or__object1: $scope.streamTarget, or__object1__in: $scope.streamTarget && $scope.streamTarget === 'template' ? 'job_template,workflow_job_template' : $scope.streamTarget,
or__object2: $scope.streamTarget or__object2__in: $scope.streamTarget && $scope.streamTarget === 'template' ? 'job_template,workflow_job_template' : $scope.streamTarget
}); });
// Attach the taget to the query parameters // Attach the taget to the query parameters
$state.go('activityStream', {target: $scope.streamTarget, activity_search: search}); $state.go('activityStream', {target: $scope.streamTarget, activity_search: search});

4
awx/ui/client/src/bread-crumb/bread-crumb.directive.js
View File

@@ -26,8 +26,8 @@ export default
if(streamConfig.activityStreamTarget) { if(streamConfig.activityStreamTarget) {
stateGoParams.target = streamConfig.activityStreamTarget; stateGoParams.target = streamConfig.activityStreamTarget;
stateGoParams.activity_search = { stateGoParams.activity_search = {
or__object1: streamConfig.activityStreamTarget, or__object1__in: streamConfig.activityStreamTarget === 'template' ? 'job_template,workflow_job_template' : streamConfig.activityStreamTarget,
or__object2: streamConfig.activityStreamTarget, or__object2__in: streamConfig.activityStreamTarget === 'template' ? 'job_template,workflow_job_template' : streamConfig.activityStreamTarget,
order_by: '-timestamp', order_by: '-timestamp',
page_size: '20', page_size: '20',
}; };

6
awx/ui/client/src/helpers/ActivityStream.js
View File

@@ -52,6 +52,12 @@ export default
case 'host': case 'host':
rtnTitle = 'HOSTS'; rtnTitle = 'HOSTS';
break; break;
case 'template':
rtnTitle = 'TEMPLATES';
break;
case 'workflow_job_template':
rtnTitle = 'WORKFLOW JOB TEMPLATES';
break;
} }
return rtnTitle; return rtnTitle;

3
awx/ui/client/src/helpers/ApiModel.js
View File

@@ -48,6 +48,9 @@ export default
case 'inventory_script': case 'inventory_script':
basePathKey = 'inventory_scripts'; basePathKey = 'inventory_scripts';
break; break;
case 'workflow_job_template':
basePathKey = 'workflow_job_templates';
break;
} }
return basePathKey; return basePathKey;

2
awx/ui/client/src/templates/list/templates-list.route.js
View File

@@ -11,6 +11,8 @@ export default {
label: "TEMPLATES" label: "TEMPLATES"
}, },
data: { data: {
activityStream: true,
activityStreamTarget: 'template',
socket: { socket: {
"groups": { "groups": {
"jobs": ["status_changed"] "jobs": ["status_changed"]

8
awx/ui/client/src/widgets/Stream.js
View File

@@ -283,11 +283,13 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
else { else {
// We just have a type // We just have a type
if ($state.params.target === 'inventory_script') { if ($state.params.target === 'inventory_script') {
defaultUrl += '?or__object1=custom_inventory_script&or__object2=custom_inventory_script'; defaultUrl += '?or__object1__in=custom_inventory_script&or__object2__in=custom_inventory_script';
} else if ($state.params.target === 'management_job') { } else if ($state.params.target === 'management_job') {
defaultUrl += '?or__object1=job&or__object2=job'; defaultUrl += '?or__object1__in=job&or__object2__in=job';
} else if ($state.params.target === 'template') {
defaultUrl += '?or__object1__in=job_template,workflow_job_template&or__object2__in=job_template,workflow_job_template';
} else { } else {
defaultUrl += '?or__object1=' + $state.params.target + '&or__object2=' + $state.params.target; defaultUrl += '?or__object1__in=' + $state.params.target + '&or__object2__in=' + $state.params.target;
} }
} }
} }