Follow up after review66454-log-duration

4 files changed, 8 insertions, 12 deletions

diff --git a/app/assets/javascripts/jobs/components/log/duration_badge.vue b/app/assets/javascripts/jobs/components/log/duration_badge.vue
index e9bc9e2cc9b..83f62703d27 100644
--- a/app/assets/javascripts/jobs/components/log/duration_badge.vue
+++ b/app/assets/javascripts/jobs/components/log/duration_badge.vue
@@ -9,5 +9,5 @@ export default {
 };
 </script>
 <template>
-  <div class="duration rounded align-self-start pr-2 pl-2 ml-2 flex-shrink-0">{{ duration }}</div>
+  <div class="duration rounded align-self-start px-2 ml-2 flex-shrink-0">{{ duration }}</div>
 </template>
diff --git a/app/assets/javascripts/jobs/components/log/log.vue b/app/assets/javascripts/jobs/components/log/log.vue
index 92a72c932c3..429796aeb4e 100644
--- a/app/assets/javascripts/jobs/components/log/log.vue
+++ b/app/assets/javascripts/jobs/components/log/log.vue
@@ -20,7 +20,7 @@ export default {
 };
 </script>
 <template>
-  <code class="job-log">
+  <code class="job-log d-block">
     <template v-for="(section, index) in trace">
       <template v-if="section.isHeader">
         <log-line-header
diff --git a/app/assets/javascripts/jobs/store/utils.js b/app/assets/javascripts/jobs/store/utils.js
index 333f1c898e6..261ec90cd12 100644
--- a/app/assets/javascripts/jobs/store/utils.js
+++ b/app/assets/javascripts/jobs/store/utils.js
@@ -25,6 +25,8 @@ export const parseLine = (line = {}, lineNumber) => ({
 export const logLinesParser = (lines = [], lineNumberStart) =>
   lines.reduce((acc, line, index) => {
     const lineNumber = lineNumberStart ? lineNumberStart + index : index;
+    const last = acc[acc.length - 1];
+
     if (line.section_header) {
       acc.push({
         isClosed: true,
@@ -32,15 +34,10 @@ export const logLinesParser = (lines = [], lineNumberStart) =>
         line: parseLine(line, lineNumber),
         lines: [],
       });
-    } else if (
-      acc.length &&
-      acc[acc.length - 1].isHeader &&
-      !line.section_duration &&
-      line.content.length
-    ) {
-      acc[acc.length - 1].lines.push(parseLine(line, lineNumber));
-    } else if (acc.length && acc[acc.length - 1].isHeader && line.section_duration) {
-      acc[acc.length - 1].section_duration = line.section_duration;
+    } else if (acc.length && last.isHeader && !line.section_duration && line.content.length) {
+      last.lines.push(parseLine(line, lineNumber));
+    } else if (acc.length && last.isHeader && line.section_duration) {
+      last.section_duration = line.section_duration;
     } else if (line.content.length) {
       acc.push(parseLine(line, lineNumber));
     }
diff --git a/app/assets/stylesheets/framework/job_log.scss b/app/assets/stylesheets/framework/job_log.scss
index fcf185df4a8..5c2491c8233 100644
--- a/app/assets/stylesheets/framework/job_log.scss
+++ b/app/assets/stylesheets/framework/job_log.scss
@@ -1,6 +1,5 @@
 .job-log {
   font-family: $monospace-font;
-  display: block;
   padding: $gl-padding-8 $input-horizontal-padding;
   margin: 0 0 $gl-padding-8;
   font-size: 13px;