From 80261bdf5c145eb61aaf825156fd085f80ee0b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <contact@patrykkopycinski.com>
Date: Sat, 10 Feb 2024 13:28:32 +0100
Subject: [PATCH] [SentinelOne] Fix Agent status on Timeline Alert details
 (#176210)

## Summary

Fixes https://github.com/elastic/kibana/issues/174235

<img width="1906" alt="Zrzut ekranu 2024-02-5 o 11 54 15"
src="https://github.com/elastic/kibana/assets/5188868/5f40dc64-c0fc-4fbf-b4b9-d8ee6e75c890">

<img width="1910" alt="Zrzut ekranu 2024-02-5 o 11 53 53"
src="https://github.com/elastic/kibana/assets/5188868/425efd0b-242e-4bb7-b034-13b34c1dde44">

Co-authored-by: Ash <1849116+ashokaditya@users.noreply.github.com>
---
 .../event_details/table/field_value_cell.tsx           |  1 +
 .../timeline/body/renderers/formatted_field.tsx        | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
index bd4a59414e1144b..37f4f4559b50bc6 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx
@@ -71,6 +71,7 @@ export const FieldValueCell = React.memo(
                     eventId={eventId}
                     fieldFormat={data.format}
                     fieldName={data.field}
+                    fieldFromBrowserField={fieldFromBrowserField}
                     fieldType={data.type}
                     isAggregatable={fieldFromBrowserField.aggregatable}
                     isDraggable={isDraggable}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index 040e6335eb8a118..944ee20034d0e5a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -13,6 +13,7 @@ import { isNumber, isEmpty } from 'lodash/fp';
 import React from 'react';
 import { css } from '@emotion/css';
 
+import type { BrowserField } from '../../../../../common/containers/source';
 import {
   ALERT_HOST_CRITICALITY,
   ALERT_USER_CRITICALITY,
@@ -70,6 +71,7 @@ const FormattedFieldValueComponent: React.FC<{
   isAggregatable?: boolean;
   isObjectArray?: boolean;
   fieldFormat?: string;
+  fieldFromBrowserField?: BrowserField;
   fieldName: string;
   fieldType?: string;
   isButton?: boolean;
@@ -89,6 +91,7 @@ const FormattedFieldValueComponent: React.FC<{
   isAggregatable = false,
   fieldName,
   fieldType = '',
+  fieldFromBrowserField,
   isButton,
   isObjectArray = false,
   isDraggable = true,
@@ -261,6 +264,11 @@ const FormattedFieldValueComponent: React.FC<{
         iconSide={isButton ? 'right' : undefined}
       />
     );
+  } else if (
+    fieldName === SENTINEL_ONE_AGENT_ID_FIELD ||
+    fieldFromBrowserField?.name === SENTINEL_ONE_AGENT_ID_FIELD
+  ) {
+    return <SentinelOneAgentStatus agentId={String(value ?? '')} />;
   } else if (fieldName === ALERT_HOST_CRITICALITY || fieldName === ALERT_USER_CRITICALITY) {
     return (
       <AssetCriticalityLevel
@@ -280,8 +288,6 @@ const FormattedFieldValueComponent: React.FC<{
         data-test-subj="endpointHostAgentStatus"
       />
     );
-  } else if (fieldName === SENTINEL_ONE_AGENT_ID_FIELD) {
-    return <SentinelOneAgentStatus agentId={String(value ?? '')} />;
   } else if (
     [
       RULE_REFERENCE_FIELD_NAME,