Skip to content

[SIEM] - Fix Jest test errors and warnings #41712

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
stephmilovic merged 5 commits into from
Jul 23, 2019
Merged

[SIEM] - Fix Jest test errors and warnings #41712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8339ca
silence RISON errs
stephmilovic Jul 19, 2019
d008475
working on clearing errs
stephmilovic Jul 19, 2019
c223192
working through table prop errs
stephmilovic Jul 22, 2019
8b41433
clear konva err
stephmilovic Jul 22, 2019
365c4e6
Merge branch 'master' into fix-siem-jest-errs
stephmilovic Jul 22, 2019
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
8 changes: 4 additions & 4 deletions x-pack/legacy/plugins/siem/public/components/autocomplete_field/suggestion_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { EuiIcon } from '@elastic/eui';
import { transparentize } from 'polished';
import React from 'react';
import { AutocompleteSuggestion } from 'ui/autocomplete_providers';

import styled from 'styled-components';
import euiStyled from '../../../../../common/eui_styled_components';

interface SuggestionItemProps {
Expand Down Expand Up @@ -64,7 +64,7 @@ const SuggestionItemField = euiStyled.div`
padding: ${props => props.theme.eui.euiSizeXS};
`;

const SuggestionItemIconField = SuggestionItemField.extend<{ suggestionType: string }>`
const SuggestionItemIconField = styled(SuggestionItemField)<{ suggestionType: string }>`
background-color: ${props =>
transparentize(0.9, getEuiIconColor(props.theme, props.suggestionType))};
color: ${props => getEuiIconColor(props.theme, props.suggestionType)};
Expand All @@ -73,12 +73,12 @@ const SuggestionItemIconField = SuggestionItemField.extend<{ suggestionType: str
width: ${props => props.theme.eui.euiSizeXL};
`;

const SuggestionItemTextField = SuggestionItemField.extend`
const SuggestionItemTextField = styled(SuggestionItemField)`
flex: 2 0 0;
font-family: ${props => props.theme.eui.euiCodeFontFamily};
`;

const SuggestionItemDescriptionField = SuggestionItemField.extend`
const SuggestionItemDescriptionField = styled(SuggestionItemField)`
flex: 3 0 0;

p {
Expand Down
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,10 @@ export const getColumns = ({
},
{
field: 'valuesConcatenated',
name: i18n.BLANK,
Copy link
Copy Markdown
Contributor Author

@stephmilovic stephmilovic Jul 22, 2019

Choose a reason for hiding this comment

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

@andrew-goldstein does this look ok to you? i think this is a hidden (1px) column, so I just put a blank name as it is a required prop

Copy link
Copy Markdown
Contributor

@andrew-goldstein andrew-goldstein Jul 23, 2019

Choose a reason for hiding this comment

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

Yes this looks good. The contents of this field are not rendered. It exists to allow filtering on multiple values like IP addresses, when those values are encoded as an array instead of a string. I ran this branch locally and verified that filtering continues to work for hosts that have multiple IP addresses, i.e. siem-es.

render: () => null,
sortable: false,
truncateText: true,
render: () => null,
width: '1px',
},
];
4 changes: 4 additions & 0 deletions x-pack/legacy/plugins/siem/public/components/event_details/translations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ export const DESCRIPTION = i18n.translate('xpack.siem.eventDetails.description',
defaultMessage: 'Description',
});

export const BLANK = i18n.translate('xpack.siem.eventDetails.blank', {
defaultMessage: ' ',
});

export const PLACEHOLDER = i18n.translate('xpack.siem.eventDetails.filter.placeholder', {
defaultMessage: 'Filter by Field, Value, or Description...',
});
Expand Down
10 changes: 10 additions & 0 deletions ...ck/legacy/plugins/siem/public/components/ml/conditional_links/add_entities_to_kql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
import { entityToKql, entitiesToKql, addEntitiesToKql } from './add_entities_to_kql';

describe('add_entities_to_kql', () => {
// Suppress warnings about invalid RISON as this is what we are testing
/* eslint-disable no-console */
const originalError = console.log;
beforeAll(() => {
console.log = jest.fn();
});

afterAll(() => {
console.log = originalError;
});
describe('#entityToKql', () => {
test('returns empty string with no entity names defined and an empty entity string', () => {
const entity = entityToKql([], '');
Expand Down
10 changes: 10 additions & 0 deletions ...m/public/components/ml/conditional_links/replace_kql_query_location_for_host_page.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@

import { replaceKqlQueryLocationForHostPage } from './replace_kql_query_location_for_host_page';

// Suppress warnings about invalid RISON as this is what we are testing
/* eslint-disable no-console */
const originalError = console.log;
describe('replace_kql_query_location_for_host_page', () => {
beforeAll(() => {
console.log = jest.fn();
});

afterAll(() => {
console.log = originalError;
});
test('replaces host details and type details for a page', () => {
const replacement = replaceKqlQueryLocationForHostPage(
'(filterQuery:(expression:\'process.name: "some-name"\',kind:kuery),queryLocation:hosts.details,type:details)'
Expand Down
11 changes: 10 additions & 1 deletion ...ublic/components/ml/conditional_links/replace_kql_query_location_for_network_page.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,17 @@
*/

import { replaceKqlQueryLocationForNetworkPage } from './replace_kql_query_location_for_network_page';

// Suppress warnings about invalid RISON as this is what we are testing
/* eslint-disable no-console */
const originalError = console.log;
describe('replace_kql_query_location_for_host_page', () => {
beforeAll(() => {
console.log = jest.fn();
});

afterAll(() => {
console.log = originalError;
});
test('replaces host details and type details for a page', () => {
const replacement = replaceKqlQueryLocationForNetworkPage(
'(filterQuery:(expression:\'process.name: "some-name"\',kind:kuery),queryLocation:network.details,type:details)'
Expand Down
10 changes: 10 additions & 0 deletions x-pack/legacy/plugins/siem/public/components/ml/conditional_links/rison_helpers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@
import { decodeRison, isRisonObject, isRegularString } from './rison_helpers';

describe('rison_helpers', () => {
// Suppress warnings about invalid RISON as this is what we are testing
/* eslint-disable no-console */
const originalError = console.log;
describe('#decodeRison', () => {
beforeAll(() => {
console.log = jest.fn();
});

afterAll(() => {
console.log = originalError;
});
test('returns null if given a bad value for RISON', () => {
const expected = decodeRison('some invalid value');
expect(expected).toEqual(null);
Expand Down
22 changes: 19 additions & 3 deletions ...k/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
import { EuiButtonIcon, EuiToolTip, EuiIcon } from '@elastic/eui';
import * as React from 'react';
import styled from 'styled-components';

import { ACTION_COLUMN_WIDTH, PositionedIcon } from './common_styles';
import { DeleteTimelines, OnOpenTimeline, OpenTimelineResult } from '../types';
import { DeleteTimelineModalButton } from '../delete_timeline_modal';

import * as i18n from '../translations';

const HeaderIcon = styled(EuiIcon)`
position: relative;
left: 9px;
`;

/**
* Returns the action columns (e.g. delete, open duplicate timeline)
*/
Expand All @@ -26,7 +32,12 @@ export const getActionsColumns = ({
showDeleteAction: boolean;
}) => {
const deleteTimelineColumn = {
align: 'center',
align: 'right',
name: (
Copy link
Copy Markdown
Contributor Author

@stephmilovic stephmilovic Jul 22, 2019

Choose a reason for hiding this comment

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

@andrew-goldstein does this look ok to you? it adds a header icon to these columns

Copy link
Copy Markdown
Contributor

@andrew-goldstein andrew-goldstein Jul 23, 2019

Choose a reason for hiding this comment

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

Would you be willing to check with @MichaelMarcialis to see how feels about this change, since it's a departure from the wireframe shown in the screenshot below?

timelines-page

Copy link
Copy Markdown
Contributor

@MichaelMarcialis MichaelMarcialis Jul 23, 2019

Choose a reason for hiding this comment

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

Ah, missed my window to respond. I'll have a look at the change when I pull in master on my local.

<EuiToolTip content={i18n.DELETE}>
<HeaderIcon data-test-subj="delete-header-icon" size="s" color="subdued" type="trash" />
</EuiToolTip>
),
field: 'savedObjectId',
render: (savedObjectId: string, { title }: OpenTimelineResult) => (
<PositionedIcon>
Expand All @@ -42,7 +53,12 @@ export const getActionsColumns = ({
};

const openAsDuplicateColumn = {
align: 'center',
align: 'right',
name: (
<EuiToolTip content={i18n.OPEN_AS_DUPLICATE}>
<HeaderIcon data-test-subj="duplicate-header-icon" size="s" color="subdued" type="copy" />
</EuiToolTip>
),
field: 'savedObjectId',
render: (savedObjectId: string, timelineResult: OpenTimelineResult) => (
<PositionedIcon>
Expand Down
Loading