From d73fbad635a036ade87c2da6706ae28d9cdcdc50 Mon Sep 17 00:00:00 2001
From: Mansi Shinde <shinde.mansi55@gmail.com>
Date: Mon, 11 Dec 2023 15:24:27 -0500
Subject: [PATCH] sort by managed policy feature

Signed-off-by: Mansi Shinde <shinde.mansi55@gmail.com>
---
 .../BackingIndices/BackingIndices.tsx         |  2 +-
 .../__snapshots__/Indices.test.tsx.snap       | 20 ++++++++----
 public/pages/Indices/utils/constants.tsx      |  2 +-
 server/services/IndexService.ts               | 32 +++++++++++++++----
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/public/pages/CreateDataStream/containers/BackingIndices/BackingIndices.tsx b/public/pages/CreateDataStream/containers/BackingIndices/BackingIndices.tsx
index b7f327a83..9f941c933 100644
--- a/public/pages/CreateDataStream/containers/BackingIndices/BackingIndices.tsx
+++ b/public/pages/CreateDataStream/containers/BackingIndices/BackingIndices.tsx
@@ -103,7 +103,7 @@ export default function BackingIndices(props: SubDetailProps) {
           {
             field: "managed",
             name: "Managed by policy",
-            sortable: false,
+            sortable: true,
             truncateText: true,
             textOnly: true,
             render: renderNumber,
diff --git a/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap b/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
index 6eba9f596..191b4b655 100644
--- a/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
+++ b/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
@@ -349,21 +349,29 @@ exports[`<Indices /> spec renders the component 1`] = `
                 </button>
               </th>
               <th
+                aria-live="polite"
+                aria-sort="none"
                 class="euiTableHeaderCell"
                 data-test-subj="tableHeaderCell_managed_2"
                 role="columnheader"
                 scope="col"
               >
-                <span
-                  class="euiTableCellContent"
+                <button
+                  class="euiTableHeaderButton"
+                  data-test-subj="tableHeaderSortButton"
+                  type="button"
                 >
                   <span
-                    class="euiTableCellContent__text"
-                    title="Managed by policy"
+                    class="euiTableCellContent"
                   >
-                    Managed by policy
+                    <span
+                      class="euiTableCellContent__text"
+                      title="Managed by policy"
+                    >
+                      Managed by policy
+                    </span>
                   </span>
-                </span>
+                </button>
               </th>
               <th
                 aria-live="polite"
diff --git a/public/pages/Indices/utils/constants.tsx b/public/pages/Indices/utils/constants.tsx
index a529f712a..452f90d02 100644
--- a/public/pages/Indices/utils/constants.tsx
+++ b/public/pages/Indices/utils/constants.tsx
@@ -78,7 +78,7 @@ const getColumns = (props: IColumnOptions): EuiTableFieldDataColumnType<ManagedC
     {
       field: "managed",
       name: "Managed by policy",
-      sortable: false,
+      sortable: true,
       truncateText: true,
       textOnly: true,
       render: renderNumber,
diff --git a/server/services/IndexService.ts b/server/services/IndexService.ts
index ddae5a9d0..7c3b923a7 100644
--- a/server/services/IndexService.ts
+++ b/server/services/IndexService.ts
@@ -66,14 +66,18 @@ export default class IndexService {
       const params: {
         index: string;
         format: string;
-        s: string;
+        s?: string;
         expand_wildcards?: string;
       } = {
         index: getSearchString(terms, indices, dataStreams),
         format: "json",
-        s: `${sortField}:${sortDirection}`,
+        //         s: `${sortField}:${sortDirection}`,
       };
 
+      if (sortField !== "managed" && sortField !== "data_stream") {
+        params.s = `${sortField}:${sortDirection}`;
+      }
+
       if (expandWildcards) {
         params.expand_wildcards = expandWildcards;
       }
@@ -175,11 +179,25 @@ export default class IndexService {
         body: {
           ok: true,
           response: {
-            indices: paginatedIndices.map((catIndex: CatIndex) => ({
-              ...catIndex,
-              managed: managedStatus[catIndex.index] ? "Yes" : "No",
-              managedPolicy: managedStatus[catIndex.index],
-            })),
+            indices: paginatedIndices
+              .map((catIndex: CatIndex) => ({
+                ...catIndex,
+                managed: managedStatus[catIndex.index] ? "Yes" : "No",
+                managedPolicy: managedStatus[catIndex.index],
+              }))
+              .sort((a, b) => {
+                let flag;
+                const aManaged = a.managed as string;
+                const bManaged = b.managed as string;
+
+                if (sortDirection === "asc") {
+                  flag = aManaged < bManaged;
+                } else {
+                  flag = aManaged > bManaged;
+                }
+
+                return flag ? -1 : 1;
+              }),
             totalIndices: filteredIndices.length,
           },
         },