[8.18] [Performance][Security Solution][3/4] - Sourcerer performance (#…

…212482) (#212986) # Backport This will backport the following commits from `main` to `8.18`: - [[Performance][Security Solution][3/4] - Sourcerer performance (#212482)](#212482)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Michael Olorunnisola <michael.olorunnisola@elastic.co>
elastic · Mar 3, 2025 · 4692981 · 4692981
1 parent a571f30
commit 4692981
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 26 deletions.
diff --git a/x-pack/solutions/security/plugins/security_solution/public/app/home/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/app/home/index.tsx
@@ -13,7 +13,6 @@ import { SecuritySolutionAppWrapper } from '../../common/components/page';
 
 import { HelpMenu } from '../../common/components/help_menu';
 import { getScopeFromPath } from '../../sourcerer/containers/sourcerer_paths';
-import { useSourcererDataView } from '../../sourcerer/containers';
 import { GlobalHeader } from './global_header';
 import { ConsoleManager } from '../../management/components/console/components/console_manager';
 
@@ -34,13 +33,11 @@ interface HomePageProps {
 
 const HomePageComponent: React.FC<HomePageProps> = ({ children }) => {
   const { pathname } = useLocation();
-  useInitSourcerer(getScopeFromPath(pathname));
+  const { browserFields } = useInitSourcerer(getScopeFromPath(pathname));
   useUrlState();
   useUpdateBrowserTitle();
   useUpdateExecutionContext();
 
-  const { browserFields } = useSourcererDataView(getScopeFromPath(pathname));
-
   // side effect: this will attempt to upgrade the endpoint package if it is not up to date
   // this will run when a user navigates to the Security Solution app and when they navigate between
   // tabs in the app. This is useful for keeping the endpoint package as up to date as possible until

diff --git a/...tions/security/plugins/security_solution/public/detections/components/user_info/index.tsx b/...tions/security/plugins/security_solution/public/detections/components/user_info/index.tsx
@@ -7,7 +7,7 @@
 
 import { noop } from 'lodash/fp';
 import type { Dispatch } from 'react';
-import React, { useEffect, useReducer, createContext, useContext } from 'react';
+import React, { useEffect, useReducer, createContext, useContext, useMemo } from 'react';
 
 import { useAlertsPrivileges } from '../../containers/detection_engine/alerts/use_alerts_privileges';
 import { useSignalIndex } from '../../containers/detection_engine/alerts/use_signal_index';
@@ -353,19 +353,38 @@ export const useUserInfo = (): State => {
     signalIndexMappingOutdated,
   ]);
 
-  return {
-    loading,
-    isSignalIndexExists,
-    isAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-    canUserREAD,
-    hasIndexManage,
-    hasIndexMaintenance,
-    hasIndexWrite,
-    hasIndexRead,
-    hasIndexUpdateDelete,
-    signalIndexName,
-    signalIndexMappingOutdated,
-  };
+  const userInfo = useMemo(
+    () => ({
+      loading,
+      isSignalIndexExists,
+      isAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+      canUserREAD,
+      hasIndexManage,
+      hasIndexMaintenance,
+      hasIndexWrite,
+      hasIndexRead,
+      hasIndexUpdateDelete,
+      signalIndexName,
+      signalIndexMappingOutdated,
+    }),
+    [
+      canUserCRUD,
+      canUserREAD,
+      hasEncryptionKey,
+      hasIndexMaintenance,
+      hasIndexManage,
+      hasIndexRead,
+      hasIndexUpdateDelete,
+      hasIndexWrite,
+      isAuthenticated,
+      isSignalIndexExists,
+      loading,
+      signalIndexMappingOutdated,
+      signalIndexName,
+    ]
+  );
+
+  return userInfo;
 };
diff --git a/x-pack/solutions/security/plugins/security_solution/public/sourcerer/containers/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/sourcerer/containers/index.tsx
@@ -67,10 +67,11 @@ export const useSourcererDataView = (
     if (selectedDataView == null || missingPatterns.length > 0) {
       // old way of fetching indices, legacy timeline
       setLegacyPatterns(selectedPatterns);
-    } else {
+    } else if (legacyPatterns.length > 0) {
+      // Only create a new array reference if legacyPatterns is not empty
       setLegacyPatterns([]);
     }
-  }, [missingPatterns, selectedDataView, selectedPatterns]);
+  }, [legacyPatterns.length, missingPatterns, selectedDataView, selectedPatterns]);
 
   const sourcererDataView = useMemo(() => {
     const _dv =

diff --git a/...ons/security/plugins/security_solution/public/sourcerer/containers/use_init_sourcerer.tsx b/...ons/security/plugins/security_solution/public/sourcerer/containers/use_init_sourcerer.tsx
@@ -178,7 +178,7 @@ export const useInitSourcerer = (
       !loadingSignalIndex &&
       signalIndexName != null &&
       signalIndexNameSourcerer == null &&
-      (activeTimeline == null || activeTimeline.savedObjectId == null) &&
+      activeTimeline?.savedObjectId == null &&
       initialTimelineSourcerer.current &&
       defaultDataView.id.length > 0
     ) {
@@ -209,7 +209,7 @@ export const useInitSourcerer = (
       );
     } else if (
       signalIndexNameSourcerer != null &&
-      (activeTimeline == null || activeTimeline.savedObjectId == null) &&
+      activeTimeline?.savedObjectId == null &&
       initialTimelineSourcerer.current &&
       defaultDataView.id.length > 0
     ) {
@@ -240,14 +240,14 @@ export const useInitSourcerer = (
       );
     }
   }, [
-    activeTimeline,
+    activeTimeline?.savedObjectId,
     defaultDataView,
     dispatch,
     loadingSignalIndex,
     signalIndexName,
     signalIndexNameSourcerer,
   ]);
-  const { dataViewId } = useSourcererDataView(scopeId);
+  const { dataViewId, browserFields } = useSourcererDataView(scopeId);
 
   const updateSourcererDataView = useCallback(
     (newSignalsIndex: string) => {
@@ -370,4 +370,11 @@ export const useInitSourcerer = (
     signalIndexName,
     signalIndexNameSourcerer,
   ]);
+
+  return useMemo(
+    () => ({
+      browserFields,
+    }),
+    [browserFields]
+  );
 };