github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.16] [Security Solution] [Endpoint] Disable add endpoint event filters option when is not an event (#119731) (#120495)

Browse source 
* [Security Solution] [Endpoint] Disable add endpoint event filters option when is not an event (#119731)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx

* fix error

Co-authored-by: David Sánchez <davidsansol92@gmail.com>
This commit is contained in:
Kevin Logan 2021-12-06 12:03:38 -05:00 • committed by GitHub
parent c5473eb837
commit 143ea84336
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.test.tsx
View file

@ -86,7 +86,12 @@ describe('InvestigateInResolverAction', () => {
});
test('it does NOT render AddToCase context menu item when timelineId is not in the allowed list', () => {
const wrapper = mount(<AlertContextMenu {...props} timelineId="timeline-test" />, {
// In order to enable alert context menu without a timelineId, event needs to be event.kind === 'event' and agent.type === 'endpoint'
const customProps = {
...props,
ecsRowData: { ...ecsRowData, agent: { type: ['endpoint'] }, event: { kind: ['event'] } },
};
const wrapper = mount(<AlertContextMenu {...customProps} timelineId="timeline-test" />, {
wrappingComponent: TestProviders,
});
wrapper.find(actionMenuButton).simulate('click');

1
x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
View file

@ -164,6 +164,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps & PropsFromRedux
});
const { eventFilterActionItems } = useEventFilterAction({
onAddEventFilterClick: handleOnAddEventFilterClick,
disabled: !isEvent,
});
const items: React.ReactElement[] = useMemo(
() =>

6
x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.test.tsx
View file

@ -227,7 +227,7 @@ describe('take action dropdown', () => {
});
});
test('should disable the "Add Endpoint event filter" button if provided non-event or non-endpoint', async () => {
test('should hide the "Add Endpoint event filter" button if provided no event from endpoint', async () => {
wrapper = mount(
<TestProviders>
<TakeActionDropdown
@ -239,9 +239,7 @@ describe('take action dropdown', () => {
);
wrapper.find('button[data-test-subj="take-action-dropdown-btn"]').simulate('click');
await waitFor(() => {
expect(
wrapper.find('[data-test-subj="add-event-filter-menu-item"]').first().getDOMNode()
).toBeDisabled();
expect(wrapper.exists('[data-test-subj="add-event-filter-menu-item"]')).toBeFalsy();
});
});
});

17
x-pack/plugins/security_solution/public/detections/components/take_action_dropdown/index.tsx
View file

@ -91,8 +91,6 @@ export const TakeActionDropdown = React.memo(
const isEndpointEvent = useMemo(() => isEvent && isAgentEndpoint, [isEvent, isAgentEndpoint]);
const disableEventFilterAction = useMemo(() => !isEndpointEvent, [isEndpointEvent]);
const togglePopoverHandler = useCallback(() => {
setIsPopoverOpen(!isPopoverOpen);
}, [isPopoverOpen]);
@ -141,7 +139,7 @@ export const TakeActionDropdown = React.memo(
const { eventFilterActionItems } = useEventFilterAction({
onAddEventFilterClick: handleOnAddEventFilterClick,
disabled: disableEventFilterAction,
disabled: !isEndpointEvent,
});
const afterCaseSelection = useCallback(() => {
@ -167,8 +165,17 @@ export const TakeActionDropdown = React.memo(
() =>
!isEvent && actionsData.ruleId
? [...statusActionItems, ...exceptionActionItems]
: eventFilterActionItems,
[eventFilterActionItems, exceptionActionItems, statusActionItems, isEvent, actionsData.ruleId]
: isEndpointEvent
? eventFilterActionItems
: [],
[
eventFilterActionItems,
isEndpointEvent,
exceptionActionItems,
statusActionItems,
isEvent,
actionsData.ruleId,
]
);
const { addToCaseActionItems } = useAddToCaseActions({

4
x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
View file

@ -169,7 +169,7 @@ describe('Actions', () => {
wrapper.find('[data-test-subj="timeline-context-menu-button"]').first().prop('isDisabled')
).toBe(false);
});
test('it enables for event.kind: alert and agent.type: endpoint', () => {
test('it disables for event.kind: alert and agent.type: endpoint', () => {
const ecsData = {
...mockTimelineData[0].ecs,
event: { kind: ['alert'] },
@ -183,7 +183,7 @@ describe('Actions', () => {
expect(
wrapper.find('[data-test-subj="timeline-context-menu-button"]').first().prop('isDisabled')
).toBe(false);
).toBe(true);
});
test('it shows the analyze event button when the event is from an endpoint', () => {
const ecsData = {

5
x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
View file

@ -107,10 +107,7 @@ const ActionsComponent: React.FC<ActionProps> = ({
const isContextMenuDisabled = useMemo(
() =>
eventType !== 'signal' &&
!(
(ecsData.event?.kind?.includes('event') || ecsData.event?.kind?.includes('alert')) &&
ecsData.agent?.type?.includes('endpoint')
),
!(ecsData.event?.kind?.includes('event') && ecsData.agent?.type?.includes('endpoint')),
[eventType, ecsData.event?.kind, ecsData.agent?.type]
);