From 98fa63eb41b713f5bccea085225f9c6e1699bc40 Mon Sep 17 00:00:00 2001
From: Manideep Pabba <109986843+mpabba3003@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:37:59 -0500
Subject: [PATCH] reafctor based on PR 2334 comments to merge to main (#2375)

Signed-off-by: mpabba3003 <amazonmanideep@gmail.com>

Signed-off-by: mpabba3003 <amazonmanideep@gmail.com>
Signed-off-by: Kristen Tian <tyarong@amazon.com>
---
 src/plugins/data_source_management/README.md  |  2 +-
 .../data_source_table/data_source_table.tsx   |  4 +--
 .../public/components/utils.test.ts           |  1 -
 .../public/components/utils.ts                | 32 +++++++------------
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/plugins/data_source_management/README.md b/src/plugins/data_source_management/README.md
index fe1cc9875b09..6d8556a1f325 100755
--- a/src/plugins/data_source_management/README.md
+++ b/src/plugins/data_source_management/README.md
@@ -1,6 +1,6 @@
 # dataSourceManagement
 
-A OpenSearch Dashboards plugin
+An OpenSearch Dashboards plugin
 
 ---
 
diff --git a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
index f1a496d27a35..97551c62ee36 100644
--- a/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_table/data_source_table.tsx
@@ -162,7 +162,7 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
         </>
       ),
       dataType: 'string' as const,
-      sortable: ({ sort }: { sort: string }) => sort,
+      sortable: ({ title }: { title: string }) => title,
     },
     {
       field: 'description',
@@ -172,7 +172,7 @@ export const DataSourceTable = ({ history }: RouteComponentProps) => {
         show: false,
       },
       dataType: 'string' as const,
-      sortable: ({ sort }: { sort: string }) => sort,
+      sortable: ({ description }: { description: string }) => description,
     },
   ];
 
diff --git a/src/plugins/data_source_management/public/components/utils.test.ts b/src/plugins/data_source_management/public/components/utils.test.ts
index cc8665e78c35..e5ae44dd6973 100644
--- a/src/plugins/data_source_management/public/components/utils.test.ts
+++ b/src/plugins/data_source_management/public/components/utils.test.ts
@@ -32,7 +32,6 @@ describe('DataSourceManagement: Utils.ts', () => {
       mockResponseForSavedObjectsCalls(savedObjects.client, 'find', getDataSourcesResponse);
       const fetchDataSources = await getDataSources(savedObjects.client);
       expect(fetchDataSources.length).toBe(getDataSourcesResponse.savedObjects.length);
-      expect(fetchDataSources[0].title).toBe('alpha-test');
     });
     test('Success but no data sources found: getting data sources', async () => {
       mockResponseForSavedObjectsCalls(savedObjects.client, 'find', {});
diff --git a/src/plugins/data_source_management/public/components/utils.ts b/src/plugins/data_source_management/public/components/utils.ts
index bec308e8c03e..e12cb38f8dd2 100644
--- a/src/plugins/data_source_management/public/components/utils.ts
+++ b/src/plugins/data_source_management/public/components/utils.ts
@@ -15,28 +15,18 @@ export async function getDataSources(savedObjectsClient: SavedObjectsClientContr
     })
     .then(
       (response) =>
-        response?.savedObjects
-          ?.map((source) => {
-            const id = source.id;
-            const title = source.get('title');
-            const description = source.get('description');
+        response?.savedObjects?.map((source) => {
+          const id = source.id;
+          const title = source.get('title');
+          const description = source.get('description');
 
-            return {
-              id,
-              title,
-              description,
-              sort: `${title}`,
-            };
-          })
-          .sort((a, b) => {
-            if (a.sort < b.sort) {
-              return -1;
-            } else if (a.sort > b.sort) {
-              return 1;
-            } else {
-              return 0;
-            }
-          }) || []
+          return {
+            id,
+            title,
+            description,
+            sort: `${title}`,
+          };
+        }) || []
     );
 }