fix update on bulk action

elastic · Sep 13, 2021 · 93970db · 93970db
1 parent 7ae35e7
commit 93970db
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -87,6 +87,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
   entityType,
   excludedRowRendererIds,
   filters,
+  globalQuery,
   id,
   isLive,
   itemsPerPage,
@@ -102,6 +103,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
   scopeId,
   showCheckboxes,
   sort,
+  timelineQuery,
   utilityBar,
   additionalFilters,
   // If truthy, the graph viewer (Resolver) is showing
@@ -157,6 +159,18 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
     [dispatch, id]
   );
 
+  const refetchQuery = (newQueries: inputsModel.GlobalQuery[]) => {
+    newQueries.forEach((q) => q.refetch && (q.refetch as inputsModel.Refetch)());
+  };
+  const onAlertStatusActionSuccess = useCallback(() => {
+    if (id === TimelineId.active) {
+      refetchQuery([timelineQuery]);
+    } else {
+      refetchQuery(globalQuery);
+    }
+  }, [id, timelineQuery, globalQuery]);
+  const bulkActions = useMemo(() => ({ onAlertStatusActionSuccess }), [onAlertStatusActionSuccess]);
+
   return (
     <>
       <FullScreenContainer $isFullScreen={globalFullScreen}>
@@ -166,6 +180,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
               id,
               type: 'embedded',
               browserFields,
+              bulkActions,
               columns,
               dataProviders: dataProviders!,
               defaultCellActions,
@@ -245,6 +260,8 @@ const makeMapStateToProps = () => {
   const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
   const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
   const getTimeline = timelineSelectors.getTimelineByIdSelector();
+  const getGlobalQueries = inputsSelectors.globalQuery();
+  const getTimelineQuery = inputsSelectors.timelineQueryByIdSelector();
   const mapStateToProps = (state: State, { id, defaultModel }: OwnProps) => {
     const input: inputsModel.InputsRange = getInputsTimeline(state);
     const timeline: TimelineModel = getTimeline(state, id) ?? defaultModel;
@@ -280,6 +297,8 @@ const makeMapStateToProps = () => {
       // Used to determine whether the footer should show (since it is hidden if the graph is showing.)
       // `getTimeline` actually returns `TimelineModel | undefined`
       graphEventId,
+      globalQuery: getGlobalQueries(state),
+      timelineQuery: getTimelineQuery(state, id),
     };
   };
   return mapStateToProps;

diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/selectors.ts b/x-pack/plugins/security_solution/public/common/store/inputs/selectors.ts
@@ -57,7 +57,7 @@ export const globalTimeRangeSelector = createSelector(selectGlobal, (global) =>
 
 export const globalPolicySelector = createSelector(selectGlobal, (global) => global.policy);
 
-export const globalQuery = createSelector(selectGlobal, (global) => global.queries);
+export const globalQuery = () => createSelector(selectGlobal, (global) => global.queries);
 
 export const globalQueryByIdSelector = () => createSelector(selectGlobalQuery, (query) => query);
 

diff --git a/...olution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/...olution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -131,7 +131,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps & PropsFromRedux
     if (timelineId === TimelineId.active) {
       refetchQuery([timelineQuery]);
     } else {
-      refetchQuery([globalQuery]);
+      refetchQuery(globalQuery);
     }
   }, [timelineId, globalQuery, timelineQuery]);
 
@@ -234,11 +234,11 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps & PropsFromRedux
 };
 
 const makeMapStateToProps = () => {
-  const getGlobalQuery = inputsSelectors.globalQueryByIdSelector();
+  const getGlobalQueries = inputsSelectors.globalQuery();
   const getTimelineQuery = inputsSelectors.timelineQueryByIdSelector();
   const mapStateToProps = (state: State, { timelineId }: AlertContextMenuProps) => {
     return {
-      globalQuery: getGlobalQuery(state, timelineId),
+      globalQuery: getGlobalQueries(state),
       timelineQuery: getTimelineQuery(state, timelineId),
     };
   };

diff --git a/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx
@@ -19,7 +19,12 @@ import { Direction, EntityType } from '../../../../common/search_strategy';
 import type { DocValueFields } from '../../../../common/search_strategy';
 import type { CoreStart } from '../../../../../../../src/core/public';
 import type { BrowserFields } from '../../../../common/search_strategy/index_fields';
-import { TGridCellAction, TimelineId, TimelineTabs } from '../../../../common/types/timeline';
+import {
+  BulkActionsProp,
+  TGridCellAction,
+  TimelineId,
+  TimelineTabs,
+} from '../../../../common/types/timeline';
 
 import type {
   CellValueElementProps,
@@ -95,6 +100,7 @@ const SECURITY_ALERTS_CONSUMERS = [AlertConsumers.SIEM];
 export interface TGridIntegratedProps {
   additionalFilters: React.ReactNode;
   browserFields: BrowserFields;
+  bulkActions?: BulkActionsProp;
   columns: ColumnHeaderOptions[];
   data?: DataPublicPluginStart;
   dataProviders: DataProvider[];
@@ -135,6 +141,7 @@ export interface TGridIntegratedProps {
 const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
   additionalFilters,
   browserFields,
+  bulkActions = true,
   columns,
   data,
   dataProviders,
@@ -334,6 +341,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
                           hasAlertsCrud={hasAlertsCrud}
                           activePage={pageInfo.activePage}
                           browserFields={browserFields}
+                          bulkActions={bulkActions}
                           filterQuery={filterQuery}
                           data={nonDeletedEvents}
                           defaultCellActions={defaultCellActions}