External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

removing prettyfyLite function for a flag in prettyify

Browse Source
This commit is contained in:
jaredevantabor
2016-11-17 12:32:17 -08:00
parent ff4c5f0e7e
commit d849cec243
3 changed files with 37 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/job-results/host-event/host-event-timing.partial.html
View File

@@ -1 +0,0 @@
<div>timing</div>

2
awx/ui/client/src/job-results/host-event/host-event.controller.js
View File

@@ -51,7 +51,7 @@
// grab standard out & standard error if present, and remove from the results displayed in the details panel // grab standard out & standard error if present, and remove from the results displayed in the details panel
if (hostEvent.stdout){ if (hostEvent.stdout){
$scope.stdout = parseStdoutService.prettifyLite(hostEvent.stdout); $scope.stdout = parseStdoutService.prettify(hostEvent.stdout, "unstyled");
delete $scope.event.stdout; delete $scope.event.stdout;
} }
if (hostEvent.stderr){ if (hostEvent.stderr){

81
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -8,65 +8,56 @@ export default ['$log', function($log){
var val = { var val = {
// parses stdout string from api and formats various codes to the // parses stdout string from api and formats various codes to the
// correct dom structure // correct dom structure
prettify: function(line){ prettify: function(line, unstyled){
// TODO: remove once Chris's fixes to the [K lines comes in // TODO: remove once Chris's fixes to the [K lines comes in
if (line.indexOf("[K") > -1) { if (line.indexOf("[K") > -1) {
$log.error(line); $log.error(line);
} }
if(!unstyled){
// add span tags with color styling
line = line.replace(/u001b/g, '');
line = line.replace(/u001b/g, ''); // ansi classes
line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">');
line = line.replace(/\[0;31m/g, '<span class="ansi1 ansi31">');
line = line.replace(/\[0;32m/g, '<span class="ansi32">');
line = line.replace(/\[0;32m=/g, '<span class="ansi32">');
line = line.replace(/\[0;32m1/g, '<span class="ansi36">');
line = line.replace(/\[0;33m/g, '<span class="ansi33">');
line = line.replace(/\[0;34m/g, '<span class="ansi34">');
line = line.replace(/\[0;35m/g, '<span class="ansi35">');
line = line.replace(/\[0;36m/g, '<span class="ansi36">');
line = line.replace(/(<host.*?>)\s/g, '$1');
// ansi classes //end span
line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">'); line = line.replace(/\[0m/g, '</span>');
line = line.replace(/\[0;31m/g, '<span class="ansi1 ansi31">');
line = line.replace(/\[0;32m/g, '<span class="ansi32">');
line = line.replace(/\[0;32m=/g, '<span class="ansi32">');
line = line.replace(/\[0;32m1/g, '<span class="ansi36">');
line = line.replace(/\[0;33m/g, '<span class="ansi33">');
line = line.replace(/\[0;34m/g, '<span class="ansi34">');
line = line.replace(/\[0;35m/g, '<span class="ansi35">');
line = line.replace(/\[0;36m/g, '<span class="ansi36">');
line = line.replace(/(<host.*?>)\s/g, '$1');
//end span
line = line.replace(/\[0m/g, '</span>');
return line;
},
prettifyLite: function(line){
// this function will return a line of stdout without the <span>
// tags styling the output. This isn't needed in the case
// of the host event modal where stdout is displayed in a CodeMirror
// TODO: remove once Chris's fixes to the [K lines comes in
if (line.indexOf("[K") > -1) {
$log.error(line);
} }
else {
// For the host event modal in the standard out tab,
// the styling isn't necessary
line = line.replace(/u001b/g, '');
line = line.replace(/u001b/g, ''); // ansi classes
line = line.replace(/\[1;31m/g, '');
line = line.replace(/\[0;31m/g, '');
line = line.replace(/\[0;32m/g, '');
line = line.replace(/\[0;32m=/g, '');
line = line.replace(/\[0;32m1/g, '');
line = line.replace(/\[0;33m/g, '');
line = line.replace(/\[0;34m/g, '');
line = line.replace(/\[0;35m/g, '');
line = line.replace(/\[0;36m/g, '');
line = line.replace(/(<host.*?>)\s/g, '$1');
// ansi classes //end span
line = line.replace(/\[1;31m/g, ''); line = line.replace(/\[0m/g, '');
line = line.replace(/\[0;31m/g, ''); }
line = line.replace(/\[0;32m/g, '');
line = line.replace(/\[0;32m=/g, '');
line = line.replace(/\[0;32m1/g, '');
line = line.replace(/\[0;33m/g, '');
line = line.replace(/\[0;34m/g, '');
line = line.replace(/\[0;35m/g, '');
line = line.replace(/\[0;36m/g, '');
line = line.replace(/(<host.*?>)\s/g, '$1');
//end span
line = line.replace(/\[0m/g, '');
//TODO: figure out how to get rid of the hidden characters that
// show up in the codmirror as red dots
return line; return line;
}, },
// adds anchor tags and tooltips to host status lines // adds anchor tags and tooltips to host status lines
getAnchorTags: function(event, line){ getAnchorTags: function(event, line){
if(event.event.indexOf("runner_") === -1){ if(event.event_name.indexOf("runner_") === -1){
return line; return line;
} }
else{ else{