diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 12:07:33 +0000 |
commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /app/assets/javascripts/jobs | |
parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
download | gitlab-ce-6b75320f525f841454f1ab162d141d3610f2e77b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/store/mutations.js | 6 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/store/utils.js | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/app/assets/javascripts/jobs/store/mutations.js b/app/assets/javascripts/jobs/store/mutations.js index 702f00888d0..77c68cac4a6 100644 --- a/app/assets/javascripts/jobs/store/mutations.js +++ b/app/assets/javascripts/jobs/store/mutations.js @@ -26,7 +26,7 @@ export default { if (log.append) { if (isNewJobLogActive()) { - state.trace = updateIncrementalTrace(log.lines, state.trace); + state.trace = log.lines ? updateIncrementalTrace(log.lines, state.trace) : state.trace; } else { state.trace += log.html; } @@ -35,9 +35,9 @@ export default { // When the job still does not have a trace // the trace response will not have a defined // html or size. We keep the old value otherwise these - // will be set to `undefined` + // will be set to `null` if (isNewJobLogActive()) { - state.trace = logLinesParser(log.lines) || state.trace; + state.trace = log.lines ? logLinesParser(log.lines) : state.trace; } else { state.trace = log.html || state.trace; } diff --git a/app/assets/javascripts/jobs/store/utils.js b/app/assets/javascripts/jobs/store/utils.js index 12069e0c123..58e49f54d96 100644 --- a/app/assets/javascripts/jobs/store/utils.js +++ b/app/assets/javascripts/jobs/store/utils.js @@ -147,13 +147,15 @@ export const findOffsetAndRemove = (newLog = [], oldParsed = []) => { const firstNew = newLog[0]; - if (last.offset === firstNew.offset || (last.line && last.line.offset === firstNew.offset)) { - cloneOldLog.splice(lastIndex); - } else if (last.lines && last.lines.length) { - const lastNestedIndex = last.lines.length - 1; - const lastNested = last.lines[lastNestedIndex]; - if (lastNested.offset === firstNew.offset) { - last.lines.splice(lastNestedIndex); + if (last && firstNew) { + if (last.offset === firstNew.offset || (last.line && last.line.offset === firstNew.offset)) { + cloneOldLog.splice(lastIndex); + } else if (last.lines && last.lines.length) { + const lastNestedIndex = last.lines.length - 1; + const lastNested = last.lines[lastNestedIndex]; + if (lastNested.offset === firstNew.offset) { + last.lines.splice(lastNestedIndex); + } } } @@ -170,7 +172,7 @@ export const findOffsetAndRemove = (newLog = [], oldParsed = []) => { * @param array oldLog * @param array newLog */ -export const updateIncrementalTrace = (newLog, oldParsed = []) => { +export const updateIncrementalTrace = (newLog = [], oldParsed = []) => { const parsedLog = findOffsetAndRemove(newLog, oldParsed); return logLinesParser(newLog, parsedLog); |