From f2479e1987304fc7064de4b1f5e72320f958edd7 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Wed, 14 Nov 2018 11:17:10 -0500 Subject: Prevents empty button in jobs empty state Returns `null` instead of an empty object to make sure Vue doesn't render the button --- app/assets/javascripts/jobs/store/getters.js | 2 +- changelogs/unreleased/54021-empty-button.yml | 5 +++++ spec/javascripts/jobs/components/empty_state_spec.js | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/54021-empty-button.yml diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index d440b2c9ef1..35e92b0b5d9 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -42,7 +42,7 @@ export const emptyStateIllustration = state => (state.job && state.job.status && state.job.status.illustration) || {}; export const emptyStateAction = state => - (state.job && state.job.status && state.job.status.action) || {}; + (state.job && state.job.status && state.job.status.action) || null; export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete; diff --git a/changelogs/unreleased/54021-empty-button.yml b/changelogs/unreleased/54021-empty-button.yml new file mode 100644 index 00000000000..3b03665cf95 --- /dev/null +++ b/changelogs/unreleased/54021-empty-button.yml @@ -0,0 +1,5 @@ +--- +title: Prevent empty button being rendered in empty state +merge_request: +author: +type: fixed diff --git a/spec/javascripts/jobs/components/empty_state_spec.js b/spec/javascripts/jobs/components/empty_state_spec.js index 0a39709221c..a2df79bdda0 100644 --- a/spec/javascripts/jobs/components/empty_state_spec.js +++ b/spec/javascripts/jobs/components/empty_state_spec.js @@ -84,6 +84,7 @@ describe('Empty State', () => { vm = mountComponent(Component, { ...props, content, + action: null, }); expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull(); -- cgit v1.2.1