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

[7.x] [Security Solution] Use alert status actions from timeline plugin (#107928) #108033

Merged
merged 2 commits into from
Aug 10, 2021
Merged

[7.x] [Security Solution] Use alert status actions from timeline plugin (#107928) #108033

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
55775bf
[Security Solution] Use alert status actions from timeline plugin (#1…
angorayc Aug 10, 2021
6d65f3d
Merge branch '7.x' into backport/7.x/pr-107928
kibanamachine Aug 10, 2021
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
4 changes: 2 additions & 2 deletions ...ion/public/detections/components/alerts_table/timeline_actions/add_endpoint_exception.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import * as i18n from '../translations';

Expand All @@ -27,7 +27,7 @@ const AddEndpointExceptionComponent: React.FC<AddEndpointExceptionProps> = ({
onClick={onClick}
disabled={disabled}
>
<EuiText size="m">{i18n.ACTION_ADD_ENDPOINT_EXCEPTION}</EuiText>
{i18n.ACTION_ADD_ENDPOINT_EXCEPTION}
</EuiContextMenuItem>
);
};
Expand Down
6 changes: 2 additions & 4 deletions ..._solution/public/detections/components/alerts_table/timeline_actions/add_event_filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import * as i18n from '../translations';

Expand All @@ -24,9 +24,7 @@ const AddEventFilterComponent: React.FC<AddEventFilterProps> = ({ onClick, disab
onClick={onClick}
disabled={disabled}
>
<EuiText data-test-subj="addEventFilterButton" size="m">
{i18n.ACTION_ADD_EVENT_FILTER}
</EuiText>
{i18n.ACTION_ADD_EVENT_FILTER}
</EuiContextMenuItem>
);
};
Expand Down
6 changes: 2 additions & 4 deletions ...ity_solution/public/detections/components/alerts_table/timeline_actions/add_exception.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import * as i18n from '../translations';

Expand All @@ -24,9 +24,7 @@ const AddExceptionComponent: React.FC<AddExceptionProps> = ({ disabled, onClick
onClick={onClick}
disabled={disabled}
>
<EuiText data-test-subj="addExceptionButton" size="m">
{i18n.ACTION_ADD_EXCEPTION}
</EuiText>
{i18n.ACTION_ADD_EXCEPTION}
</EuiContextMenuItem>
);
};
Expand Down
61 changes: 37 additions & 24 deletions ...olution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@

import React, { useCallback, useMemo, useState } from 'react';

import { EuiButtonIcon, EuiContextMenu, EuiPopover, EuiToolTip } from '@elastic/eui';
import styled from 'styled-components';
import { EuiButtonIcon, EuiContextMenuPanel, EuiPopover, EuiToolTip } from '@elastic/eui';
import { indexOf } from 'lodash';

import { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
Expand All @@ -31,8 +30,10 @@ import { useAlertsActions } from './use_alerts_actions';
import { useExceptionModal } from './use_add_exception_modal';
import { useExceptionActions } from './use_add_exception_actions';
import { useEventFilterModal } from './use_event_filter_modal';
import { useEventFilterAction } from './use_event_filter_action';
import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
import { AddEventFilter } from './add_event_filter';
import { AddException } from './add_exception';
import { AddEndpointException } from './add_endpoint_exception';

interface AlertContextMenuProps {
ariaLabel?: string;
Expand Down Expand Up @@ -112,7 +113,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
onAddEventFilterClick,
} = useEventFilterModal();

const { statusActions } = useAlertsActions({
const { actionItems } = useAlertsActions({
alertStatus,
eventId: ecsRowData?._id,
timelineId,
Expand All @@ -132,23 +133,41 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
closePopover();
}, [closePopover, onAddEventFilterClick]);

const exceptionActions = useExceptionActions({
const {
disabledAddEndpointException,
disabledAddException,
handleEndpointExceptionModal,
handleDetectionExceptionModal,
} = useExceptionActions({
isEndpointAlert,
onAddExceptionTypeClick: handleOnAddExceptionTypeClick,
});

const eventFilterActions = useEventFilterAction({
onAddEventFilterClick: handleOnAddEventFilterClick,
});

const panels = useMemo(
() => [
{
id: 0,
items: !isEvent && ruleId ? [...statusActions, ...exceptionActions] : [eventFilterActions],
},
],
[eventFilterActions, exceptionActions, isEvent, ruleId, statusActions]
const items = useMemo(
() =>
!isEvent && ruleId
? [
...actionItems,
<AddEndpointException
onClick={handleEndpointExceptionModal}
disabled={disabledAddEndpointException}
/>,
<AddException
onClick={handleDetectionExceptionModal}
disabled={disabledAddException}
/>,
]
: [<AddEventFilter onClick={handleOnAddEventFilterClick} />],
[
actionItems,
disabledAddEndpointException,
disabledAddException,
handleDetectionExceptionModal,
handleEndpointExceptionModal,
handleOnAddEventFilterClick,
isEvent,
ruleId,
]
);

return (
Expand All @@ -164,7 +183,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
anchorPosition="downLeft"
repositionOnScroll
>
<EuiContextMenu size="s" initialPanelId={0} panels={panels} />
<EuiContextMenuPanel size="s" items={items} />
</EuiPopover>
</EventsTdContent>
</div>
Expand All @@ -191,12 +210,6 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
);
};

const ContextMenuPanel = styled(EuiContextMenu)`
font-size: ${({ theme }) => theme.eui.euiFontSizeS};
`;

ContextMenuPanel.displayName = 'ContextMenuPanel';

export const AlertContextMenu = React.memo(AlertContextMenuComponent);

type AddExceptionModalWrapperProps = Omit<
Expand Down
4 changes: 2 additions & 2 deletions ...etections/components/alerts_table/timeline_actions/alerts_status_actions/close_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import { FILTER_CLOSED } from '../../alerts_filter_group';
import * as i18n from '../../translations';
Expand All @@ -25,7 +25,7 @@ const CloseAlertActionComponent: React.FC<CloseAlertActionProps> = ({ onClick, d
onClick={onClick}
disabled={disabled}
>
<EuiText size="m">{i18n.ACTION_CLOSE_ALERT}</EuiText>
{i18n.ACTION_CLOSE_ALERT}
</EuiContextMenuItem>
);
};
Expand Down
4 changes: 2 additions & 2 deletions ...mponents/alerts_table/timeline_actions/alerts_status_actions/in_progress_alert_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import { FILTER_IN_PROGRESS } from '../../alerts_filter_group';
import * as i18n from '../../translations';
Expand All @@ -28,7 +28,7 @@ const InProgressAlertStatusComponent: React.FC<InProgressAlertStatusProps> = ({
onClick={onClick}
disabled={disabled}
>
<EuiText size="m">{i18n.ACTION_IN_PROGRESS_ALERT}</EuiText>
{i18n.ACTION_IN_PROGRESS_ALERT}
</EuiContextMenuItem>
);
};
Expand Down
4 changes: 2 additions & 2 deletions ...ions/components/alerts_table/timeline_actions/alerts_status_actions/open_alert_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { EuiContextMenuItem, EuiText } from '@elastic/eui';
import { EuiContextMenuItem } from '@elastic/eui';
import React from 'react';
import { FILTER_OPEN } from '../../alerts_filter_group';
import * as i18n from '../../translations';
Expand All @@ -25,7 +25,7 @@ const OpenAlertStatusComponent: React.FC<OpenAlertStatusProps> = ({ onClick, dis
onClick={onClick}
disabled={disabled}
>
<EuiText size="m">{i18n.ACTION_OPEN_ALERT}</EuiText>
{i18n.ACTION_OPEN_ALERT}
</EuiContextMenuItem>
);
};
Expand Down
20 changes: 17 additions & 3 deletions .../public/detections/components/alerts_table/timeline_actions/use_add_exception_actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,20 @@ import type { ExceptionListType } from '@kbn/securitysolution-io-ts-list-types';
import { useUserData } from '../../user_info';
import { ACTION_ADD_ENDPOINT_EXCEPTION, ACTION_ADD_EXCEPTION } from '../translations';

interface UseExceptionActions {
interface ExceptionActions {
name: string;
onClick: () => void;
disabled: boolean;
}

interface UseExceptionActions {
disabledAddEndpointException: boolean;
disabledAddException: boolean;
exceptionActions: ExceptionActions[];
handleEndpointExceptionModal: () => void;
handleDetectionExceptionModal: () => void;
}

interface UseExceptionActionProps {
isEndpointAlert: boolean;
onAddExceptionTypeClick: (type: ExceptionListType) => void;
Expand All @@ -25,7 +33,7 @@ interface UseExceptionActionProps {
export const useExceptionActions = ({
isEndpointAlert,
onAddExceptionTypeClick,
}: UseExceptionActionProps): UseExceptionActions[] => {
}: UseExceptionActionProps): UseExceptionActions => {
const [{ canUserCRUD, hasIndexWrite }] = useUserData();

const handleDetectionExceptionModal = useCallback(() => {
Expand Down Expand Up @@ -62,5 +70,11 @@ export const useExceptionActions = ({
]
);

return exceptionActions;
return {
disabledAddEndpointException,
disabledAddException,
exceptionActions,
handleEndpointExceptionModal,
handleDetectionExceptionModal,
};
};
Loading