Commit 6c51a6df authored by Phil Hughes's avatar Phil Hughes

Merge branch '54021-empty-button' into 'master'

Prevents empty button in jobs empty state

Closes #54021

See merge request gitlab-org/gitlab-ce!23072
parents 84db49ea f2479e19
...@@ -42,7 +42,7 @@ export const emptyStateIllustration = state => ...@@ -42,7 +42,7 @@ export const emptyStateIllustration = state =>
(state.job && state.job.status && state.job.status.illustration) || {}; (state.job && state.job.status && state.job.status.illustration) || {};
export const emptyStateAction = state => 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; export const isScrollingDown = state => isScrolledToBottom() && !state.isTraceComplete;
......
---
title: Prevent empty button being rendered in empty state
merge_request:
author:
type: fixed
...@@ -84,6 +84,7 @@ describe('Empty State', () => { ...@@ -84,6 +84,7 @@ describe('Empty State', () => {
vm = mountComponent(Component, { vm = mountComponent(Component, {
...props, ...props,
content, content,
action: null,
}); });
expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull(); expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment