Skip to content

Commit

Permalink
[Security Solution][Investigations] - 8.7 minor fixes (#152284)
Browse files Browse the repository at this point in the history
## Summary

This PR includes minor fixes for the following items by commit

**[Timeline ui alignment fix]**
#149017 -
0128149
**[Saving empty eql query]**
#148950 -
b9715cb
**[Re-add alert count to top n]**
#148631 -
4c8d1e6
  • Loading branch information
michaelolo24 authored Mar 6, 2023
1 parent ce96318 commit 1f6de13
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
TIMELINE_TAB_CONTENT_GRAPHS_NOTES,
EDIT_TIMELINE_BTN,
EDIT_TIMELINE_TOOLTIP,
TIMELINE_CORRELATION_INPUT,
} from '../../screens/timeline';
import { createTimelineTemplate } from '../../tasks/api_calls/timelines';

Expand All @@ -41,9 +42,11 @@ import {
goToQueryTab,
pinFirstEvent,
populateTimeline,
waitForTimelineChanges,
} from '../../tasks/timeline';

import { OVERVIEW_URL, TIMELINE_TEMPLATES_URL } from '../../urls/navigation';
import { EQL_QUERY_VALIDATION_ERROR } from '../../screens/create_new_rule';

describe('Create a timeline from a template', () => {
before(() => {
Expand Down Expand Up @@ -154,5 +157,67 @@ describe('Timelines', (): void => {
.then(parseInt)
.should('be.gt', 0);
});

// Skipped in this PR until the underlying re-renders are fixed: https://github.com/elastic/kibana/pull/152284
describe.skip('correlation tab', () => {
it('should update timeline after adding eql', () => {
cy.intercept('PATCH', '/api/timeline').as('updateTimeline');
const eql = 'any where process.name == "zsh"';
addEqlToTimeline(eql);

cy.wait('@updateTimeline', { timeout: 10000 }).its('response.statusCode').should('eq', 200);

cy.get(`${TIMELINE_TAB_CONTENT_EQL} ${SERVER_SIDE_EVENT_COUNT}`)
.invoke('text')
.then(parseInt)
.should('be.gt', 0);
});

describe.skip('updates', () => {
const eql = 'any where process.name == "zsh"';
beforeEach(() => {
cy.intercept('PATCH', '/api/timeline').as('updateTimeline');
addEqlToTimeline(eql);
// TODO: It may need a further refactor to handle the frequency with which react calls this api
// Since it's based on real time text changes...and real time query validation
// there's almost no guarantee on the number of calls, so a cypress.wait may actually be more appropriate
cy.wait('@updateTimeline');
cy.wait('@updateTimeline');
cy.reload();
cy.get(TIMELINE_CORRELATION_INPUT).should('be.visible');
cy.get(TIMELINE_CORRELATION_INPUT).should('have.text', eql);
});

it('should update timeline after removing eql', () => {
cy.intercept('PATCH', '/api/timeline').as('updateTimeline');
cy.get(TIMELINE_CORRELATION_INPUT).should('be.visible');
waitForTimelineChanges();
cy.get(TIMELINE_CORRELATION_INPUT).type('{selectAll} {del}').clear();
// TODO: It may need a further refactor to handle the frequency with which react calls this api
// Since it's based on real time text changes...and real time query validation
// there's almost no guarantee on the number of calls, so a cypress.wait may actually be more appropriate
cy.wait('@updateTimeline');
cy.wait('@updateTimeline');
cy.wait('@updateTimeline');
cy.wait('@updateTimeline');
waitForTimelineChanges();
cy.reload();
cy.get(TIMELINE_CORRELATION_INPUT).should('be.visible');

cy.get(TIMELINE_CORRELATION_INPUT).should('have.text', '');
});

it('should NOT update timeline after adding wrong eql', () => {
cy.intercept('PATCH', '/api/timeline').as('updateTimeline');
const nonFunctionalEql = 'this is not valid eql';
addEqlToTimeline(nonFunctionalEql);
cy.get(EQL_QUERY_VALIDATION_ERROR).should('be.visible');
cy.reload();
cy.get(TIMELINE_CORRELATION_INPUT).should('be.visible');

cy.get(TIMELINE_CORRELATION_INPUT).should('have.text', eql);
});
});
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ export const EQL_QUERY_INPUT = '[data-test-subj="eqlQueryBarTextInput"]';

export const EQL_QUERY_VALIDATION_SPINNER = '[data-test-subj="eql-validation-loading"]';

export const EQL_QUERY_VALIDATION_ERROR = '[data-test-subj="eql-validation-errors-popover-button"]';

export const IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK =
'[data-test-subj="importQueryFromSavedTimeline"]';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,14 @@ export const AlertsHistogramPanel = memo<AlertsHistogramPanelProps>(
alignHeader={alignHeader}
id={uniqueQueryId}
inspectTitle={inspectTitle}
outerDirection="row"
outerDirection="column"
title={titleText}
titleSize={titleSize}
toggleStatus={showHistogram}
toggleQuery={hideQueryToggle ? undefined : toggleQuery}
showInspectButton={isChartEmbeddablesEnabled ? false : chartOptionsContextMenu == null}
subtitle={!isInitialLoading && showTotalAlertsCount && totalAlerts}
isInspectDisabled={isInspectDisabled}
hideSubtitle
>
<EuiFlexGroup alignItems="flexStart" data-test-subj="panelFlexGroup" gutterSize="none">
<EuiFlexItem grow={false}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ const StyledEuiFlyoutHeader = styled(EuiFlyoutHeader)`
box-shadow: none;
display: flex;
flex-direction: column;
margin-top: ${({ theme }) => theme.eui.euiSizeM}
padding: 0;
&.euiFlyoutHeader {
${({ theme }) =>
`padding: 0 ${theme.eui.euiSizeS} ${theme.eui.euiSizeS} ${theme.eui.euiSizeS};`}
`padding: 0 ${theme.eui.euiSizeM} ${theme.eui.euiSizeS} ${theme.eui.euiSizeS};`}
}
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ export const EqlQueryBarTimeline = memo(({ timelineId }: { timelineId: string })
watch: ['eqlQueryBar'],
});

const prevEqlQuery = useRef<TimelineEqlQueryBar['eqlQueryBar']['query']['query']>('');

const optionsData = useMemo(
() =>
isEmpty(indexPattern.fields)
Expand Down Expand Up @@ -156,10 +158,11 @@ export const EqlQueryBarTimeline = memo(({ timelineId }: { timelineId: string })
useEffect(() => {
if (
formEqlQueryBar != null &&
!isEmpty(formEqlQueryBar.query.query) &&
prevEqlQuery.current !== formEqlQueryBar.query.query &&
isQueryBarValid &&
!isQueryBarValidating
) {
prevEqlQuery.current = formEqlQueryBar.query.query;
dispatch(
timelineActions.updateEqlOptions({
id: timelineId,
Expand Down

0 comments on commit 1f6de13

Please sign in to comment.