External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 13:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

update line cap display

Browse Source
This commit is contained in:
John Mitchell
2017-01-12 16:06:36 -05:00
parent f446705767
commit 5ba0e1383b
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
View File

@@ -223,6 +223,11 @@
color: @default-interface-txt; color: @default-interface-txt;
} }
.JobResultsStdOut-cappedLine {
color: @b7grey;
font-style: italic;
}
@media (max-width: @breakpoint-md) { @media (max-width: @breakpoint-md) {
.JobResultsStdOut-numberColumnPreload { .JobResultsStdOut-numberColumnPreload {
display: none; display: none;

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

@@ -27,7 +27,7 @@ export default ['$log', 'moment', function($log, moment){
line = line.replace(/u001b/g, ''); line = line.replace(/u001b/g, '');
// ansi classes // ansi classes
line = line.replace(/\[1;im/g, '<i>'); line = line.replace(/\[1;im/g, '<span class="JobResultsStdOut-cappedLine">');
line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">'); line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">');
line = line.replace(/\[0;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">');
@@ -40,7 +40,6 @@ export default ['$log', 'moment', function($log, moment){
line = line.replace(/(<host.*?>)\s/g, '$1'); line = line.replace(/(<host.*?>)\s/g, '$1');
//end span //end span
line = line.replace(/\[0im/g, '</i>');
line = line.replace(/\[0m/g, '</span>'); line = line.replace(/\[0m/g, '</span>');
} else { } else {
// For the host event modal in the standard out tab, // For the host event modal in the standard out tab,
@@ -205,7 +204,7 @@ export default ['$log', 'moment', function($log, moment){
let padBy = lineNums.length - lines.length; let padBy = lineNums.length - lines.length;
for (let i = 0; i <= padBy; i++) { for (let i = 0; i <= padBy; i++) {
lines.push("[1;imline capped.[0im"); lines.push("[1;imLine capped.[0m");
} }
} }

2
awx/ui/tests/spec/job-results/parse-stdout.service-test.js
View File

@@ -129,7 +129,7 @@ describe('parseStdoutService', () => {
end_line: 11, end_line: 11,
stdout: "a\r\nb\r\nc..." stdout: "a\r\nb\r\nc..."
}; };
let expectedReturn = [[8, "a"],[9, "b"], [10,"c..."], [11, "[1;imline capped.[0im"]]; let expectedReturn = [[8, "a"],[9, "b"], [10,"c..."], [11, "[1;imLine capped.[0m"]];
let returnedEvent = parseStdoutService.getLineArr(mockEvent); let returnedEvent = parseStdoutService.getLineArr(mockEvent);