shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge branch 'remove-standalone-stdout' into devel

Browse Source
This commit is contained in:
Michael Abashian 2016-02-18 09:47:01 -05:00
commit ce8f40277c
22 changed files with 542 additions and 459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
awx/ui/client/src/app.js
View File

@ -44,7 +44,8 @@ import templateUrl from './shared/template-url/main';
import adhoc from './adhoc/main';
import login from './login/main';
import activityStream from './activity-stream/main';
import {JobStdoutController} from './controllers/JobStdout';
import standardOut from './standard-out/main';
import {JobDetailController} from './controllers/JobDetail';
import {JobTemplatesList, JobTemplatesAdd, JobTemplatesEdit} from './controllers/JobTemplates';
import {LicenseController} from './controllers/License';
import {ScheduleEditController} from './controllers/Schedules';
@ -96,6 +97,7 @@ var tower = angular.module('Tower', [
activityStream.name,
footer.name,
jobDetail.name,
standardOut.name,
'templates',
'Utilities',
'LicenseHelper',
@ -294,56 +296,6 @@ var tower = angular.module('Tower', [
}
}).
state('jobsStdout', {
url: '/jobs/:id/stdout',
templateUrl: urlPrefix + 'partials/job_stdout.html',
controller: JobStdoutController,
ncyBreadcrumb: {
parent: 'jobDetail',
label: "STANDARD OUT"
},
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
jobEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
if (!$rootScope.event_socket) {
$rootScope.event_socket = Socket({
scope: $rootScope,
endpoint: "job_events"
});
$rootScope.event_socket.init();
return true;
} else {
return true;
}
}]
}
}).
state('adHocJobStdout', {
url: '/ad_hoc_commands/:id',
templateUrl: urlPrefix + 'partials/job_stdout_adhoc.html',
controller: JobStdoutController,
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
if (!$rootScope.adhoc_event_socket) {
$rootScope.adhoc_event_socket = Socket({
scope: $rootScope,
endpoint: "ad_hoc_command_events"
});
$rootScope.adhoc_event_socket.init();
return true;
} else {
return true;
}
}]
}
}).
state('jobTemplates', {
url: '/job_templates',
templateUrl: urlPrefix + 'partials/job_templates.html',
@ -1036,6 +988,9 @@ var tower = angular.module('Tower', [
$rootScope.$emit('JobStatusChange-jobs', data);
} else if (/\/jobs\/(\d)+\/stdout/.test(urlToCheck) ||
/\/ad_hoc_commands\/(\d)+/.test(urlToCheck)) {
// TODO: something will need to change here for stdout
$log.debug("sending status to standard out");
$rootScope.$emit('JobStatusChange-jobStdout', data);
} else if (/\/jobs\/(\d)+/.test(urlToCheck)) {

71
awx/ui/client/src/helpers/Jobs.js
View File

@ -22,12 +22,11 @@ export default
* Initialize calling scope with all the bits required to support a jobs list
*
*/
.factory('JobsControllerInit', ['$location', 'Find', 'DeleteJob', 'RelaunchJob', 'LogViewer', '$window',
function($location, Find, DeleteJob, RelaunchJob, LogViewer, $window) {
.factory('JobsControllerInit', ['$state', 'Find', 'DeleteJob', 'RelaunchJob', 'LogViewer', '$window',
function($state, Find, DeleteJob, RelaunchJob, LogViewer, $window) {
return function(params) {
var scope = params.scope,
iterator = (params.iterator) ? params.iterator : scope.iterator;
//base = $location.path().replace(/^\//, '').split('/')[0];
scope.deleteJob = function(id) {
DeleteJob({ scope: scope, id: id });
@ -70,53 +69,39 @@ export default
};
scope.refreshJobs = function() {
// if (base !== 'jobs') {
scope.search(iterator);
// }
scope.search(iterator);
};
scope.viewJobLog = function(id) {
var list, job;
if (scope.completed_jobs) {
list = scope.completed_jobs;
}
else if (scope.running_jobs) {
list = scope.running_jobs;
}
else if (scope.queued_jobs) {
list = scope.queued_jobs;
}
else if (scope.jobs) {
list = scope.jobs;
}
else if(scope.all_jobs){
list = scope.all_jobs;
}
else if(scope.portal_jobs){
list=scope.portal_jobs;
}
job = Find({ list: list, key: 'id', val: id });
if (job.type === 'job') {
scope.viewJobDetails = function(job) {
var goToJobDetails = function(state) {
if(scope.$parent.portalMode===true){
$window.open('/#/jobs/' + job.id, '_blank');
var url = $state.href(state, {id: job.id});
$window.open(url, '_blank');
}
else {
$location.url('/jobs/' + job.id);
$state.go(state, {id: job.id});
}
} else if (job.type === 'ad_hoc_command') {
if(scope.$parent.portalMode===true){
$window.open('/#/ad_hoc_commands/' + job.id, '_blank');
}
else {
$location.url('/ad_hoc_commands/' + job.id);
}
} else {
LogViewer({
scope: scope,
url: job.url
});
}
switch(job.type) {
case 'job':
goToJobDetails('jobDetail');
break;
case 'ad_hoc_command':
goToJobDetails('adHocJobStdout');
break;
case 'system_job':
goToJobDetails('managementJobStdout');
break;
case 'project_update':
goToJobDetails('scmUpdateStdout');
break;
case 'inventory_update':
goToJobDetails('inventorySyncStdout');
break;
}
};
};
}

34
awx/ui/client/src/jobs/standard-out-details.block.less
View File

@ -1,34 +0,0 @@
/*************************************************
* Copyright (c) 2015 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
/** @define StandardOutDetails */
// Some of these are left empty as a helpful measure so that you can see how the new
// SuitCSS styling should work. They can be removed once we've done more
// SuitCSS
.StandardOutDetails {
}
.StandardOutDetails-detailRow {
margin-bottom: 15px;
}
.StandardOutDetails-detailRow--closable {
display: none;
}
.StandardOutDetails-detailLabel {
}
.StandardOutDetails-detailContent {
}
.StandardOutDetails-closedToggle {
}
.StandardOutDetails-closedToggleLink {
}

13
awx/ui/client/src/lists/AllJobs.js
View File

@ -25,7 +25,7 @@ export default
dataTitle: "{{ all_job.status_popover_title }}",
icon: 'icon-job-{{ all_job.status }}',
iconOnly: true,
ngClick:"viewJobLog(all_job.id)",
ngClick:"viewJobDetails(all_job)",
searchable: true,
searchType: 'select',
nosort: true,
@ -38,7 +38,7 @@ export default
},
id: {
label: 'ID',
ngClick:"viewJobLog(all_job.id)",
ngClick:"viewJobDetails(all_job)",
searchType: 'int',
columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2 List-staticColumnAdjacent',
awToolTip: "{{ all_job.status_tip }}",
@ -47,7 +47,7 @@ export default
name: {
label: 'Name',
columnClass: 'col-lg-3 col-md-3 col-sm-4 col-xs-6',
ngClick: "viewJobLog(all_job.id, all_job.nameHref)",
ngClick: "viewJobDetails(all_job)",
defaultSearchField: true,
awToolTip: "{{ all_job.name | sanitize }}",
dataPlacement: 'top'
@ -87,13 +87,6 @@ export default
columnClass: 'col-lg-2 col-md-2 col-sm-3 col-xs-4',
stdout: {
mode: 'all',
href: '/#/jobs/{{ all_job.id }}/stdout',
awToolTip: 'View standard output',
dataPlacement: 'top',
ngShow: "all_job.type == 'job'"
},
submit: {
icon: 'icon-rocket',
mode: 'all',

19
awx/ui/client/src/lists/CompletedJobs.js
View File

@ -27,7 +27,7 @@ export default
dataTitle: "{{ completed_job.status_popover_title }}",
icon: 'icon-job-{{ completed_job.status }}',
iconOnly: true,
ngClick:"viewJobLog(completed_job.id)",
ngClick:"viewJobDetails(completed_job)",
searchable: true,
searchType: 'select',
nosort: true,
@ -40,7 +40,7 @@ export default
},
id: {
label: 'ID',
ngClick:"viewJobLog(completed_job.id)",
ngClick:"viewJobDetails(completed_job)",
searchType: 'int',
columnClass: 'col-lg-1 col-md-1 col-sm-2 col-xs-2 List-staticColumnAdjacent',
awToolTip: "{{ completed_job.status_tip }}",
@ -49,7 +49,7 @@ export default
name: {
label: 'Name',
columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6',
ngClick: "viewJobLog(completed_job.id, completed_job.nameHref)",
ngClick: "viewJobDetails(completed_job)",
defaultSearchField: true,
awToolTip: "{{ completed_job.name | sanitize }}",
dataPlacement: 'top'
@ -89,13 +89,6 @@ export default
columnClass: 'col-lg-2 col-md-2 col-sm-3 col-xs-4',
stdout: {
mode: 'all',
href: '/#/jobs/{{ completed_job.id }}/stdout',
awToolTip: 'View standard output',
dataPlacement: 'top',
ngShow: "completed_job.type == 'job'"
},
submit: {
icon: 'icon-rocket',
mode: 'all',
@ -110,11 +103,5 @@ export default
awToolTip: 'Delete the job',
dataPlacement: 'top'
}
// job_details: {
// mode: 'all',
// ngClick: "viewJobLog(completed_job.id)",
// awToolTip: 'View job details',
// dataPlacement: 'top'
// }
}
});

13
awx/ui/client/src/lists/Jobs.js
View File

@ -20,7 +20,7 @@ export default
fields: {
id: {
label: 'ID',
ngClick:"viewJobLog(job.id)",
ngClick:"viewJobDetails(job)",
key: true,
desc: true,
searchType: 'int',
@ -36,7 +36,7 @@ export default
dataTitle: "{{ job.status_popover_title }}",
icon: 'icon-job-{{ job.status }}',
iconOnly: true,
ngClick:"viewJobLog(job.id)",
ngClick:"viewJobDetails(job)",
searchable: true,
nosort: true,
searchType: 'select',
@ -66,7 +66,7 @@ export default
name: {
label: 'Name',
columnClass: 'col-md-3 col-xs-5',
ngClick: "viewJobLog(job.id, job.nameHref)",
ngClick: "viewJobDetails(job)",
defaultSearchField: true
}
},
@ -74,13 +74,6 @@ export default
actions: { },
fieldActions: {
stdout: {
mode: 'all',
href: '/#/jobs/{{ job.id }}/stdout',
awToolTip: 'View standard output',
dataPlacement: 'top',
ngShow: "job.type == 'job'"
},
submit: {
mode: 'all',
icon: 'icon-rocket',

2
awx/ui/client/src/lists/PortalJobs.js
View File

@ -64,7 +64,7 @@ export default
job_details: {
mode: 'all',
ngClick: "viewJobLog(portal_job.id)",
ngClick: "viewJobDetails(portal_job)",
awToolTip: 'View job details',
dataPlacement: 'top'
}

38
awx/ui/client/src/partials/job_stdout.html
View File

@ -1,38 +0,0 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="StandardOut-heading">
<div class="row StandardOut-breadcrumbs">
<div id="home-list-actions" class="list-actions pull-right col-md-12">
<button type="button" class="btn btn-xs btn-primary ng-hide" ng-click="refresh()" id="refresh_btn" aw-tool-tip="Refresh the page" data-placement="top" ng-show="socketStatus == 'error'" data-original-title="" title=""><i class="fa fa-refresh fa-lg"></i> </button></div>
</div>
<div class="row StandardOut-form">
<div class="col-md-12">
<div id="job-status"><label>Job Status</label> <i class="fa icon-job-{{ job.status }}"></i> {{ job.status }}</div>
</div>
</div>
</div>
<div class="panel panel-default job-stdout-panel StandardOut-panel">
<div class="panel-heading StandardOut-panelHeading">
<h3 class="panel-title">Standard Output
<a href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'">
<i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download
</a>
</div>
<div class="panel-body stdout-panel-body StandardOut-panelBody">
<div id="pre-container" class="body_background
body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>

172
awx/ui/client/src/partials/job_stdout_adhoc.html
View File

@ -1,172 +0,0 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="row StandardOut-heading">
<div class="row StandardOut-breadcrumbs">
<div id="home-list-actions"
class="list-actions pull-right col-md-12">
<button type="button" class="btn btn-xs btn-primary ng-hide"
ng-click="refresh()" id="refresh_btn"
aw-tool-tip="Refresh the page"
data-placement="top" ng-show="socketStatus == 'error'"
data-original-title="" title="">
<i class="fa fa-refresh fa-lg"></i>
</button>
</div>
</div>
<div class="StandardOut-form form-horizontal StandardOutDetails"
role="form" id="job-status-form">
<div class="form-group StandardOutDetails-detailRow">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Status</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">
<i class="fa icon-job-{{ job.status }}"></i> {{ job.status }}
</div>
</div>
<div <div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="job.started">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Timing</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">
<div ng-show="job.started" id="started-time">
Started &nbsp;{{ job.started | date:'MM/dd/yy HH:mm:ss' }}
</div>
<div ng-show="job.finished" id="finished-time">
Finished &nbsp;{{ job.finished | date:'MM/dd/yy HH:mm:ss' }}
</div>
<div ng-show="job.finished" id="elapsed-time">
Elapsed &nbsp;{{ job.elapsed }} seconds
</div>
</div>
</div>
<div <div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="job.module_name">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Module Name</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">{{ job.module_name }}
</div>
</div>
<div <div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="job.module_args">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Module Args</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent mono-space">{{ job.module_args }}
</div>
</div>
<div <div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="inventory_name">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Inventory</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">
<a href="{{ inventory_url }}"
aw-tool-tip="The inventory this command ran on."
data-placement="top">{{ inventory_name }}</a>
</div>
</div>
<div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="credential_name">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Credential</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">
<a href="{{ credential_url }}"
aw-tool-tip="The credential used to run this command."
data-placement="top">{{ credential_name }}</a>
</div>
</div>
<div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="created_by">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailContent">Launched By</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-9
StandardOutDetails-detailContent">
<a href="/#/users/{{ created_by.id }}"
aw-tool-tip="The user who ran this command."
data-placement="top">{{ created_by.username }}</a>
</div>
</div>
<!-- since zero is a falsy value, you need ng-show such that
the number is >= 0 -->
<div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="forks >= 0">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Forks</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">{{ forks }}</div>
</div>
<div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="limit">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Limit</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">{{ limit }}</div>
</div>
<!-- since zero is a falsy value, you need ng-show such that
the number is >= 0 -->
<div class="form-group StandardOutDetails-detailRow
StandardOutDetails-detailRow--closable"
ng-show="verbosity >= 0">
<label class="col-lg-2 col-md-2 col-sm-2 col-xs-12
StandardOutDetails-detailLabel">Verbosity</label>
<div class="col-lg-10 col-md-10 col-sm-10 col-xs-12
StandardOutDetails-detailContent">{{ verbosity }}</div>
</div>
<div class="form-group StandardOutDetails-closedToggle">
<a class="col-sm-12 StandardOutDetails-closedToggleLink"
ng-show="isClosed" href="javascript:;"
ng-click="toggleClosedStatus()"> more <i class="fa fa-angle-down"></i>
</a>
<a class="col-sm-12 StandardOutDetails-closedToggleLink"
ng-show="!isClosed" href="javascript:;"
ng-click="toggleClosedStatus()"> less <i class="fa fa-angle-up"></i>
</a>
</div>
</div>
</div>
<div class="panel panel-default StandardOut-panel">
<div class="panel-heading StandardOut-panelHeading">
<h3 class="panel-title">Standard Output
<a ng-href="/api/v1/ad_hoc_commands/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>
</h3>
</div>
<div class="panel-body stdout-panel-body StandardOut-panelBody">
<div id="pre-container" class="body_background
body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop"
scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>

3
awx/ui/client/src/shared/generator-helpers.js
View File

@ -172,9 +172,6 @@ angular.module('GeneratorHelpers', [systemStatus.name])
case 'schedule':
icon = "fa-calendar";
break;
case 'stdout':
icon = "fa-external-link";
break;
case 'question_cancel':
icon = 'fa-times';
break;

116
awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.partial.html Normal file
View File

@ -0,0 +1,116 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="StandardOut-leftPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
RESULTS
</div>
<div class="StandardOut-details">
<div class="StandardOut-detailsRow" ng-show="job.module_name">
<div class="StandardOut-detailsLabel">Name</div>
<div class="StandardOut-detailsContent">{{ job.module_name }}</div>
</div>
<div class="StandardOut-detailsRow">
<div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span>
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="job.started">
<div class="StandardOut-detailsLabel">STARTED</div>
<div class="StandardOut-detailsContent">
{{ job.started | date:'MM/dd/yy HH:mm:ss' }}
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="job.finished">
<div class="StandardOut-detailsLabel">FINISHED</div>
<div class="StandardOut-detailsContent">
{{ job.finished | date:'MM/dd/yy HH:mm:ss' }}
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="job.finished">
<div class="StandardOut-detailsLabel">ELAPSED</div>
<div class="StandardOut-detailsContent">
{{ job.elapsed }} seconds
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="job.module_args">
<div class="StandardOut-detailsLabel">Module Args</div>
<div class="StandardOut-detailsContent">{{ job.module_args }}</div>
</div>
<div class="StandardOut-detailsRow">
<div class="StandardOut-detailsLabel">Inventory</div>
<div class="StandardOut-detailsContent">
<a href="{{ inventory_url }}"
aw-tool-tip="The inventory this command ran on."
data-placement="top">{{ inventory_name }}</a>
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="credential_name">
<div class="StandardOut-detailsLabel">Credential</div>
<div class="StandardOut-detailsContent">
<a href="{{ credential_url }}"
aw-tool-tip="The credential used to run this command."
data-placement="top">{{ credential_name }}</a>
</div>
</div>
<div class="StandardOut-detailsRow" ng-show="created_by">
<div class="StandardOut-detailsLabel">Launched By</div>
<div class="StandardOut-detailsContent">
<a href="/#/users/{{ created_by.id }}"
aw-tool-tip="The user who ran this command."
data-placement="top">{{ created_by.username }}</a>
</div>
</div>
<!-- since zero is a falsy value, you need ng-show such that
the number is >= 0 -->
<div class="StandardOut-detailsRow" ng-show="forks >= 0">
<div class="StandardOut-detailsLabel">Forks</div>
<div class="StandardOut-detailsContent">{{ forks }}</div>
</div>
<div class="StandardOut-detailsRow" ng-show="limit">
<div class="StandardOut-detailsLabel">Limit</div>
<div class="StandardOut-detailsContent">{{ limit }}</div>
</div>
<!-- since zero is a falsy value, you need ng-show such that
the number is >= 0 -->
<div class="StandardOut-detailsRow" ng-show="verbosity >= 0">
<div class="StandardOut-detailsLabel">Verbosity</div>
<div class="StandardOut-detailsContent">{{ verbosity }}</div>
</div>
</div>
</div>
</div>
<div class="StandardOut-rightPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
STANDARD OUT
</div>
<div class="StandardOut-consoleOutput">
<div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

36
awx/ui/client/src/standard-out/adhoc/standard-out-adhoc.route.js Normal file
View File

@ -0,0 +1,36 @@
/*************************************************
* Copyright (c) 2016 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import {templateUrl} from '../../shared/template-url/template-url.factory';
export default {
name: 'adHocJobStdout',
route: '/ad_hoc_commands/:id/stdout',
templateUrl: templateUrl('standard-out/adhoc/standard-out-adhoc'),
controller: 'JobStdoutController',
data: {
jobType: 'ad_hoc_commands'
},
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
// if (!$rootScope.adhoc_event_socket) {
// $rootScope.adhoc_event_socket = Socket({
// scope: $rootScope,
// endpoint: "ad_hoc_command_events"
// });
// $rootScope.adhoc_event_socket.init();
// return true;
// } else {
// return true;
// }
return true;
}]
}
};

40
awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html Normal file
View File

@ -0,0 +1,40 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="StandardOut-leftPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
RESULTS
</div>
<div class="StandardOut-details">
<div class="StandardOut-detailsRow">
<div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span>
</div>
</div>
</div>
</div>
</div>
<div class="StandardOut-rightPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
STANDARD OUT
</div>
<div class="StandardOut-consoleOutput">
<div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

38
awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.route.js Normal file
View File

@ -0,0 +1,38 @@
/*************************************************
* Copyright (c) 2016 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import {templateUrl} from '../../shared/template-url/template-url.factory';
// TODO: figure out what this route should be - should it be inventory_sync?
export default {
name: 'inventorySyncStdout',
route: '/inventory_sync/:id/stdout',
templateUrl: templateUrl('standard-out/inventory-sync/standard-out-inventory-sync'),
controller: 'JobStdoutController',
data: {
jobType: 'inventory_updates'
},
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
// if (!$rootScope.adhoc_event_socket) {
// $rootScope.adhoc_event_socket = Socket({
// scope: $rootScope,
// endpoint: "ad_hoc_command_events"
// });
// $rootScope.adhoc_event_socket.init();
// return true;
// } else {
// return true;
// }
return true;
}]
}
};

20
awx/ui/client/src/standard-out/main.js Normal file
View File

@ -0,0 +1,20 @@
/*************************************************
* Copyright (c) 2016 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import stdoutAdhocRoute from './adhoc/standard-out-adhoc.route';
import stdoutManagementJobsRoute from './management-jobs/standard-out-management-jobs.route';
import stdoutInventorySyncRoute from './inventory-sync/standard-out-inventory-sync.route';
import stdoutScmUpdateRoute from './scm-update/standard-out-scm-update.route';
import {JobStdoutController} from './standard-out.controller';
export default angular.module('standardOut', [])
.controller('JobStdoutController', JobStdoutController)
.run(['$stateExtender', function($stateExtender) {
$stateExtender.addState(stdoutAdhocRoute);
$stateExtender.addState(stdoutManagementJobsRoute);
$stateExtender.addState(stdoutInventorySyncRoute);
$stateExtender.addState(stdoutScmUpdateRoute);
}]);

40
awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html Normal file
View File

@ -0,0 +1,40 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="StandardOut-leftPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
RESULTS
</div>
<div class="StandardOut-details">
<div class="StandardOut-detailsRow">
<div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span>
</div>
</div>
</div>
</div>
</div>
<div class="StandardOut-rightPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
STANDARD OUT
</div>
<div class="StandardOut-consoleOutput">
<div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

36
awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.route.js Normal file
View File

@ -0,0 +1,36 @@
/*************************************************
* Copyright (c) 2016 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import {templateUrl} from '../../shared/template-url/template-url.factory';
export default {
name: 'managementJobStdout',
route: '/management_jobs/:id/stdout',
templateUrl: templateUrl('standard-out/management-jobs/standard-out-management-jobs'),
controller: 'JobStdoutController',
data: {
jobType: 'system_jobs'
},
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
// if (!$rootScope.adhoc_event_socket) {
// $rootScope.adhoc_event_socket = Socket({
// scope: $rootScope,
// endpoint: "ad_hoc_command_events"
// });
// $rootScope.adhoc_event_socket.init();
// return true;
// } else {
// return true;
// }
return true;
}]
}
};

40
awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html Normal file
View File

@ -0,0 +1,40 @@
<div class="tab-pane" id="jobs-stdout">
<div ng-cloak id="htmlTemplate">
<div class="StandardOut">
<div class="StandardOut-leftPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
RESULTS
</div>
<div class="StandardOut-details">
<div class="StandardOut-detailsRow">
<div class="StandardOut-detailsLabel">STATUS</div>
<div class="StandardOut-detailsContent">
<i class="fa icon-job-{{ job.status }}"></i>
<span class="StandardOut-statusText">{{ job.status }}</span>
</div>
</div>
</div>
</div>
</div>
<div class="StandardOut-rightPanel">
<div class="Panel">
<div class="StandardOut-panelHeader">
STANDARD OUT
</div>
<div class="StandardOut-consoleOutput">
<div id="pre-container" class="body_background body_foreground pre mono-space StandardOut-preContainer"
lr-infinite-scroll="stdOutScrollToTop" scroll-threshold="300" data-direction="up" time-threshold="500">
<div id="pre-container-content" class="StandardOut-preContent"></div>
</div>
<div class="scroll-spinner" id="stdoutMoreRowsBottom">
<i class="fa fa-cog fa-spin"></i>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

38
awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.route.js Normal file
View File

@ -0,0 +1,38 @@
/*************************************************
* Copyright (c) 2016 Ansible, Inc.
*
* All Rights Reserved
*************************************************/
import {templateUrl} from '../../shared/template-url/template-url.factory';
// TODO: figure out what this route should be - should it be scm_update?
export default {
name: 'scmUpdateStdout',
route: '/scm_update/:id/stdout',
templateUrl: templateUrl('standard-out/scm-update/standard-out-scm-update'),
controller: 'JobStdoutController',
data: {
jobType: 'project_updates'
},
resolve: {
features: ['FeaturesService', function(FeaturesService) {
return FeaturesService.get();
}],
adhocEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
// if (!$rootScope.adhoc_event_socket) {
// $rootScope.adhoc_event_socket = Socket({
// scope: $rootScope,
// endpoint: "ad_hoc_command_events"
// });
// $rootScope.adhoc_event_socket.init();
// return true;
// } else {
// return true;
// }
return true;
}]
}
};

60
awx/ui/client/src/standard-out/standard-out.block.less Normal file
View File

@ -0,0 +1,60 @@
@import "../shared/branding/colors.default.less";
/** @define StandardOut */
.StandardOut {
height: 100%;
display: flex;
flex-direction: row;
}
.StandardOut-leftPanel {
flex: 0 0 400px;
}
.StandardOut-rightPanel {
flex: 1 0;
margin-left: 20px;
}
.StandardOut-panelHeader {
color: @default-interface-txt;
font-size: 14px;
font-weight: bold;
margin-right: 10px;
text-transform: uppercase;
}
.StandardOut-consoleOutput {
margin-top: 25px;
min-height: 200px;
background-color: @default-secondary-bg;
border-radius: 5px;
}
.StandardOut-details {
margin-top: 25px;
}
.StandardOut-detailsRow {
display: flex;
}
.StandardOut-detailsRow:not(:last-child) {
margin-bottom: 20px;
}
.StandardOut-detailsLabel {
width: 130px;
flex: 0 0 130px;
color: @default-interface-txt;
text-transform: uppercase;
}
.StandardOut-detailsContent {
flex: 1 0;
}
.StandardOut-statusText {
margin-left: 6px;
}

66
awx/ui/client/src/controllers/JobStdout.js → awx/ui/client/src/standard-out/standard-out.controller.js
View File

@ -11,11 +11,12 @@
*/
export function JobStdoutController ($location, $log, $rootScope, $scope, $compile, $stateParams, ClearScope, GetBasePath, Wait, Rest, ProcessErrors) {
export function JobStdoutController ($location, $log, $rootScope, $scope, $compile, $state, $stateParams, ClearScope, GetBasePath, Wait, Rest, ProcessErrors, ModelToBasePathKey) {
ClearScope();
var job_id = $stateParams.id,
jobType = $state.current.data.jobType,
api_complete = false,
stdout_url,
current_range,
@ -32,26 +33,27 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
$scope.isClosed = true;
function openSockets() {
if (/\/jobs\/(\d)+\/stdout/.test($location.$$url)) {
$log.debug("socket watching on job_events-" + job_id);
$rootScope.event_socket.on("job_events-" + job_id, function() {
$log.debug("socket fired on job_events-" + job_id);
if (api_complete) {
event_queue++;
}
});
} else if (/\/ad_hoc_commands\/(\d)+/.test($location.$$url)) {
$log.debug("socket watching on ad_hoc_command_events-" + job_id);
$rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() {
$log.debug("socket fired on ad_hoc_command_events-" + job_id);
if (api_complete) {
event_queue++;
}
});
}
}
openSockets();
// function openSockets() {
// if (/\/jobs\/(\d)+\/stdout/.test($location.$$url)) {
// $log.debug("socket watching on job_events-" + job_id);
// $rootScope.event_socket.on("job_events-" + job_id, function() {
// $log.debug("socket fired on job_events-" + job_id);
// if (api_complete) {
// event_queue++;
// }
// });
// } else if (/\/ad_hoc_commands\/(\d)+/.test($location.$$url)) {
// $log.debug("socket watching on ad_hoc_command_events-" + job_id);
// $rootScope.adhoc_event_socket.on("ad_hoc_command_events-" + job_id, function() {
// $log.debug("socket fired on ad_hoc_command_events-" + job_id);
// if (api_complete) {
// event_queue++;
// }
// });
// }
// }
//
// openSockets();
if ($rootScope.removeJobStatusChange) {
$rootScope.removeJobStatusChange();
@ -158,9 +160,7 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
$(".StandardOut").height($("body").height() - 60);
// Note: could be ad_hoc_commands or jobs
var jobType = $location.path().replace(/^\//, '').split('/')[0];
Rest.setUrl(GetBasePath(jobType) + job_id + '/');
Rest.setUrl(GetBasePath('base') + jobType + '/' + job_id + '/');
Rest.get()
.success(function(data) {
$scope.job = data;
@ -182,13 +182,15 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
$scope.verbosity = data.verbosity;
$scope.job_tags = data.job_tags;
stdout_url = data.related.stdout;
if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
live_event_processing = false;
if ($rootScope.jobStdOutInterval) {
window.clearInterval($rootScope.jobStdOutInterval);
}
// if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
// live_event_processing = false;
// if ($rootScope.jobStdOutInterval) {
// window.clearInterval($rootScope.jobStdOutInterval);
// }
// }
if(stdout_url) {
$scope.$emit('LoadStdout');
}
$scope.$emit('LoadStdout');
})
.error(function(data, status) {
ProcessErrors($scope, data, status, null, { hdr: 'Error!',
@ -197,11 +199,9 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
$scope.refresh = function(){
if (loaded_sections.length === 0) { ////this if statement for refresh
$log.debug('calling LoadStdout');
$scope.$emit('LoadStdout');
}
else if (live_event_processing) {
$log.debug('calling getNextSection');
getNextSection();
}
};
@ -281,4 +281,4 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
}
JobStdoutController.$inject = [ '$location', '$log', '$rootScope', '$scope', '$compile', '$stateParams', 'ClearScope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors'];
JobStdoutController.$inject = [ '$location', '$log', '$rootScope', '$scope', '$compile', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Wait', 'Rest', 'ProcessErrors', 'ModelToBasePathKey'];

47
awx/ui/client/src/standard-out/standardOut.block.less
View File

@ -1,47 +0,0 @@
/** @define StandardOut */
.StandardOut {
height: 100%;
display: flex;
flex-direction: column;
}
.StandardOut-header {
flex: initial;
}
.StandardOut-breadcrumbs {
padding-left: 15px;
}
.StandardOut-form {
padding-left: 15px;
}
.StandardOut-panel {
flex: 1 0 0;
display: flex;
flex-direction: column;
margin-bottom: -41px;
}
.StandardOut-panelHeading {
flex: initial;
}
.StandardOut-panelBody {
flex: 1 0 auto;
padding: 0;
position: relative;
}
.StandardOut-preContainer {
position: absolute;
height: 100%;
padding-left: 15px;
padding-right: 15px;
}
.StandardOut-preContent {
position: absolute;
}