Update entity route schema, use more indices on detections page (#91718…

…) (#91764)
elastic · Feb 18, 2021 · 701cf53 · 701cf53
1 parent 562ebb1
commit 701cf53
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts b/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
@@ -133,6 +133,6 @@ export const validateEntities = {
     /**
      * Indices to search in.
      */
-    indices: schema.arrayOf(schema.string()),
+    indices: schema.oneOf([schema.arrayOf(schema.string()), schema.string()]),
   }),
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/graph_overlay/index.tsx
@@ -30,8 +30,7 @@ import { TimelineId } from '../../../../common/types/timeline';
 import { timelineSelectors } from '../../store/timeline';
 import { timelineDefaults } from '../../store/timeline/defaults';
 import { isFullScreen } from '../timeline/body/column_headers';
-import { useSourcererScope } from '../../../common/containers/sourcerer';
-import { SourcererScopeName } from '../../../common/store/sourcerer/model';
+import { sourcererSelectors } from '../../../common/store';
 import { updateTimelineGraphEventId } from '../../../timelines/store/timeline/actions';
 import { Resolver } from '../../../resolver/view';
 import {
@@ -169,14 +168,12 @@ const GraphOverlayComponent: React.FC<OwnProps> = ({ isEventViewer, timelineId }
     globalFullScreen,
   ]);
 
-  let sourcereScope = SourcererScopeName.default;
-  if ([TimelineId.detectionsRulesDetailsPage, TimelineId.detectionsPage].includes(timelineId)) {
-    sourcereScope = SourcererScopeName.detections;
-  } else if (timelineId === TimelineId.active) {
-    sourcereScope = SourcererScopeName.timeline;
-  }
+  const existingIndexNamesSelector = useMemo(
+    () => sourcererSelectors.getAllExistingIndexNamesSelector(),
+    []
+  );
+  const existingIndexNames = useDeepEqualSelector<string[]>(existingIndexNamesSelector);
 
-  const { selectedPatterns } = useSourcererScope(sourcereScope);
   return (
     <OverlayContainer
       data-test-subj="overlayContainer"
@@ -200,7 +197,7 @@ const GraphOverlayComponent: React.FC<OwnProps> = ({ isEventViewer, timelineId }
         <StyledResolver
           databaseDocumentID={graphEventId}
           resolverComponentInstanceID={timelineId}
-          indices={selectedPatterns}
+          indices={existingIndexNames}
           shouldUpdate={shouldUpdate}
           filters={{ from, to }}
         />

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx
@@ -138,7 +138,7 @@ const InvestigateInResolverActionComponent: React.FC<InvestigateInResolverAction
   const isDisabled = useMemo(() => !isInvestigateInResolverActionEnabled(ecsData), [ecsData]);
   const handleClick = useCallback(() => {
     dispatch(updateTimelineGraphEventId({ id: timelineId, graphEventId: ecsData._id }));
-    if (TimelineId.active) {
+    if (timelineId === TimelineId.active) {
       dispatch(setActiveTabTimeline({ id: timelineId, activeTab: TimelineTabs.graph }));
     }
   }, [dispatch, ecsData._id, timelineId]);