From 827b25920edc6d7ea30c1d3ff37696335bef3b1d Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 28 Jun 2024 14:53:51 -0400
Subject: [PATCH] Fleet UI: Reinstate sort policies by passing count (#20064)

---
 changes/20056-sort-policy-bug                      |  1 +
 .../PassingColumnHeader/PassingColumnHeader.tsx    |  9 ++++++++-
 .../PoliciesTable/PoliciesTableConfig.tsx          | 14 +++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 changes/20056-sort-policy-bug

diff --git a/changes/20056-sort-policy-bug b/changes/20056-sort-policy-bug
new file mode 100644
index 0000000000..232756fbc3
--- /dev/null
+++ b/changes/20056-sort-policy-bug
@@ -0,0 +1 @@
+* UI: Reinstate ability to sort policies by passing count
\ No newline at end of file
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PassingColumnHeader/PassingColumnHeader.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PassingColumnHeader/PassingColumnHeader.tsx
index a506473905..c3910fd4c0 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/PassingColumnHeader/PassingColumnHeader.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/PassingColumnHeader/PassingColumnHeader.tsx
@@ -22,7 +22,14 @@ const PassingColumnHeader = ({
   return (
     <div className={baseClass}>
       <Icon name={iconName} />
-      <TooltipWrapper tipContent={<>{updateText} Counts are updated hourly.</>}>
+      <TooltipWrapper
+        tipContent={
+          <>
+            {updateText}
+            <br /> Counts are updated hourly.
+          </>
+        }
+      >
         <span className="status-header-text">{columnText}</span>
       </TooltipWrapper>
     </div>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx
index f9a6d9c9bb..cf7afa1b1a 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTableConfig.tsx
@@ -167,13 +167,17 @@ const generateTableHeaders = (
     },
     {
       title: "Yes",
-      Header: () => (
-        <PassingColumnHeader
-          isPassing
-          timeSinceHostCountUpdate={timeSinceHostCountUpdate}
+      Header: (cellProps) => (
+        <HeaderCell
+          value={
+            <PassingColumnHeader
+              isPassing
+              timeSinceHostCountUpdate={timeSinceHostCountUpdate}
+            />
+          }
+          isSortedDesc={cellProps.column.isSortedDesc}
         />
       ),
-      disableSortBy: true,
       accessor: "passing_host_count",
       Cell: (cellProps: ICellProps): JSX.Element => {
         if (cellProps.row.original.has_run) {