From 5ba0e1383b2ef0e303fb3d07df0f9f9bd5152137 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 12 Jan 2017 16:06:36 -0500 Subject: [PATCH] update line cap display --- .../job-results-stdout/job-results-stdout.block.less | 5 +++++ awx/ui/client/src/job-results/parse-stdout.service.js | 5 ++--- awx/ui/tests/spec/job-results/parse-stdout.service-test.js | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less index 2df922e2c4..7ff93d17ee 100644 --- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less @@ -223,6 +223,11 @@ color: @default-interface-txt; } +.JobResultsStdOut-cappedLine { + color: @b7grey; + font-style: italic; +} + @media (max-width: @breakpoint-md) { .JobResultsStdOut-numberColumnPreload { display: none; diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js index bf4bac3799..f04b5d1fb6 100644 --- a/awx/ui/client/src/job-results/parse-stdout.service.js +++ b/awx/ui/client/src/job-results/parse-stdout.service.js @@ -27,7 +27,7 @@ export default ['$log', 'moment', function($log, moment){ line = line.replace(/u001b/g, ''); // ansi classes - line = line.replace(/\[1;im/g, ''); + line = line.replace(/\[1;im/g, ''); line = line.replace(/\[1;31m/g, ''); line = line.replace(/\[0;31m/g, ''); line = line.replace(/\[0;32m/g, ''); @@ -40,7 +40,6 @@ export default ['$log', 'moment', function($log, moment){ line = line.replace(/()\s/g, '$1'); //end span - line = line.replace(/\[0im/g, ''); line = line.replace(/\[0m/g, ''); } else { // 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; for (let i = 0; i <= padBy; i++) { - lines.push("[1;imline capped.[0im"); + lines.push("[1;imLine capped.[0m"); } } diff --git a/awx/ui/tests/spec/job-results/parse-stdout.service-test.js b/awx/ui/tests/spec/job-results/parse-stdout.service-test.js index 9dada797b0..c4aeace3e7 100644 --- a/awx/ui/tests/spec/job-results/parse-stdout.service-test.js +++ b/awx/ui/tests/spec/job-results/parse-stdout.service-test.js @@ -129,7 +129,7 @@ describe('parseStdoutService', () => { end_line: 11, 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);