diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts index 7ee53ae5d4bee..c9d8162af8f0c 100644 --- a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts +++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts @@ -55,13 +55,14 @@ export const getDataProvider = ( field: string, id: string, value: string | string[], - operator: QueryOperator = IS_OPERATOR + operator: QueryOperator = IS_OPERATOR, + excluded: boolean = false ): DataProvider => ({ and: [], enabled: true, id: escapeDataProviderId(id), name: field, - excluded: false, + excluded, kqlQuery: '', queryMatch: { field, @@ -75,9 +76,10 @@ export const getDataProviderAnd = ( field: string, id: string, value: string | string[], - operator: QueryOperator = IS_OPERATOR + operator: QueryOperator = IS_OPERATOR, + excluded: boolean = false ): DataProvidersAnd => { - const { and, ...dataProvider } = getDataProvider(field, id, value, operator); + const { and, ...dataProvider } = getDataProvider(field, id, value, operator, excluded); return dataProvider; }; diff --git a/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.test.tsx b/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.test.tsx index a5f2883b676af..e1512b8b7ada1 100644 --- a/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.test.tsx +++ b/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.test.tsx @@ -15,9 +15,19 @@ import { PREVALENCE_DETAILS_TABLE_TEST_ID, } from './test_ids'; import { usePrevalence } from '../../shared/hooks/use_prevalence'; +import { TestProviders } from '../../../common/mock'; jest.mock('../../shared/hooks/use_prevalence'); +const mockDispatch = jest.fn(); +jest.mock('react-redux', () => { + const original = jest.requireActual('react-redux'); + return { + ...original, + useDispatch: () => mockDispatch, + }; +}); + const panelContextValue = { eventId: 'event id', indexName: 'indexName', @@ -53,9 +63,11 @@ describe('PrevalenceDetails', () => { }); const { getByTestId } = render( - - - + + + + + ); expect(getByTestId(PREVALENCE_DETAILS_TABLE_TEST_ID)).toBeInTheDocument(); diff --git a/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.tsx b/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.tsx index eeadf1362c71e..a5e7907c13c8c 100644 --- a/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.tsx +++ b/x-pack/plugins/security_solution/public/flyout/left/components/prevalence_details.tsx @@ -17,6 +17,7 @@ import { EuiSpacer, EuiSuperDatePicker, } from '@elastic/eui'; +import { InvestigateInTimelineButton } from '../../../common/components/event_details/table/investigate_in_timeline_button'; import type { PrevalenceData } from '../../shared/hooks/use_prevalence'; import { usePrevalence } from '../../shared/hooks/use_prevalence'; import { ERROR_MESSAGE, ERROR_TITLE } from '../../shared/translations'; @@ -46,6 +47,12 @@ import { PREVALENCE_DETAILS_TABLE_TEST_ID, } from './test_ids'; import { useLeftPanelContext } from '../context'; +import { + getDataProvider, + getDataProviderAnd, +} from '../../../common/components/event_details/table/use_action_cell_data_provider'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { IS_OPERATOR } from '../../../../common/types'; export const PREVALENCE_TAB_ID = 'prevalence-details'; const DEFAULT_FROM = 'now-30d'; @@ -63,7 +70,6 @@ const columns: Array> = [ 'data-test-subj': PREVALENCE_DETAILS_TABLE_VALUE_CELL_TEST_ID, }, { - field: 'alertCount', name: ( {PREVALENCE_TABLE_ALERT_COUNT_COLUMN_TITLE} @@ -71,10 +77,25 @@ const columns: Array> = [ ), 'data-test-subj': PREVALENCE_DETAILS_TABLE_ALERT_COUNT_CELL_TEST_ID, + render: (data: PrevalenceData) => { + const dataProviders = [ + getDataProvider(data.field, `timeline-indicator-${data.field}-${data.value}`, data.value), + ]; + return data.alertCount > 0 ? ( + + <>{data.alertCount} + + ) : ( + getEmptyTagValue() + ); + }, width: '10%', }, { - field: 'docCount', name: ( {PREVALENCE_TABLE_DOC_COUNT_COLUMN_TITLE} @@ -82,6 +103,38 @@ const columns: Array> = [ ), 'data-test-subj': PREVALENCE_DETAILS_TABLE_DOC_COUNT_CELL_TEST_ID, + render: (data: PrevalenceData) => { + const dataProviders = [ + { + ...getDataProvider( + data.field, + `timeline-indicator-${data.field}-${data.value}`, + data.value + ), + and: [ + getDataProviderAnd( + 'event.kind', + `timeline-indicator-event.kind-not-signal`, + 'signal', + IS_OPERATOR, + true + ), + ], + }, + ]; + return data.docCount > 0 ? ( + + <>{data.docCount} + + ) : ( + getEmptyTagValue() + ); + }, width: '10%', }, { diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_left_panel_prevalence_tab.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_left_panel_prevalence_tab.cy.ts index baff17ce85d03..97645c3df5490 100644 --- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_left_panel_prevalence_tab.cy.ts +++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/expandable_flyout/alert_details_left_panel_prevalence_tab.cy.ts @@ -68,7 +68,7 @@ describe('Alert details expandable flyout left panel prevalence', () => { ); cy.get(DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_PREVALENCE_TABLE_DOC_COUNT_CELL).should( 'contain.text', - 0 + '—' ); cy.get(DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_PREVALENCE_TABLE_HOST_PREVALENCE_CELL).should( 'contain.text',