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

fix traceback offset/counter # in UI

Browse Source
This commit is contained in:
Keith J. Grant
2022-11-11 14:55:36 -08:00
committed by Keith J. Grant
parent 2fdce43f9e
commit d34f6af830
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/src/screens/Job/JobOutput/JobEvent.js
View File

@@ -41,7 +41,7 @@ function JobEvent({
if (lineNumber < 0) { if (lineNumber < 0) {
return null; return null;
} }
const canToggle = index === toggleLineIndex; const canToggle = index === toggleLineIndex && !event.isTracebackOnly;
return ( return (
<JobEventLine <JobEventLine
onClick={isClickable ? onJobEventClick : undefined} onClick={isClickable ? onJobEventClick : undefined}
@@ -55,7 +55,7 @@ function JobEvent({
onToggle={onToggleCollapsed} onToggle={onToggleCollapsed}
/> />
<JobEventLineNumber> <JobEventLineNumber>
{lineNumber} {!event.isTracebackOnly ? lineNumber : ''}
<JobEventEllipsis isCollapsed={isCollapsed && canToggle} /> <JobEventEllipsis isCollapsed={isCollapsed && canToggle} />
</JobEventLineNumber> </JobEventLineNumber>
<JobEventLineText <JobEventLineText

7
awx/ui/src/screens/Job/JobOutput/loadJobEvents.js
View File

@@ -29,8 +29,11 @@ export function prependTraceback(job, events) {
start_line: 0, start_line: 0,
}; };
const firstIndex = events.findIndex((jobEvent) => jobEvent.counter === 1); const firstIndex = events.findIndex((jobEvent) => jobEvent.counter === 1);
if (firstIndex && events[firstIndex]?.stdout) { if (firstIndex > -1) {
const stdoutLines = events[firstIndex].stdout.split('\r\n'); if (!events[firstIndex].stdout) {
events[firstIndex].isTracebackOnly = true;
}
const stdoutLines = events[firstIndex].stdout?.split('\r\n') || [];
stdoutLines[0] = tracebackEvent.stdout; stdoutLines[0] = tracebackEvent.stdout;
events[firstIndex].stdout = stdoutLines.join('\r\n'); events[firstIndex].stdout = stdoutLines.join('\r\n');
} else { } else {