Fix small bugs and improve tests

machadoum · machadoum · commit 6bed3c025401 · 2024-01-02T17:51:55.000+01:00
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx
@@ -5,20 +5,38 @@
  * 2.0.
  */
 
-import { mockRiskScoreState } from '../../../flyout/entity_details/mocks';
+import {
+  mockHostRiskScoreState,
+  mockUserRiskScoreState,
+} from '../../../flyout/entity_details/mocks';
 import { render } from '@testing-library/react';
 import React from 'react';
 import { TestProviders } from '../../../common/mock';
 import { RiskSummary } from './risk_summary';
+import type {
+  LensAttributes,
+  VisualizationEmbeddableProps,
+} from '../../../common/components/visualization_actions/types';
 
-jest.mock('../../../common/components/visualization_actions/visualization_embeddable');
+const mockVisualizationEmbeddable = jest
+  .fn()
+  .mockReturnValue(<div data-test-subj="visualization-embeddable" />);
+
+jest.mock('../../../common/components/visualization_actions/visualization_embeddable', () => ({
+  VisualizationEmbeddable: (props: VisualizationEmbeddableProps) =>
+    mockVisualizationEmbeddable(props),
+}));
 
 describe('RiskSummary', () => {
+  beforeEach(() => {
+    mockVisualizationEmbeddable.mockClear();
+  });
+
   it('renders risk summary table', () => {
     const { getByTestId } = render(
       <TestProviders>
         <RiskSummary
-          riskScoreData={mockRiskScoreState}
+          riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
         />
@@ -34,7 +52,7 @@ describe('RiskSummary', () => {
     const { getByTestId } = render(
       <TestProviders>
         <RiskSummary
-          riskScoreData={{ ...mockRiskScoreState, data: undefined }}
+          riskScoreData={{ ...mockHostRiskScoreState, data: undefined }}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
         />
@@ -47,7 +65,7 @@ describe('RiskSummary', () => {
     const { getByTestId } = render(
       <TestProviders>
         <RiskSummary
-          riskScoreData={mockRiskScoreState}
+          riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
         />
@@ -61,7 +79,7 @@ describe('RiskSummary', () => {
     const { getByTestId } = render(
       <TestProviders>
         <RiskSummary
-          riskScoreData={mockRiskScoreState}
+          riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
         />
@@ -70,4 +88,52 @@ describe('RiskSummary', () => {
 
     expect(getByTestId('risk-summary-updatedAt')).toHaveTextContent('Updated Nov 8, 1989');
   });
+
+  it('builds lens attributes for host risk score', () => {
+    render(
+      <TestProviders>
+        <RiskSummary
+          riskScoreData={mockHostRiskScoreState}
+          queryId={'testQuery'}
+          openDetailsPanel={() => {}}
+        />
+      </TestProviders>
+    );
+
+    const lensAttributes: LensAttributes =
+      mockVisualizationEmbeddable.mock.calls[0][0].lensAttributes;
+    const datasourceLayers = Object.values(lensAttributes.state.datasourceStates.formBased.layers);
+    const firstColumn = Object.values(datasourceLayers[0].columns)[0];
+
+    expect(lensAttributes.state.query.query).toEqual('host.name: test');
+    expect(firstColumn).toEqual(
+      expect.objectContaining({
+        sourceField: 'host.risk.calculated_score_norm',
+      })
+    );
+  });
+
+  it('builds lens attributes for user risk score', () => {
+    render(
+      <TestProviders>
+        <RiskSummary
+          riskScoreData={mockUserRiskScoreState}
+          queryId={'testQuery'}
+          openDetailsPanel={() => {}}
+        />
+      </TestProviders>
+    );
+
+    const lensAttributes: LensAttributes =
+      mockVisualizationEmbeddable.mock.calls[0][0].lensAttributes;
+    const datasourceLayers = Object.values(lensAttributes.state.datasourceStates.formBased.layers);
+    const firstColumn = Object.values(datasourceLayers[0].columns)[0];
+
+    expect(lensAttributes.state.query.query).toEqual('user.name: test');
+    expect(firstColumn).toEqual(
+      expect.objectContaining({
+        sourceField: 'user.risk.calculated_score_norm',
+      })
+    );
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx
@@ -48,8 +48,10 @@ interface TableItem {
 const LENS_VISUALIZATION_HEIGHT = 126; //  Static height in pixels specified by design
 const LAST_30_DAYS = { from: 'now-30d', to: 'now' };
 
-function isUserRiskData(riskData: UserRiskScore | HostRiskScore): riskData is UserRiskScore {
-  return (riskData as UserRiskScore).user !== undefined;
+function isUserRiskData(
+  riskData: UserRiskScore | HostRiskScore | undefined
+): riskData is UserRiskScore {
+  return !!riskData && (riskData as UserRiskScore).user !== undefined;
 }
 
 const getEntityData = (riskData: UserRiskScore | HostRiskScore | undefined) => {
@@ -69,13 +71,16 @@ const RiskSummaryComponent = <T extends RiskScoreEntity>({
   const { euiTheme } = useEuiTheme();
 
   const lensAttributes = useMemo(() => {
+    const entityName = entityData?.name ?? '';
+    const fieldName = isUserRiskData(riskData) ? 'user.name' : 'host.name';
+
     return getRiskScoreSummaryAttributes({
       severity: entityData?.risk?.calculated_level,
-      query: `user.name: ${entityData?.name}`,
+      query: `${fieldName}: ${entityName}`,
       spaceId: 'default',
-      riskEntity: RiskScoreEntity.user,
+      riskEntity: isUserRiskData(riskData) ? RiskScoreEntity.user : RiskScoreEntity.host,
     });
-  }, [entityData]);
+  }, [entityData?.name, entityData?.risk?.calculated_level, riskData]);
 
   const columns: Array<EuiBasicTableColumn<TableItem>> = useMemo(
     () => [
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/mocks/index.ts b/x-pack/plugins/security_solution/public/flyout/entity_details/mocks/index.ts
@@ -98,21 +98,6 @@ export const mockHostRiskScoreState: RiskScoreState<RiskScoreEntity.host> = {
   loading: false,
 };
 
-export const mockRiskScoreState = {
-  data: [hostRiskScore],
-  inspect: {
-    dsl: [],
-    response: [],
-  },
-  isInspected: false,
-  refetch: () => {},
-  totalCount: 0,
-  isModuleEnabled: true,
-  isAuthorized: true,
-  isDeprecated: false,
-  loading: false,
-};
-
 const hostMetadata: HostMetadataInterface = {
   '@timestamp': 1036358673463478,
 
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/header.test.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/header.test.tsx
@@ -12,9 +12,9 @@ import { TestProviders } from '../../../common/mock';
 import {
   managedUserDetails,
   mockManagedUserData,
-  mockObservedUser,
 } from '../../../timelines/components/side_panel/new_user_detail/__mocks__';
 import { UserPanelHeader } from './header';
+import { mockObservedUser } from './mocks';
 
 const mockProps = {
   userName: 'test',
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
@@ -10,6 +10,7 @@ import { euiDarkVars as darkTheme, euiLightVars as lightTheme } from '@kbn/ui-th
 import { getOr } from 'lodash/fp';
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
+import { useRiskScore } from '../../../entity_analytics/api/hooks/use_risk_score';
 import type { HostItem } from '../../../../common/search_strategy';
 import { buildHostNamesFilter, RiskScoreEntity } from '../../../../common/search_strategy';
 import { DEFAULT_DARK_MODE } from '../../../../common/constants';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
@@ -18,7 +18,7 @@ import {
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { css } from '@emotion/css';
-import type { UserDetailsLeftPanelTab } from '../../../../flyout/entity_details/user_details_left/tabs';
+import type { EntityDetailsLeftPanelTab } from '../../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
 import { UserAssetTableType } from '../../../../explore/users/store/model';
 import type { ManagedUserFields } from '../../../../../common/search_strategy/security_solution/users/managed_details';
 import { ManagedUserDatasetKey } from '../../../../../common/search_strategy/security_solution/users/managed_details';
@@ -47,7 +47,7 @@ export const ManagedUser = ({
   managedUser: ManagedUserData;
   contextID: string;
   isDraggable: boolean;
-  openDetailsPanel: (tab: UserDetailsLeftPanelTab) => void;
+  openDetailsPanel: (tab: EntityDetailsLeftPanelTab) => void;
 }) => {
   const entraManagedUser = managedUser.data?.[ManagedUserDatasetKey.ENTRA];
   const oktaManagedUser = managedUser.data?.[ManagedUserDatasetKey.OKTA];
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user_accordion.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user_accordion.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import { css } from '@emotion/react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { get } from 'lodash/fp';
-import { UserDetailsLeftPanelTab } from '../../../../flyout/entity_details/user_details_left/tabs';
+import { EntityDetailsLeftPanelTab } from '../../../../flyout/entity_details/shared/components/left_panel/left_panel_header';
 import { ExpandablePanel } from '../../../../flyout/shared/components/expandable_panel';
 import type { ManagedUserFields } from '../../../../../common/search_strategy/security_solution/users/managed_details';
 
@@ -23,7 +23,7 @@ interface ManagedUserAccordionProps {
   title: string;
   managedUser: ManagedUserFields;
   tableType: UserAssetTableType;
-  openDetailsPanel: (tab: UserDetailsLeftPanelTab) => void;
+  openDetailsPanel: (tab: EntityDetailsLeftPanelTab) => void;
 }
 
 export const ManagedUserAccordion: React.FC<ManagedUserAccordionProps> = ({
@@ -66,8 +66,8 @@ export const ManagedUserAccordion: React.FC<ManagedUserAccordionProps> = ({
           callback: () =>
             openDetailsPanel(
               tableType === UserAssetTableType.assetOkta
-                ? UserDetailsLeftPanelTab.OKTA
-                : UserDetailsLeftPanelTab.ENTRA
+                ? EntityDetailsLeftPanelTab.OKTA
+                : EntityDetailsLeftPanelTab.ENTRA
             ),
           tooltip: (
             <FormattedMessage
