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

[Security Solution] Resolve JS warnings triggered by incorrect state changed (#148552)

Browse source 
## Summary

Found these js warning after replacing charts with Lens in
https://github.com/elastic/kibana/pull/148519:
<img width="1671" alt="Screenshot 2023-01-09 at 15 31 17"
src="https://user-images.githubusercontent.com/6295984/211345750-8c4e67ee-bf96-49d2-8bb2-0f71e5f9bcd2.png">

Wrap `search.session.start()` with useEffect to avoid incorrect state
changed.



### Checklist

Delete any items that are not applicable to this PR.


- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

Co-authored-by: Steph Milovic <stephanie.milovic@elastic.co>
This commit is contained in:
Angela Chuang 2023-01-12 09:59:39 +00:00 • committed by GitHub
parent 61b8ef4363
commit a275262b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 102 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/CODEOWNERS vendored
View file

@ -496,6 +496,7 @@
/x-pack/plugins/security_solution/public/common/components/navigation @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/navigation @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/news_feed @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/news_feed @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/overview_description_list @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/overview_description_list @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/page @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/sidebar_header @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/sidebar_header @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/tables @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/tables @elastic/security-threat-hunting-explore
/x-pack/plugins/security_solution/public/common/components/top_n @elastic/security-threat-hunting-explore /x-pack/plugins/security_solution/public/common/components/top_n @elastic/security-threat-hunting-explore

22
x-pack/plugins/security_solution/public/common/components/page/manage_query.tsx
View file

@ -7,8 +7,10 @@
import type { Position } from '@elastic/charts'; import type { Position } from '@elastic/charts';
import { omit } from 'lodash/fp'; import { omit } from 'lodash/fp';
import type { MutableRefObject } from 'react';
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
import type { ISessionService } from '@kbn/data-plugin/public';
import type { inputsModel } from '../../store'; import type { inputsModel } from '../../store';
import type { GlobalTimeArgs } from '../../containers/use_global_time'; import type { GlobalTimeArgs } from '../../containers/use_global_time';
import type { InputsModelId } from '../../store/inputs/constants'; import type { InputsModelId } from '../../store/inputs/constants';
@ -21,14 +23,14 @@ export interface OwnProps extends Pick<GlobalTimeArgs, 'deleteQuery' | 'setQuery
legendPosition?: Position; legendPosition?: Position;
loading: boolean; loading: boolean;
refetch: inputsModel.Refetch; refetch: inputsModel.Refetch;
searchSessionId?: string; session?: MutableRefObject<ISessionService>;
} }
export function manageQuery<T>( export function manageQuery<T>(
WrappedComponent: React.ComponentClass<T> | React.ComponentType<T> WrappedComponent: React.ComponentClass<T> | React.ComponentType<T>
): React.FC<OwnProps & T> { ): React.FC<OwnProps & T> {
const ManageQuery = (props: OwnProps & T) => { const ManageQuery = (props: OwnProps & T) => {
const { deleteQuery, id, inspect = null, loading, refetch, setQuery, searchSessionId } = props; const { deleteQuery, id, inspect = null, loading, refetch, setQuery, session } = props;
useQueryInspector({ useQueryInspector({
deleteQuery, deleteQuery,
@ -36,7 +38,7 @@ export function manageQuery<T>(
loading, loading,
queryId: id, queryId: id,
refetch, refetch,
searchSessionId, session,
setQuery, setQuery,
}); });
@ -54,7 +56,7 @@ interface UseQueryInspectorTypes extends Pick<GlobalTimeArgs, 'deleteQuery' | 's
loading: boolean; loading: boolean;
refetch: inputsModel.Refetch; refetch: inputsModel.Refetch;
inspect?: inputsModel.InspectQuery | null; inspect?: inputsModel.InspectQuery | null;
searchSessionId?: string; session?: MutableRefObject<ISessionService>;
} }
export const useQueryInspector = ({ export const useQueryInspector = ({
@ -64,11 +66,17 @@ export const useQueryInspector = ({
inspect, inspect,
loading, loading,
queryId, queryId,
searchSessionId, session,
}: UseQueryInspectorTypes) => { }: UseQueryInspectorTypes) => {
useEffect(() => { useEffect(() => {
setQuery({ id: queryId, inspect: inspect ?? null, loading, refetch, searchSessionId }); setQuery({
}, [deleteQuery, setQuery, queryId, refetch, inspect, loading, searchSessionId]); id: queryId,
inspect: inspect ?? null,
loading,
refetch,
searchSessionId: session?.current.start(),
});
}, [deleteQuery, setQuery, queryId, refetch, inspect, loading, session]);
useEffect(() => { useEffect(() => {
return () => { return () => {

18
x-pack/plugins/security_solution/public/common/components/page/use_refetch_by_session.test.tsx
View file

@ -4,6 +4,7 @@
* 2.0; you may not use this file except in compliance with the Elastic License * 2.0; you may not use this file except in compliance with the Elastic License
* 2.0. * 2.0.
*/ */
import type { MutableRefObject } from 'react';
import React from 'react'; import React from 'react';
import type { RenderHookResult } from '@testing-library/react-hooks'; import type { RenderHookResult } from '@testing-library/react-hooks';
import { renderHook } from '@testing-library/react-hooks'; import { renderHook } from '@testing-library/react-hooks';
@ -21,6 +22,7 @@ import { InputsModelId } from '../../store/inputs/constants';
import { useRefetchByRestartingSession } from './use_refetch_by_session'; import { useRefetchByRestartingSession } from './use_refetch_by_session';
import { inputsActions } from '../../store/actions'; import { inputsActions } from '../../store/actions';
import type { Refetch } from '../../store/inputs/model'; import type { Refetch } from '../../store/inputs/model';
import type { ISessionService } from '@kbn/data-plugin/public';
const state: State = mockGlobalState; const state: State = mockGlobalState;
@ -60,14 +62,11 @@ describe(`useRefetchByRestartingSession`, () => {
children: React.ReactNode; children: React.ReactNode;
}, },
{ {
searchSessionId: string | undefined; session: MutableRefObject<ISessionService>;
refetchByRestartingSession: Refetch; refetchByRestartingSession: Refetch;
} }
>; >;
const mockSessionStart = jest const mockSessionStart = jest.fn().mockReturnValue('mockSessionId');
.fn()
.mockReturnValueOnce('mockSessionId')
.mockReturnValue('mockSessionId1');
const mockSession = { const mockSession = {
start: mockSessionStart, start: mockSessionStart,
}; };
@ -97,20 +96,15 @@ describe(`useRefetchByRestartingSession`, () => {
); );
}); });
it('should start a session', () => {
expect(mockSessionStart).toHaveBeenCalledTimes(1);
expect(res.result.current.searchSessionId).toBe('mockSessionId');
});
it('should start a session when clicking refetchByRestartingSession', () => { it('should start a session when clicking refetchByRestartingSession', () => {
res.result.current.refetchByRestartingSession(); res.result.current.refetchByRestartingSession();
expect(mockSessionStart).toHaveBeenCalledTimes(2); expect(mockSessionStart).toHaveBeenCalledTimes(1);
expect(inputsActions.setInspectionParameter).toHaveBeenCalledWith({ expect(inputsActions.setInspectionParameter).toHaveBeenCalledWith({
id: 'test', id: 'test',
selectedInspectIndex: 0, selectedInspectIndex: 0,
isInspected: false, isInspected: false,
inputId: InputsModelId.global, inputId: InputsModelId.global,
searchSessionId: 'mockSessionId1', searchSessionId: 'mockSessionId',
}); });
}); });
}); });

19
x-pack/plugins/security_solution/public/common/components/page/use_refetch_by_session.tsx
View file

@ -5,8 +5,10 @@
* 2.0. * 2.0.
*/ */
import { useCallback, useRef, useMemo } from 'react'; import type { MutableRefObject } from 'react';
import { useCallback, useRef } from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import type { ISessionService } from '@kbn/data-plugin/public';
import { useDeepEqualSelector } from '../../hooks/use_selector'; import { useDeepEqualSelector } from '../../hooks/use_selector';
import { useKibana } from '../../lib/kibana'; import { useKibana } from '../../lib/kibana';
import { inputsSelectors } from '../../store'; import { inputsSelectors } from '../../store';
@ -25,7 +27,7 @@ export const useRefetchByRestartingSession = ({
queryId, queryId,
skip, skip,
}: UseRefetchByRestartingSessionProps): { }: UseRefetchByRestartingSessionProps): {
searchSessionId: string | undefined; session: MutableRefObject<ISessionService>;
refetchByRestartingSession: Refetch; refetchByRestartingSession: Refetch;
} => { } => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -35,18 +37,12 @@ export const useRefetchByRestartingSession = ({
const getGlobalQuery = inputsSelectors.globalQueryByIdSelector(); const getGlobalQuery = inputsSelectors.globalQueryByIdSelector();
const getTimelineQuery = inputsSelectors.timelineQueryByIdSelector(); const getTimelineQuery = inputsSelectors.timelineQueryByIdSelector();
const { selectedInspectIndex, searchSessionId: existingSearchSessionId } = useDeepEqualSelector( const { selectedInspectIndex } = useDeepEqualSelector((state) =>
(state) =>
inputId === InputsModelId.global inputId === InputsModelId.global
? getGlobalQuery(state, queryId) ? getGlobalQuery(state, queryId)
: getTimelineQuery(state, queryId) : getTimelineQuery(state, queryId)
); );
const searchSessionId = useMemo(
() => (skip ? undefined : existingSearchSessionId ?? session.current.start()),
[existingSearchSessionId, skip]
);
const refetchByRestartingSession = useCallback(() => { const refetchByRestartingSession = useCallback(() => {
dispatch( dispatch(
inputsActions.setInspectionParameter({ inputsActions.setInspectionParameter({
@ -63,5 +59,8 @@ export const useRefetchByRestartingSession = ({
); );
}, [dispatch, queryId, selectedInspectIndex, skip]); }, [dispatch, queryId, selectedInspectIndex, skip]);
return { searchSessionId, refetchByRestartingSession }; return {
session,
refetchByRestartingSession,
};
}; };

8
x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/hosts/index.test.tsx
View file

@ -35,6 +35,7 @@ describe('KPI Hosts', () => {
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
to: '2019-06-25T06:31:59.345Z', to: '2019-06-25T06:31:59.345Z',
@ -58,6 +59,7 @@ describe('KPI Hosts', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -90,7 +92,7 @@ describe('KPI Hosts', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -104,8 +106,6 @@ describe('KPI Hosts', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/hosts/index.tsx
View file

@ -63,7 +63,7 @@ const HostsKpiHostsComponent: React.FC<HostsKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -81,7 +81,7 @@ const HostsKpiHostsComponent: React.FC<HostsKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

8
x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/unique_ips/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('KPI Unique IPs', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('KPI Unique IPs', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -90,7 +92,7 @@ describe('KPI Unique IPs', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -104,8 +106,6 @@ describe('KPI Unique IPs', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/unique_ips/index.tsx
View file

@ -78,7 +78,7 @@ const HostsKpiUniqueIpsComponent: React.FC<HostsKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -96,7 +96,7 @@ const HostsKpiUniqueIpsComponent: React.FC<HostsKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

8
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/dns/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('DNS KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -59,6 +60,7 @@ describe('DNS KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -91,7 +93,7 @@ describe('DNS KPI', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -105,8 +107,6 @@ describe('DNS KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/dns/index.tsx
View file

@ -58,7 +58,7 @@ const NetworkKpiDnsComponent: React.FC<NetworkKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -76,7 +76,7 @@ const NetworkKpiDnsComponent: React.FC<NetworkKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

8
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/network_events/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('Network Events KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('Network Events KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -90,7 +92,7 @@ describe('Network Events KPI', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -104,8 +106,6 @@ describe('Network Events KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/network_events/index.tsx
View file

@ -62,7 +62,7 @@ const NetworkKpiNetworkEventsComponent: React.FC<NetworkKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -80,7 +80,7 @@ const NetworkKpiNetworkEventsComponent: React.FC<NetworkKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

6
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/tls_handshakes/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('TLS Handshakes KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('TLS Handshakes KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -104,8 +106,6 @@ describe('TLS Handshakes KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/tls_handshakes/index.tsx
View file

@ -57,7 +57,7 @@ const NetworkKpiTlsHandshakesComponent: React.FC<NetworkKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -75,7 +75,7 @@ const NetworkKpiTlsHandshakesComponent: React.FC<NetworkKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

6
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/unique_flows/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('Unique Flows KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('Unique Flows KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -104,8 +106,6 @@ describe('Unique Flows KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/unique_flows/index.tsx
View file

@ -57,7 +57,7 @@ const NetworkKpiUniqueFlowsComponent: React.FC<NetworkKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -75,7 +75,7 @@ const NetworkKpiUniqueFlowsComponent: React.FC<NetworkKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

6
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/unique_private_ips/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('Unique Private IPs KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('Unique Private IPs KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -104,8 +106,6 @@ describe('Unique Private IPs KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/network/components/kpi_network/unique_private_ips/index.tsx
View file

@ -85,7 +85,7 @@ const NetworkKpiUniquePrivateIpsComponent: React.FC<NetworkKpiProps> = ({
skip: querySkip || isChartEmbeddablesEnabled, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -103,7 +103,7 @@ const NetworkKpiUniquePrivateIpsComponent: React.FC<NetworkKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

8
x-pack/plugins/security_solution/public/explore/users/components/kpi_users/authentications/index.test.tsx
View file

@ -33,6 +33,7 @@ describe('Authentications KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -57,6 +58,7 @@ describe('Authentications KPI', () => {
]); ]);
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -89,7 +91,7 @@ describe('Authentications KPI', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -103,8 +105,6 @@ describe('Authentications KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

6
x-pack/plugins/security_solution/public/explore/users/components/kpi_users/authentications/index.tsx
View file

@ -79,10 +79,10 @@ const UsersKpiAuthenticationsComponent: React.FC<UsersKpiProps> = ({
endDate: to, endDate: to,
indexNames, indexNames,
startDate: from, startDate: from,
skip: querySkip, skip: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: id, queryId: id,
}); });
@ -100,7 +100,7 @@ const UsersKpiAuthenticationsComponent: React.FC<UsersKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

8
x-pack/plugins/security_solution/public/explore/users/components/kpi_users/total_users/index.test.tsx
View file

@ -34,6 +34,7 @@ describe('Total Users KPI', () => {
const mockUseQueryToggle = useQueryToggle as jest.Mock; const mockUseQueryToggle = useQueryToggle as jest.Mock;
const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock; const MockKpiBaseComponentManage = KpiBaseComponentManage as jest.Mock;
const mockRefetchByRestartingSession = jest.fn(); const mockRefetchByRestartingSession = jest.fn();
const mockSession = { current: { start: jest.fn(() => 'mockNewSearchSessionId') } };
const mockRefetch = jest.fn(); const mockRefetch = jest.fn();
const defaultProps = { const defaultProps = {
from: '2019-06-25T04:31:59.345Z', from: '2019-06-25T04:31:59.345Z',
@ -58,6 +59,7 @@ describe('Total Users KPI', () => {
}); });
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
(useRefetchByRestartingSession as jest.Mock).mockReturnValue({ (useRefetchByRestartingSession as jest.Mock).mockReturnValue({
session: mockSession,
searchSessionId: 'mockSearchSessionId', searchSessionId: 'mockSearchSessionId',
refetchByRestartingSession: mockRefetchByRestartingSession, refetchByRestartingSession: mockRefetchByRestartingSession,
}); });
@ -92,7 +94,7 @@ describe('Total Users KPI', () => {
</TestProviders> </TestProviders>
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch); expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(mockRefetch);
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toBeUndefined(); expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toBeUndefined();
}); });
it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => { it('Refetch by restarting search session ID if isChartEmbeddablesEnabled = true', () => {
(useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true); (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
@ -106,8 +108,6 @@ describe('Total Users KPI', () => {
expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].refetch).toEqual(
mockRefetchByRestartingSession mockRefetchByRestartingSession
); );
expect(MockKpiBaseComponentManage.mock.calls[0][0].searchSessionId).toEqual( expect(MockKpiBaseComponentManage.mock.calls[0][0].session).toEqual(mockSession);
'mockSearchSessionId'
);
}); });
}); });

4
x-pack/plugins/security_solution/public/explore/users/components/kpi_users/total_users/index.tsx
View file

@ -68,7 +68,7 @@ const TotalUsersKpiComponent: React.FC<UsersKpiProps> = ({
abort: querySkip || isChartEmbeddablesEnabled, abort: querySkip || isChartEmbeddablesEnabled,
}); });
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId: QUERY_ID, queryId: QUERY_ID,
}); });
@ -100,7 +100,7 @@ const TotalUsersKpiComponent: React.FC<UsersKpiProps> = ({
refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch} refetch={isChartEmbeddablesEnabled ? refetchByRestartingSession : refetch}
setQuery={setQuery} setQuery={setQuery}
setQuerySkip={setQuerySkip} setQuerySkip={setQuerySkip}
searchSessionId={isChartEmbeddablesEnabled ? searchSessionId : undefined} session={isChartEmbeddablesEnabled ? session : undefined}
/> />
); );
}; };

21
x-pack/plugins/security_solution/public/overview/components/detection_response/alerts_by_status/alert_donut_embeddable.tsx
View file

@ -29,7 +29,7 @@ const AlertDonutEmbeddableComponent: React.FC<AlertDonutEmbeddableProps> = ({
}) => { }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const queryId = `${DETECTION_RESPONSE_ALERTS_BY_STATUS_ID}-${status}`; const queryId = `${DETECTION_RESPONSE_ALERTS_BY_STATUS_ID}-${status}`;
const { searchSessionId, refetchByRestartingSession } = useRefetchByRestartingSession({ const { session, refetchByRestartingSession } = useRefetchByRestartingSession({
inputId: InputsModelId.global, inputId: InputsModelId.global,
queryId, queryId,
}); });
@ -45,14 +45,14 @@ const AlertDonutEmbeddableComponent: React.FC<AlertDonutEmbeddableProps> = ({
inputsActions.setQuery({ inputsActions.setQuery({
inputId: InputsModelId.global, inputId: InputsModelId.global,
id: queryId, id: queryId,
searchSessionId, searchSessionId: session.current.start(),
refetch: refetchByRestartingSession, refetch: refetchByRestartingSession,
loading: isLoading, loading: isLoading,
inspect: { dsl: requests, response: responses }, inspect: { dsl: requests, response: responses },
}) })
); );
}, },
[dispatch, queryId, refetchByRestartingSession, searchSessionId] [dispatch, queryId, refetchByRestartingSession, session]
); );
const extraOptions = useMemo(() => ({ status }), [status]); const extraOptions = useMemo(() => ({ status }), [status]);
@ -62,13 +62,24 @@ const AlertDonutEmbeddableComponent: React.FC<AlertDonutEmbeddableProps> = ({
inputsActions.setQuery({ inputsActions.setQuery({
inputId: InputsModelId.global, inputId: InputsModelId.global,
id: queryId, id: queryId,
searchSessionId, searchSessionId: session.current.start(),
refetch: refetchByRestartingSession, refetch: refetchByRestartingSession,
loading: false, loading: false,
inspect: null, inspect: null,
}) })
); );
}, [dispatch, queryId, refetchByRestartingSession, searchSessionId, status]); }, [dispatch, queryId, refetchByRestartingSession, session, status]);
useEffect(() => {
return () => {
dispatch(
inputsActions.deleteOneQuery({
inputId: InputsModelId.global,
id: queryId,
})
);
};
}, [dispatch, queryId]);
const dataExists = visualizationData != null && visualizationData[0].hits.total !== 0; const dataExists = visualizationData != null && visualizationData[0].hits.total !== 0;