Skip to content

[Security Solution] Do not render descriptionless actions within an EuiCard #73611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2020
Merged

[Security Solution] Do not render descriptionless actions within an EuiCard #73611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions ...s/security_solution/public/common/components/empty_page/__snapshots__/index.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 23 additions & 9 deletions x-pack/plugins/security_solution/public/common/components/empty_page/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,27 @@ import React from 'react';

import { EmptyPage } from './index';

test('renders correctly', () => {
const actions = {
actions: {
label: 'Do Something',
url: 'my/url/from/nowwhere',
},
};
const EmptyComponent = shallow(<EmptyPage actions={actions} title="My Super Title" />);
expect(EmptyComponent).toMatchSnapshot();
describe('EmptyPage component', () => {
it('renders actions without descriptions', () => {
const actions = {
actions: {
label: 'Do Something',
url: 'my/url/from/nowwhere',
},
};
const EmptyComponent = shallow(<EmptyPage actions={actions} title="My Super Title" />);
expect(EmptyComponent).toMatchSnapshot();
});

it('renders actions with descriptions', () => {
const actions = {
actions: {
description: 'My Description',
label: 'Do Something',
url: 'my/url/from/nowwhere',
},
};
const EmptyComponent = shallow(<EmptyPage actions={actions} title="My Super Title" />);
expect(EmptyComponent).toMatchSnapshot();
});
});
15 changes: 3 additions & 12 deletions x-pack/plugins/security_solution/public/common/components/empty_page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,7 @@ const EmptyPageComponent = React.memo<EmptyPageProps>(({ actions, message, title
.filter((a) => a.label && a.url)
.map(
(
{
icon,
label,
target,
url,
descriptionTitle = false,
description = false,
onClick,
fill = true,
},
{ icon, label, target, url, descriptionTitle, description, onClick, fill = true },
idx
) =>
descriptionTitle != null || description != null ? (
Expand All @@ -70,8 +61,8 @@ const EmptyPageComponent = React.memo<EmptyPageProps>(({ actions, message, title
key={`empty-page-${titles[idx]}-action`}
>
<EuiCard
title={descriptionTitle}
description={description}
title={descriptionTitle ?? false}
description={description ?? false}
Comment on lines +64 to +65
Copy link
Member

@spong spong Jul 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Close enough... 😅

Suggested change
title={descriptionTitle ?? false}
description={description ?? false}
gpt3={`if text === '' DON'T DISPLAY BOX AROUND BUTTON PLZ`}

footer={
/* eslint-disable-next-line @elastic/eui/href-or-on-click */
<EuiButton
Expand Down