Skip to content
Snippets Groups Projects
Commit 144268da authored by Miranda Fluharty's avatar Miranda Fluharty Committed by Paul Slaughter
Browse files

Only render job sidebar block if it has content

Change sidebar's renderBlock() to return true only if
any of the block's <detail-row>s will be rendered
Change block to render only if renderBlock() returns true
parent 040eb078
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -73,15 +73,14 @@ export default {
},
renderBlock() {
return (
this.job.merge_request ||
this.job.duration ||
this.job.finished_data ||
this.job.finished_at ||
this.job.erased_at ||
this.job.queued ||
this.hasTimeout ||
this.job.runner ||
this.job.coverage ||
this.job.tags.length ||
this.job.cancel_path
this.job.tags.length
);
},
hasArtifact() {
Loading
Loading
@@ -160,7 +159,7 @@ export default {
</gl-link>
</div>
 
<div :class="{ block: renderBlock }">
<div v-if="renderBlock" class="block">
<detail-row
v-if="job.duration"
:value="duration"
Loading
Loading
---
title: Remove blank block from job sidebar
merge_request: 30754
author:
type: fixed
Loading
Loading
@@ -486,6 +486,31 @@ describe('Job App ', () => {
});
});
});
describe('sidebar', () => {
it('has no blank blocks', done => {
mock.onGet(props.endpoint).replyOnce(
200,
Object.assign({}, job, {
duration: null,
finished_at: null,
erased_at: null,
queued: null,
runner: null,
coverage: null,
tags: [],
cancel_path: null,
}),
);
vm.$nextTick(() => {
vm.$el.querySelectorAll('.blocks-container > *').forEach(block => {
expect(block.textContent.trim()).not.toBe('');
});
done();
});
});
});
});
 
describe('archived job', () => {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment