[8.x] [Security Solution] Update preview navigation in entity details…

… flyout (#204513) (#204961) # Backport This will backport the following commits from `main` to `8.x`: - [[Security Solution] Update preview navigation in entity details flyout (#204513)](#204513)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: christineweng <[email protected]>
elastic · Dec 19, 2024 · 8a14346 · 8a14346
1 parent 17b5861
commit 8a14346
Show file tree

Hide file tree

Showing 25 changed files with 872 additions and 173 deletions.
diff --git a/...security_solution/public/cloud_security_posture/components/alerts/alerts_preview.test.tsx b/...security_solution/public/cloud_security_posture/components/alerts/alerts_preview.test.tsx
@@ -9,11 +9,9 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import { AlertsPreview } from './alerts_preview';
 import { TestProviders } from '../../../common/mock/test_providers';
-import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import type { ParsedAlertsData } from '../../../overview/components/detection_response/alerts_by_status/types';
 import { useMisconfigurationPreview } from '@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview';
 import { useVulnerabilitiesPreview } from '@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview';
-import { useRiskScore } from '../../../entity_analytics/api/hooks/use_risk_score';
 
 const mockAlertsData: ParsedAlertsData = {
   open: {
@@ -35,18 +33,14 @@ const mockAlertsData: ParsedAlertsData = {
 // Mock hooks
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview');
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview');
-jest.mock('../../../entity_analytics/api/hooks/use_risk_score');
-jest.mock('@kbn/expandable-flyout');
 
 describe('AlertsPreview', () => {
   const mockOpenLeftPanel = jest.fn();
 
   beforeEach(() => {
-    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
     (useVulnerabilitiesPreview as jest.Mock).mockReturnValue({
       data: { count: { CRITICAL: 0, HIGH: 1, MEDIUM: 1, LOW: 0, UNKNOWN: 0 } },
     });
-    (useRiskScore as jest.Mock).mockReturnValue({ data: [{ host: { risk: 75 } }] });
     (useMisconfigurationPreview as jest.Mock).mockReturnValue({
       data: { count: { passed: 1, failed: 1 } },
     });
@@ -58,7 +52,11 @@ describe('AlertsPreview', () => {
   it('renders', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <AlertsPreview alertsData={mockAlertsData} value="host1" field="host.name" />
+        <AlertsPreview
+          alertsData={mockAlertsData}
+          isLinkEnabled={true}
+          openDetailsPanel={mockOpenLeftPanel}
+        />
       </TestProviders>
     );
 
@@ -68,7 +66,11 @@ describe('AlertsPreview', () => {
   it('renders correct alerts number', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <AlertsPreview alertsData={mockAlertsData} value="host1" field="host.name" />
+        <AlertsPreview
+          alertsData={mockAlertsData}
+          isLinkEnabled={true}
+          openDetailsPanel={mockOpenLeftPanel}
+        />
       </TestProviders>
     );
 
@@ -78,7 +80,11 @@ describe('AlertsPreview', () => {
   it('should render the correct number of distribution bar section based on the number of severities', () => {
     const { queryAllByTestId } = render(
       <TestProviders>
-        <AlertsPreview alertsData={mockAlertsData} value="host1" field="host.name" />
+        <AlertsPreview
+          alertsData={mockAlertsData}
+          isLinkEnabled={true}
+          openDetailsPanel={mockOpenLeftPanel}
+        />
       </TestProviders>
     );
 

diff --git a/...gins/security_solution/public/cloud_security_posture/components/alerts/alerts_preview.tsx b/...gins/security_solution/public/cloud_security_posture/components/alerts/alerts_preview.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { capitalize } from 'lodash';
 import type { EuiThemeComputed } from '@elastic/eui';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle, useEuiTheme } from '@elastic/eui';
@@ -18,8 +18,11 @@ import type {
 } from '../../../overview/components/detection_response/alerts_by_status/types';
 import { ExpandablePanel } from '../../../flyout/shared/components/expandable_panel';
 import { getSeverityColor } from '../../../detections/components/alerts_kpis/severity_level_panel/helpers';
-import { CspInsightLeftPanelSubTab } from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
-import { useNavigateEntityInsight } from '../../hooks/use_entity_insight';
+import type { EntityDetailsPath } from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
+import {
+  CspInsightLeftPanelSubTab,
+  EntityDetailsLeftPanelTab,
+} from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
 
 const AlertsCount = ({
   alertsTotal,
@@ -58,14 +61,14 @@ const AlertsCount = ({
 
 export const AlertsPreview = ({
   alertsData,
-  field,
-  value,
   isPreviewMode,
+  openDetailsPanel,
+  isLinkEnabled,
 }: {
   alertsData: ParsedAlertsData;
-  field: 'host.name' | 'user.name';
-  value: string;
   isPreviewMode?: boolean;
+  openDetailsPanel: (path: EntityDetailsPath) => void;
+  isLinkEnabled: boolean;
 }) => {
   const { euiTheme } = useEuiTheme();
 
@@ -90,15 +93,16 @@ export const AlertsPreview = ({
 
   const hasNonClosedAlerts = totalAlertsCount > 0;
 
-  const { goToEntityInsightTab } = useNavigateEntityInsight({
-    field,
-    value,
-    queryIdExtension: isPreviewMode ? 'ALERTS_PREVIEW_TRUE' : 'ALERTS_PREVIEW_FALSE',
-    subTab: CspInsightLeftPanelSubTab.ALERTS,
-  });
+  const goToEntityInsightTab = useCallback(() => {
+    openDetailsPanel({
+      tab: EntityDetailsLeftPanelTab.CSP_INSIGHTS,
+      subTab: CspInsightLeftPanelSubTab.ALERTS,
+    });
+  }, [openDetailsPanel]);
+
   const link = useMemo(
     () =>
-      !isPreviewMode
+      isLinkEnabled
         ? {
             callback: goToEntityInsightTab,
             tooltip: (
@@ -109,7 +113,7 @@ export const AlertsPreview = ({
             ),
           }
         : undefined,
-    [isPreviewMode, goToEntityInsightTab]
+    [isLinkEnabled, goToEntityInsightTab]
   );
   return (
     <ExpandablePanel

diff --git a/...ity/plugins/security_solution/public/cloud_security_posture/components/entity_insight.tsx b/...ity/plugins/security_solution/public/cloud_security_posture/components/entity_insight.tsx
@@ -18,15 +18,20 @@ import { AlertsPreview } from './alerts/alerts_preview';
 import { useGlobalTime } from '../../common/containers/use_global_time';
 import { DETECTION_RESPONSE_ALERTS_BY_STATUS_ID } from '../../overview/components/detection_response/alerts_by_status/types';
 import { useNonClosedAlerts } from '../hooks/use_non_closed_alerts';
+import type { EntityDetailsPath } from '../../flyout/entity_details/shared/components/left_panel/left_panel_header';
 
 export const EntityInsight = <T,>({
   value,
   field,
   isPreviewMode,
+  isLinkEnabled,
+  openDetailsPanel,
 }: {
   value: string;
   field: 'host.name' | 'user.name';
   isPreviewMode?: boolean;
+  isLinkEnabled: boolean;
+  openDetailsPanel: (path: EntityDetailsPath) => void;
 }) => {
   const { euiTheme } = useEuiTheme();
   const insightContent: React.ReactElement[] = [];
@@ -55,9 +60,9 @@ export const EntityInsight = <T,>({
       <>
         <AlertsPreview
           alertsData={filteredAlertsData}
-          field={field}
-          value={value}
           isPreviewMode={isPreviewMode}
+          isLinkEnabled={isLinkEnabled}
+          openDetailsPanel={openDetailsPanel}
         />
         <EuiSpacer size="s" />
       </>
@@ -67,14 +72,26 @@ export const EntityInsight = <T,>({
   if (showMisconfigurationsPreview)
     insightContent.push(
       <>
-        <MisconfigurationsPreview value={value} field={field} isPreviewMode={isPreviewMode} />
+        <MisconfigurationsPreview
+          value={value}
+          field={field}
+          isPreviewMode={isPreviewMode}
+          isLinkEnabled={isLinkEnabled}
+          openDetailsPanel={openDetailsPanel}
+        />
         <EuiSpacer size="s" />
       </>
     );
   if (showVulnerabilitiesPreview)
     insightContent.push(
       <>
-        <VulnerabilitiesPreview value={value} field={field} isPreviewMode={isPreviewMode} />
+        <VulnerabilitiesPreview
+          value={value}
+          field={field}
+          isPreviewMode={isPreviewMode}
+          isLinkEnabled={isLinkEnabled}
+          openDetailsPanel={openDetailsPanel}
+        />
         <EuiSpacer size="s" />
       </>
     );

diff --git a/...blic/cloud_security_posture/components/misconfiguration/misconfiguration_preview.test.tsx b/...blic/cloud_security_posture/components/misconfiguration/misconfiguration_preview.test.tsx
@@ -10,25 +10,19 @@ import { render } from '@testing-library/react';
 import { MisconfigurationsPreview } from './misconfiguration_preview';
 import { useMisconfigurationPreview } from '@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview';
 import { useVulnerabilitiesPreview } from '@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview';
-import { useRiskScore } from '../../../entity_analytics/api/hooks/use_risk_score';
-import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { TestProviders } from '../../../common/mock/test_providers';
 
 // Mock hooks
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview');
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview');
-jest.mock('../../../entity_analytics/api/hooks/use_risk_score');
-jest.mock('@kbn/expandable-flyout');
 
 describe('MisconfigurationsPreview', () => {
   const mockOpenLeftPanel = jest.fn();
 
   beforeEach(() => {
-    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
     (useVulnerabilitiesPreview as jest.Mock).mockReturnValue({
       data: { count: { CRITICAL: 0, HIGH: 1, MEDIUM: 1, LOW: 0, UNKNOWN: 0 } },
     });
-    (useRiskScore as jest.Mock).mockReturnValue({ data: [{ host: { risk: 75 } }] });
     (useMisconfigurationPreview as jest.Mock).mockReturnValue({
       data: { count: { passed: 1, failed: 1 } },
     });
@@ -37,7 +31,12 @@ describe('MisconfigurationsPreview', () => {
   it('renders', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <MisconfigurationsPreview value="host1" field="host.name" />
+        <MisconfigurationsPreview
+          value="host1"
+          field="host.name"
+          isLinkEnabled={true}
+          openDetailsPanel={mockOpenLeftPanel}
+        />
       </TestProviders>
     );
 

diff --git a/...on/public/cloud_security_posture/components/misconfiguration/misconfiguration_preview.tsx b/...on/public/cloud_security_posture/components/misconfiguration/misconfiguration_preview.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { css } from '@emotion/react';
 import type { EuiThemeComputed } from '@elastic/eui';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, useEuiTheme, EuiTitle } from '@elastic/eui';
@@ -20,8 +20,11 @@ import {
   uiMetricService,
 } from '@kbn/cloud-security-posture-common/utils/ui_metrics';
 import { ExpandablePanel } from '../../../flyout/shared/components/expandable_panel';
-import { CspInsightLeftPanelSubTab } from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
-import { useNavigateEntityInsight } from '../../hooks/use_entity_insight';
+import type { EntityDetailsPath } from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
+import {
+  CspInsightLeftPanelSubTab,
+  EntityDetailsLeftPanelTab,
+} from '../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
 
 export const getFindingsStats = (passedFindingsStats: number, failedFindingsStats: number) => {
   if (passedFindingsStats === 0 && failedFindingsStats === 0) return [];
@@ -88,10 +91,14 @@ export const MisconfigurationsPreview = ({
   value,
   field,
   isPreviewMode,
+  isLinkEnabled,
+  openDetailsPanel,
 }: {
   value: string;
   field: 'host.name' | 'user.name';
   isPreviewMode?: boolean;
+  isLinkEnabled: boolean;
+  openDetailsPanel: (path: EntityDetailsPath) => void;
 }) => {
   const { hasMisconfigurationFindings, passedFindings, failedFindings } = useHasMisconfigurations(
     field,
@@ -103,15 +110,16 @@ export const MisconfigurationsPreview = ({
   }, []);
   const { euiTheme } = useEuiTheme();
 
-  const { goToEntityInsightTab } = useNavigateEntityInsight({
-    field,
-    value,
-    queryIdExtension: 'MISCONFIGURATION_PREVIEW',
-    subTab: CspInsightLeftPanelSubTab.MISCONFIGURATIONS,
-  });
+  const goToEntityInsightTab = useCallback(() => {
+    openDetailsPanel({
+      tab: EntityDetailsLeftPanelTab.CSP_INSIGHTS,
+      subTab: CspInsightLeftPanelSubTab.MISCONFIGURATIONS,
+    });
+  }, [openDetailsPanel]);
+
   const link = useMemo(
     () =>
-      !isPreviewMode
+      isLinkEnabled
         ? {
             callback: goToEntityInsightTab,
             tooltip: (
@@ -122,7 +130,7 @@ export const MisconfigurationsPreview = ({
             ),
           }
         : undefined,
-    [isPreviewMode, goToEntityInsightTab]
+    [isLinkEnabled, goToEntityInsightTab]
   );
   return (
     <ExpandablePanel

diff --git a/...public/cloud_security_posture/components/vulnerabilities/vulnerabilities_preview.test.tsx b/...public/cloud_security_posture/components/vulnerabilities/vulnerabilities_preview.test.tsx
@@ -10,25 +10,19 @@ import { render } from '@testing-library/react';
 import { VulnerabilitiesPreview } from './vulnerabilities_preview';
 import { useMisconfigurationPreview } from '@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview';
 import { useVulnerabilitiesPreview } from '@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview';
-import { useRiskScore } from '../../../entity_analytics/api/hooks/use_risk_score';
-import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { TestProviders } from '../../../common/mock/test_providers';
 
 // Mock hooks
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview');
 jest.mock('@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview');
-jest.mock('../../../entity_analytics/api/hooks/use_risk_score');
-jest.mock('@kbn/expandable-flyout');
 
 describe('VulnerabilitiesPreview', () => {
   const mockOpenLeftPanel = jest.fn();
 
   beforeEach(() => {
-    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
     (useVulnerabilitiesPreview as jest.Mock).mockReturnValue({
       data: { count: { CRITICAL: 0, HIGH: 1, MEDIUM: 1, LOW: 0, UNKNOWN: 0 } },
     });
-    (useRiskScore as jest.Mock).mockReturnValue({ data: [{ host: { risk: 75 } }] });
     (useMisconfigurationPreview as jest.Mock).mockReturnValue({
       data: { count: { passed: 1, failed: 1 } },
     });
@@ -37,7 +31,12 @@ describe('VulnerabilitiesPreview', () => {
   it('renders', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <VulnerabilitiesPreview value="host1" field="host.name" />
+        <VulnerabilitiesPreview
+          value="host1"
+          field="host.name"
+          isLinkEnabled={true}
+          openDetailsPanel={mockOpenLeftPanel}
+        />
       </TestProviders>
     );