[SecuritySolution] Clean up CaseContext (#130036)

* clean up casecontext

* update snapshot
This commit is contained in:
Angela Chuang 2022-04-12 20:19:46 +01:00 committed by GitHub
parent fce2df0485
commit 5ee7c3d25a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 700 additions and 762 deletions

View file

@ -15,11 +15,16 @@ import { KibanaThemeProvider } from '../../../../../src/plugins/kibana_react/pub
import { AppLeaveHandler, AppMountParameters } from '../../../../../src/core/public';
import { ManageUserInfo } from '../detections/components/user_info';
import { DEFAULT_DARK_MODE, APP_NAME } from '../../common/constants';
import { DEFAULT_DARK_MODE, APP_NAME, APP_ID } from '../../common/constants';
import { ErrorToastDispatcher } from '../common/components/error_toast_dispatcher';
import { MlCapabilitiesProvider } from '../common/components/ml/permissions/ml_capabilities_provider';
import { GlobalToaster, ManageGlobalToaster } from '../common/components/toasters';
import { KibanaContextProvider, useKibana, useUiSetting$ } from '../common/lib/kibana';
import {
KibanaContextProvider,
useGetUserCasesPermissions,
useKibana,
useUiSetting$,
} from '../common/lib/kibana';
import { State } from '../common/store';
import { StartServices } from '../types';
@ -48,9 +53,11 @@ const StartAppComponent: FC<StartAppComponent> = ({
const {
i18n,
application: { capabilities },
cases,
} = useKibana().services;
const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
const casesPermissions = useGetUserCasesPermissions();
const CasesContext = cases.ui.getCasesContext();
return (
<EuiErrorBoundary>
<i18n.Context>
@ -62,13 +69,18 @@ const StartAppComponent: FC<StartAppComponent> = ({
<UserPrivilegesProvider kibanaCapabilities={capabilities}>
<ManageUserInfo>
<ReactQueryClientProvider>
<PageRouter
history={history}
onAppLeave={onAppLeave}
setHeaderActionMenu={setHeaderActionMenu}
<CasesContext
owner={[APP_ID]}
userCanCrud={casesPermissions?.crud ?? false}
>
{children}
</PageRouter>
<PageRouter
history={history}
onAppLeave={onAppLeave}
setHeaderActionMenu={setHeaderActionMenu}
>
{children}
</PageRouter>
</CasesContext>
</ReactQueryClientProvider>
</ManageUserInfo>
</UserPrivilegesProvider>

View file

@ -12,7 +12,7 @@ import type { Filter } from '@kbn/es-query';
import { inputsModel, State } from '../../store';
import { inputsActions } from '../../store/actions';
import { ControlColumnProps, RowRenderer, TimelineId } from '../../../../common/types/timeline';
import { APP_ID, APP_UI_ID } from '../../../../common/constants';
import { APP_UI_ID } from '../../../../common/constants';
import { timelineActions } from '../../../timelines/store/timeline';
import type { SubsetTimelineModel } from '../../../timelines/store/timeline/model';
import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
@ -26,7 +26,7 @@ import type { EntityType } from '../../../../../timelines/common';
import { TGridCellAction } from '../../../../../timelines/common/types';
import { CellValueElementProps } from '../../../timelines/components/timeline/cell_rendering';
import { FIELDS_WITHOUT_CELL_ACTIONS } from '../../lib/cell_actions/constants';
import { useGetUserCasesPermissions, useKibana } from '../../lib/kibana';
import { useKibana } from '../../lib/kibana';
import { GraphOverlay } from '../../../timelines/components/graph_overlay';
import {
useFieldBrowserOptions,
@ -114,7 +114,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
} = defaultModel,
} = useSelector((state: State) => eventsViewerSelector(state, id));
const { timelines: timelinesUi, cases } = useKibana().services;
const { timelines: timelinesUi } = useKibana().services;
const {
browserFields,
dataViewId,
@ -201,62 +201,58 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
editorActionsRef,
});
const casesPermissions = useGetUserCasesPermissions();
const CasesContext = cases.ui.getCasesContext();
const isLive = input.policy.kind === 'interval';
return (
<>
<CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
<FullScreenContainer $isFullScreen={globalFullScreen}>
<InspectButtonContainer>
{timelinesUi.getTGrid<'embedded'>({
additionalFilters,
appId: APP_UI_ID,
browserFields,
bulkActions,
columns,
dataProviders,
dataViewId,
defaultCellActions,
deletedEventIds,
disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
docValueFields,
end,
entityType,
fieldBrowserOptions,
filters: globalFilters,
filterStatus: currentFilter,
globalFullScreen,
graphEventId,
graphOverlay,
hasAlertsCrud,
id,
indexNames: selectedPatterns,
indexPattern,
isLive,
isLoadingIndexPattern,
itemsPerPage,
itemsPerPageOptions,
kqlMode,
leadingControlColumns,
onRuleChange,
query,
renderCellValue,
rowRenderers,
runtimeMappings,
setQuery,
sort,
start,
tGridEventRenderedViewEnabled,
trailingControlColumns,
type: 'embedded',
unit,
})}
</InspectButtonContainer>
</FullScreenContainer>
{DetailsPanel}
</CasesContext>
<FullScreenContainer $isFullScreen={globalFullScreen}>
<InspectButtonContainer>
{timelinesUi.getTGrid<'embedded'>({
additionalFilters,
appId: APP_UI_ID,
browserFields,
bulkActions,
columns,
dataProviders,
dataViewId,
defaultCellActions,
deletedEventIds,
disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
docValueFields,
end,
entityType,
fieldBrowserOptions,
filters: globalFilters,
filterStatus: currentFilter,
globalFullScreen,
graphEventId,
graphOverlay,
hasAlertsCrud,
id,
indexNames: selectedPatterns,
indexPattern,
isLive,
isLoadingIndexPattern,
itemsPerPage,
itemsPerPageOptions,
kqlMode,
leadingControlColumns,
onRuleChange,
query,
renderCellValue,
rowRenderers,
runtimeMappings,
setQuery,
sort,
start,
tGridEventRenderedViewEnabled,
trailingControlColumns,
type: 'embedded',
unit,
})}
</InspectButtonContainer>
</FullScreenContainer>
{DetailsPanel}
</>
);
};

View file

@ -18,7 +18,6 @@ import { useRouteSpy } from '../../utils/route/use_route_spy';
import { useQueryToggle } from '../../containers/query_toggle';
jest.mock('../../containers/query_toggle');
jest.mock('../../lib/kibana');
jest.mock('./matrix_loader', () => ({
MatrixLoader: () => <div className="matrixLoader" />,

View file

@ -31,8 +31,7 @@ import { InputsModelId } from '../../store/inputs/constants';
import { HoverVisibilityContainer } from '../hover_visibility_container';
import { HISTOGRAM_ACTIONS_BUTTON_CLASS, VisualizationActions } from '../visualization_actions';
import { GetLensAttributes, LensAttributes } from '../visualization_actions/types';
import { useKibana, useGetUserCasesPermissions } from '../../lib/kibana';
import { APP_ID, SecurityPageName } from '../../../../common/constants';
import { SecurityPageName } from '../../../../common/constants';
import { useRouteSpy } from '../../utils/route/use_route_spy';
import { useQueryToggle } from '../../containers/query_toggle';
@ -104,10 +103,6 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
skip,
}) => {
const dispatch = useDispatch();
const { cases } = useKibana().services;
const CasesContext = cases.ui.getCasesContext();
const userPermissions = useGetUserCasesPermissions();
const userCanCrud = userPermissions?.crud ?? false;
const handleBrushEnd = useCallback(
({ x }) => {
@ -267,18 +262,16 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
<EuiFlexGroup alignItems="center" gutterSize="none">
{onHostOrNetworkOrUserPage && (getLensAttributes || lensAttributes) && timerange && (
<EuiFlexItem grow={false}>
<CasesContext owner={[APP_ID]} userCanCrud={userCanCrud ?? false}>
<VisualizationActions
className="histogram-viz-actions"
getLensAttributes={getLensAttributes}
isInspectButtonDisabled={filterQuery === undefined}
lensAttributes={lensAttributes}
queryId={id}
stackByField={selectedStackByOption.value}
timerange={timerange}
title={title}
/>
</CasesContext>
<VisualizationActions
className="histogram-viz-actions"
getLensAttributes={getLensAttributes}
isInspectButtonDisabled={filterQuery === undefined}
lensAttributes={lensAttributes}
queryId={id}
stackByField={selectedStackByOption.value}
timerange={timerange}
title={title}
/>
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>

View file

@ -10,7 +10,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { connect, ConnectedProps, useDispatch } from 'react-redux';
import { Dispatch } from 'redux';
import type { Filter } from '@kbn/es-query';
import { APP_ID } from '../../../../common/constants';
import { getEsQueryConfig } from '../../../../../../../src/plugins/data/common';
import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
import { RowRendererId, TimelineIdLiteral } from '../../../../common/types/timeline';
@ -25,7 +24,7 @@ import { useAppToasts } from '../../../common/hooks/use_app_toasts';
import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
import { useInvalidFilterQuery } from '../../../common/hooks/use_invalid_filter_query';
import { defaultCellActions } from '../../../common/lib/cell_actions/default_cell_actions';
import { useGetUserCasesPermissions, useKibana } from '../../../common/lib/kibana';
import { useKibana } from '../../../common/lib/kibana';
import { inputsModel, inputsSelectors, State } from '../../../common/store';
import { SourcererScopeName } from '../../../common/store/sourcerer/model';
import * as i18nCommon from '../../../common/translations';
@ -365,34 +364,29 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
const leadingControlColumns = useMemo(() => getDefaultControlColumn(ACTION_BUTTON_COUNT), []);
const casesPermissions = useGetUserCasesPermissions();
const CasesContext = kibana.services.cases.ui.getCasesContext();
if (loading || isEmpty(selectedPatterns)) {
return null;
}
return (
<CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
<StatefulEventsViewer
additionalFilters={additionalFiltersComponent}
currentFilter={filterGroup}
defaultCellActions={defaultCellActions}
defaultModel={alertsDefaultModel}
end={to}
entityType="events"
hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
id={timelineId}
leadingControlColumns={leadingControlColumns}
onRuleChange={onRuleChange}
pageFilters={defaultFiltersMemo}
renderCellValue={RenderCellValue}
rowRenderers={defaultRowRenderers}
scopeId={SourcererScopeName.detections}
start={from}
utilityBar={utilityBarCallback}
/>
</CasesContext>
<StatefulEventsViewer
additionalFilters={additionalFiltersComponent}
currentFilter={filterGroup}
defaultCellActions={defaultCellActions}
defaultModel={alertsDefaultModel}
end={to}
entityType="events"
hasAlertsCrud={hasIndexWrite && hasIndexMaintenance}
id={timelineId}
leadingControlColumns={leadingControlColumns}
onRuleChange={onRuleChange}
pageFilters={defaultFiltersMemo}
renderCellValue={RenderCellValue}
rowRenderers={defaultRowRenderers}
scopeId={SourcererScopeName.detections}
start={from}
utilityBar={utilityBarCallback}
/>
);
};

View file

@ -28,7 +28,7 @@ import { alertsPreviewDefaultModel } from '../../alerts_table/default_config';
import { SourcererScopeName } from '../../../../common/store/sourcerer/model';
import { defaultRowRenderers } from '../../../../timelines/components/timeline/body/renderers';
import { TimelineId } from '../../../../../common/types';
import { APP_ID, APP_UI_ID, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
import { APP_UI_ID, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants';
import { FIELDS_WITHOUT_CELL_ACTIONS } from '../../../../common/lib/cell_actions/constants';
import { useSourcererDataView } from '../../../../common/containers/sourcerer';
import { DetailsPanel } from '../../../../timelines/components/side_panel';
@ -74,7 +74,7 @@ export const PreviewHistogram = ({
}: PreviewHistogramProps) => {
const dispatch = useDispatch();
const { setQuery, isInitializing } = useGlobalTime();
const { timelines: timelinesUi, cases } = useKibana().services;
const { timelines: timelinesUi } = useKibana().services;
const from = useMemo(() => `now-1${timeFrame}`, [timeFrame]);
const to = useMemo(() => 'now', []);
const startDate = useMemo(() => formatDate(from), [from]);
@ -155,8 +155,6 @@ export const PreviewHistogram = ({
const chartData = useMemo((): ChartSeriesData[] => [{ key: 'hits', value: data }], [data]);
const CasesContext = cases.ui.getCasesContext();
return (
<>
<Panel height={DEFAULT_HISTOGRAM_HEIGHT} data-test-subj={'preview-histogram-panel'}>
@ -194,54 +192,52 @@ export const PreviewHistogram = ({
</EuiFlexGroup>
</Panel>
<EuiSpacer />
<CasesContext owner={[APP_ID]} userCanCrud={false}>
<FullScreenContainer $isFullScreen={globalFullScreen}>
<InspectButtonContainer>
{timelinesUi.getTGrid<'embedded'>({
additionalFilters: <></>,
appId: APP_UI_ID,
browserFields,
columns,
dataProviders,
deletedEventIds,
disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
docValueFields,
end: endDate,
entityType: 'events',
filters: [],
globalFullScreen,
hasAlertsCrud: false,
id: TimelineId.rulePreview,
indexNames: [`${DEFAULT_PREVIEW_INDEX}-${spaceId}`],
indexPattern,
isLive: false,
isLoadingIndexPattern,
itemsPerPage,
itemsPerPageOptions,
kqlMode,
query: { query: `kibana.alert.rule.uuid:${previewId}`, language: 'kuery' },
renderCellValue: PreviewRenderCellValue,
rowRenderers: defaultRowRenderers,
runtimeMappings,
setQuery: () => {},
sort,
start: startDate,
tGridEventRenderedViewEnabled,
type: 'embedded',
leadingControlColumns: getPreviewTableControlColumn(1.5),
})}
</InspectButtonContainer>
</FullScreenContainer>
<DetailsPanel
browserFields={browserFields}
entityType={'events'}
docValueFields={docValueFields}
isFlyoutView
runtimeMappings={runtimeMappings}
timelineId={TimelineId.rulePreview}
isReadOnly
/>
</CasesContext>
<FullScreenContainer $isFullScreen={globalFullScreen}>
<InspectButtonContainer>
{timelinesUi.getTGrid<'embedded'>({
additionalFilters: <></>,
appId: APP_UI_ID,
browserFields,
columns,
dataProviders,
deletedEventIds,
disabledCellActions: FIELDS_WITHOUT_CELL_ACTIONS,
docValueFields,
end: endDate,
entityType: 'events',
filters: [],
globalFullScreen,
hasAlertsCrud: false,
id: TimelineId.rulePreview,
indexNames: [`${DEFAULT_PREVIEW_INDEX}-${spaceId}`],
indexPattern,
isLive: false,
isLoadingIndexPattern,
itemsPerPage,
itemsPerPageOptions,
kqlMode,
query: { query: `kibana.alert.rule.uuid:${previewId}`, language: 'kuery' },
renderCellValue: PreviewRenderCellValue,
rowRenderers: defaultRowRenderers,
runtimeMappings,
setQuery: () => {},
sort,
start: startDate,
tGridEventRenderedViewEnabled,
type: 'embedded',
leadingControlColumns: getPreviewTableControlColumn(1.5),
})}
</InspectButtonContainer>
</FullScreenContainer>
<DetailsPanel
browserFields={browserFields}
entityType={'events'}
docValueFields={docValueFields}
isFlyoutView
runtimeMappings={runtimeMappings}
timelineId={TimelineId.rulePreview}
isReadOnly
/>
</>
);
};

View file

@ -22,8 +22,6 @@ import {
StatItems,
} from '../../../../common/components/stat_items';
import { UpdateDateRange } from '../../../../common/components/charts/common';
import { useKibana, useGetUserCasesPermissions } from '../../../../common/lib/kibana';
import { APP_ID } from '../../../../../common/constants';
import { UserskKpiStrategyResponse } from '../../../../../common/search_strategy/security_solution/users';
const kpiWidgetHeight = 247;
@ -47,11 +45,6 @@ interface KpiBaseComponentProps {
export const KpiBaseComponent = React.memo<KpiBaseComponentProps>(
({ fieldsMapping, data, id, loading = false, from, to, narrowDateRange, setQuerySkip }) => {
const { cases } = useKibana().services;
const CasesContext = cases.ui.getCasesContext();
const userPermissions = useGetUserCasesPermissions();
const userCanCrud = userPermissions?.crud ?? false;
const statItemsProps: StatItemsProps[] = useKpiMatrixStatus(
fieldsMapping,
data,
@ -65,11 +58,9 @@ export const KpiBaseComponent = React.memo<KpiBaseComponentProps>(
return (
<EuiFlexGroup wrap>
<CasesContext owner={[APP_ID]} userCanCrud={userCanCrud ?? false}>
{statItemsProps.map((mappedStatItemProps) => (
<StatItemsComponent {...mappedStatItemProps} showInspectButton={false} />
))}
</CasesContext>
{statItemsProps.map((mappedStatItemProps) => (
<StatItemsComponent {...mappedStatItemProps} showInspectButton={false} />
))}
</EuiFlexGroup>
);
},

View file

@ -19,8 +19,6 @@ import styled from 'styled-components';
import deepEqual from 'fast-deep-equal';
import { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import { BrowserFields, DocValueFields } from '../../../../common/containers/source';
import { useKibana, useGetUserCasesPermissions } from '../../../../common/lib/kibana';
import { APP_ID } from '../../../../../common/constants';
import { ExpandableEvent, ExpandableEventTitle } from './expandable_event';
import { useTimelineEventsDetails } from '../../../containers/details';
import { TimelineTabs } from '../../../../../common/types/timeline';
@ -100,13 +98,6 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
'isolateHost'
);
const {
services: { cases },
} = useKibana();
const CasesContext = cases.ui.getCasesContext();
const casesPermissions = useGetUserCasesPermissions();
const [isIsolateActionSuccessBannerVisible, setIsIsolateActionSuccessBannerVisible] =
useState(false);
@ -195,7 +186,7 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
}
return isFlyoutView ? (
<CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
<>
<EuiFlyoutHeader hasBorder={isHostIsolationPanelOpen}>
{isHostIsolationPanelOpen ? (
backToAlertDetailsLink
@ -254,9 +245,9 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
timelineId={timelineId}
/>
)}
</CasesContext>
</>
) : (
<CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
<>
<ExpandableEventTitle
isAlert={isAlert}
loading={loading}
@ -290,7 +281,7 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
timelineId={timelineId}
/>
)}
</CasesContext>
</>
);
};

View file

@ -9,8 +9,6 @@ import { noop, isEmpty } from 'lodash/fp';
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { APP_ID } from '../../../../../common/constants';
import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
import {
FIRST_ARIA_INDEX,
ARIA_COLINDEX_ATTRIBUTE,
@ -229,65 +227,60 @@ export const StatefulBody = React.memo<Props>(
},
[columnHeaders.length, containerRef, data.length]
);
const kibana = useKibana();
const casesPermissions = useGetUserCasesPermissions();
const CasesContext = kibana.services.cases.ui.getCasesContext();
return (
<>
<TimelineBody data-test-subj="timeline-body" ref={containerRef}>
<CasesContext owner={[APP_ID]} userCanCrud={casesPermissions?.crud ?? false}>
<EventsTable
$activePage={activePage}
$columnCount={columnCount}
data-test-subj={`${tabType}-events-table`}
columnWidths={totalWidth}
onKeyDown={onKeyDown}
$rowCount={data.length}
$totalPages={totalPages}
>
<ColumnHeaders
actionsColumnWidth={actionsColumnWidth}
browserFields={browserFields}
columnHeaders={columnHeaders}
isEventViewer={isEventViewer}
isSelectAllChecked={isSelectAllChecked}
onSelectAll={onSelectAll}
show={show}
showEventsSelect={false}
showSelectAllCheckbox={showCheckboxes}
sort={sort}
tabType={tabType}
timelineId={id}
leadingControlColumns={leadingControlColumns}
trailingControlColumns={trailingControlColumns}
/>
<EventsTable
$activePage={activePage}
$columnCount={columnCount}
data-test-subj={`${tabType}-events-table`}
columnWidths={totalWidth}
onKeyDown={onKeyDown}
$rowCount={data.length}
$totalPages={totalPages}
>
<ColumnHeaders
actionsColumnWidth={actionsColumnWidth}
browserFields={browserFields}
columnHeaders={columnHeaders}
isEventViewer={isEventViewer}
isSelectAllChecked={isSelectAllChecked}
onSelectAll={onSelectAll}
show={show}
showEventsSelect={false}
showSelectAllCheckbox={showCheckboxes}
sort={sort}
tabType={tabType}
timelineId={id}
leadingControlColumns={leadingControlColumns}
trailingControlColumns={trailingControlColumns}
/>
<Events
containerRef={containerRef}
actionsColumnWidth={actionsColumnWidth}
browserFields={browserFields}
columnHeaders={columnHeaders}
data={data}
eventIdToNoteIds={eventIdToNoteIds}
id={id}
isEventViewer={isEventViewer}
lastFocusedAriaColindex={lastFocusedAriaColindex}
loadingEventIds={loadingEventIds}
onRowSelected={onRowSelected}
pinnedEventIds={pinnedEventIds}
refetch={refetch}
renderCellValue={renderCellValue}
rowRenderers={enabledRowRenderers}
onRuleChange={onRuleChange}
selectedEventIds={selectedEventIds}
showCheckboxes={showCheckboxes}
leadingControlColumns={leadingControlColumns}
trailingControlColumns={trailingControlColumns}
tabType={tabType}
/>
</EventsTable>
</CasesContext>
<Events
containerRef={containerRef}
actionsColumnWidth={actionsColumnWidth}
browserFields={browserFields}
columnHeaders={columnHeaders}
data={data}
eventIdToNoteIds={eventIdToNoteIds}
id={id}
isEventViewer={isEventViewer}
lastFocusedAriaColindex={lastFocusedAriaColindex}
loadingEventIds={loadingEventIds}
onRowSelected={onRowSelected}
pinnedEventIds={pinnedEventIds}
refetch={refetch}
renderCellValue={renderCellValue}
rowRenderers={enabledRowRenderers}
onRuleChange={onRuleChange}
selectedEventIds={selectedEventIds}
showCheckboxes={showCheckboxes}
leadingControlColumns={leadingControlColumns}
trailingControlColumns={trailingControlColumns}
tabType={tabType}
/>
</EventsTable>
</TimelineBody>
<TimelineBodyGlobalStyle />
</>