Skip to content

[Security Solution] Fix Timeline row actions overflow #79861

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
merged 6 commits into from
Oct 13, 2020
Merged

[Security Solution] Fix Timeline row actions overflow #79861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9673cdb
[Security Solution] Fix Timeline row actions overflow
patrykkopycinski Oct 6, 2020
e807d88
Merge branch 'master' of github.com:elastic/kibana into fix/timeline-…
patrykkopycinski Oct 7, 2020
e7b0247
Merge branch 'master' into fix/timeline-actions-overflow
kibanamachine Oct 12, 2020
4ce0bbd
cleanup
patrykkopycinski Oct 12, 2020
1768742
cleanup
patrykkopycinski Oct 12, 2020
e6a365a
cleanup
patrykkopycinski Oct 12, 2020
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
1 change: 1 addition & 0 deletions x-pack/plugins/security_solution/public/common/components/sourcerer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export const SourcererComponent = React.memo<SourcererComponentProps>(({ scope:
closePopover={handleClosePopOver}
display="block"
panelPaddingSize="s"
repositionOnScroll
ownFocus
>
<PopoverContent>
Expand Down
16 changes: 8 additions & 8 deletions x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ export interface BodyProps {
updateNote: UpdateNote;
}

export const hasAdditionalActions = (id: string, eventType?: TimelineEventsType): boolean =>
id === TimelineId.detectionsPage ||
id === TimelineId.detectionsRulesDetailsPage ||
((id === TimelineId.active && eventType && ['all', 'signal', 'alert'].includes(eventType)) ??
false);
export const hasAdditionalActions = (id: TimelineId): boolean =>
Copy link
Contributor

@XavierM XavierM Oct 13, 2020

Choose a reason for hiding this comment

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

Make sense!!!

[TimelineId.detectionsPage, TimelineId.detectionsRulesDetailsPage, TimelineId.active].includes(
id
);

const EXTRA_WIDTH = 4; // px

Expand All @@ -86,7 +85,6 @@ export const Body = React.memo<BodyProps>(
data,
docValueFields,
eventIdToNoteIds,
eventType,
getNotesByIds,
graphEventId,
isEventViewer = false,
Expand Down Expand Up @@ -118,9 +116,11 @@ export const Body = React.memo<BodyProps>(
getActionsColumnWidth(
isEventViewer,
showCheckboxes,
hasAdditionalActions(timelineId, eventType) ? DEFAULT_ICON_BUTTON_WIDTH + EXTRA_WIDTH : 0
hasAdditionalActions(timelineId as TimelineId)
? DEFAULT_ICON_BUTTON_WIDTH + EXTRA_WIDTH
: 0
),
[isEventViewer, showCheckboxes, timelineId, eventType]
[isEventViewer, showCheckboxes, timelineId]
);

const columnWidths = useMemo(
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/security_solution/public/timelines/components/timeline/body/stateful_body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
data,
docValueFields,
eventIdToNoteIds,
eventType,
excludedRowRendererIds,
id,
isEventViewer = false,
Expand Down Expand Up @@ -197,7 +196,6 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
data={data}
docValueFields={docValueFields}
eventIdToNoteIds={eventIdToNoteIds}
eventType={eventType}
getNotesByIds={getNotesByIds}
graphEventId={graphEventId}
isEventViewer={isEventViewer}
Expand Down Expand Up @@ -232,7 +230,6 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
deepEqual(prevProps.excludedRowRendererIds, nextProps.excludedRowRendererIds) &&
deepEqual(prevProps.docValueFields, nextProps.docValueFields) &&
prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
prevProps.eventType === nextProps.eventType &&
prevProps.graphEventId === nextProps.graphEventId &&
deepEqual(prevProps.notesById, nextProps.notesById) &&
prevProps.id === nextProps.id &&
Expand Down Expand Up @@ -262,7 +259,6 @@ const makeMapStateToProps = () => {
const {
columns,
eventIdToNoteIds,
eventType,
excludedRowRendererIds,
graphEventId,
isSelectAllChecked,
Expand All @@ -277,7 +273,6 @@ const makeMapStateToProps = () => {
return {
columnHeaders: memoizedColumnHeaders(columns, browserFields),
eventIdToNoteIds,
eventType,
excludedRowRendererIds,
graphEventId,
isSelectAllChecked,
Expand Down
1 change: 1 addition & 0 deletions ...olution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
withTitle
panelPaddingSize="none"
ownFocus={true}
repositionOnScroll
>
{content}
</EuiPopover>
Expand Down
1 change: 1 addition & 0 deletions ...s/security_solution/public/timelines/components/timeline/search_or_filter/pick_events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ const PickEventTypeComponents: React.FC<PickEventTypeProps> = ({
button={button}
isOpen={isPopoverOpen}
closePopover={closePopover}
repositionOnScroll
>
<PopoverContent>
<EuiPopoverTitle>
Expand Down