From 59bd0f29b39919ae2bc33dad5dc74320c530f8e6 Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Tue, 2 Mar 2021 07:02:45 -0600
Subject: [PATCH] fixs

---
 .../column_headers/header/__snapshots__/index.test.tsx.snap   | 1 +
 .../timeline/body/column_headers/header/header_content.tsx    | 4 +++-
 .../search_strategy/timeline/factory/events/all/helpers.ts    | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
index bd0ae9024df5b..4cd2193f148a3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap
@@ -14,6 +14,7 @@ exports[`Header renders correctly against snapshot 1`] = `
     isLoading={false}
     isResizing={false}
     onClick={[Function]}
+    showSortingCapability={true}
     sort={
       Array [
         Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/header_content.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/header_content.tsx
index b28de9f2a1073..7e1e64f36002c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/header_content.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/header_content.tsx
@@ -22,6 +22,7 @@ interface HeaderContentProps {
   isLoading: boolean;
   isResizing: boolean;
   onClick: () => void;
+  showSortingCapability?: boolean;
   sort: Sort[];
 }
 
@@ -31,10 +32,11 @@ const HeaderContentComponent: React.FC<HeaderContentProps> = ({
   isLoading,
   isResizing,
   onClick,
+  showSortingCapability,
   sort,
 }) => (
   <EventsHeading data-test-subj={`header-${header.id}`} isLoading={isLoading}>
-    {header.aggregatable ? (
+    {header.aggregatable && showSortingCapability ? (
       <EventsHeadingTitleButton
         data-test-subj="header-sort-button"
         onClick={!isResizing && !isLoading ? onClick : noop}
diff --git a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/helpers.ts
index f049ccfc7b081..707f4ae13014a 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/timeline/factory/events/all/helpers.ts
@@ -14,7 +14,6 @@ import {
 import { toStringArray } from '../../../../helpers/to_array';
 import { getDataSafety, getDataFromFieldsHits } from '../details/helpers';
 
-
 export const formatTimelineData = async (
   dataFields: readonly string[],
   ecsFields: readonly string[],