Skip to content
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

[App Search] Add EuiThemeProvider to fix crashing bug #124993

Merged
merged 2 commits into from
Feb 9, 2022
Merged

[App Search] Add EuiThemeProvider to fix crashing bug #124993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7f792
Add EuiThemeProvider to fix crashing bug
scottybollinger Feb 8, 2022
7df77c6
Fix failing tests
scottybollinger Feb 8, 2022
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
35 changes: 19 additions & 16 deletions x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@ import React from 'react';

import { shallow } from 'enzyme';

import { LogStream } from '../../../../../infra/public';

import { EntSearchLogStream } from './';

describe('EntSearchLogStream', () => {
const mockDateNow = jest.spyOn(global.Date, 'now').mockReturnValue(160000000);

describe('renders with default props', () => {
const wrapper = shallow(<EntSearchLogStream />);
/** As a result of the theme provider being added, we have to extract the child component to correctly assert */
const wrapper = shallow(shallow(<EntSearchLogStream />).prop('children'));

it('renders a LogStream component', () => {
expect(wrapper.type()).toEqual(LogStream);
it('renders a LogStream (wrapped in React.Suspense) component', () => {
expect(wrapper.type()).toEqual(React.Suspense);
});

it('renders with the enterprise search log source ID', () => {
Expand All @@ -36,7 +35,9 @@ describe('EntSearchLogStream', () => {
describe('renders custom props', () => {
it('overrides the default props', () => {
const wrapper = shallow(
<EntSearchLogStream sourceId="test" startTimestamp={1} endTimestamp={2} />
shallow(<EntSearchLogStream sourceId="test" startTimestamp={1} endTimestamp={2} />).prop(
'children'
)
);

expect(wrapper.prop('sourceId')).toEqual('test');
Expand All @@ -45,23 +46,25 @@ describe('EntSearchLogStream', () => {
});

it('allows passing a custom hoursAgo that modifies the default start timestamp', () => {
const wrapper = shallow(<EntSearchLogStream hoursAgo={1} />);
const wrapper = shallow(shallow(<EntSearchLogStream hoursAgo={1} />).prop('children'));

expect(wrapper.prop('startTimestamp')).toEqual(156400000);
expect(wrapper.prop('endTimestamp')).toEqual(160000000);
});

it('allows passing any prop that the LogStream component takes', () => {
const wrapper = shallow(
<EntSearchLogStream
height={500}
highlight="some-log-id"
columns={[
{ type: 'timestamp', header: 'Timestamp' },
{ type: 'field', field: 'log.level', header: 'Log level', width: 300 },
]}
filters={[]}
/>
shallow(
<EntSearchLogStream
height={500}
highlight="some-log-id"
columns={[
{ type: 'timestamp', header: 'Timestamp' },
{ type: 'field', field: 'log.level', header: 'Log level', width: 300 },
]}
filters={[]}
/>
).prop('children')
);

expect(wrapper.prop('height')).toEqual(500);
Expand Down
15 changes: 9 additions & 6 deletions x-pack/plugins/enterprise_search/public/applications/shared/log_stream/log_stream.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import React from 'react';

import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
import { LogStream, LogStreamProps } from '../../../../../infra/public';

import { LOGS_SOURCE_ID } from '../../../../common/constants';
Expand Down Expand Up @@ -37,11 +38,13 @@ export const EntSearchLogStream: React.FC<Props> = ({
if (!startTimestamp) startTimestamp = endTimestamp - hoursAgo * 60 * 60 * 1000;

return (
<LogStream
sourceId={LOGS_SOURCE_ID}
startTimestamp={startTimestamp}
endTimestamp={endTimestamp}
{...props}
/>
<EuiThemeProvider>
<LogStream
sourceId={LOGS_SOURCE_ID}
startTimestamp={startTimestamp}
endTimestamp={endTimestamp}
{...props}
/>
</EuiThemeProvider>
);
};