From e76c63fadf991a677e2abe20802c97874872dbfb Mon Sep 17 00:00:00 2001 From: "Visal .In" Date: Sat, 29 Jul 2023 09:02:29 +0700 Subject: [PATCH 1/2] feat: sort database by name in database selection --- src/renderer/components/DatabaseTable/DatabaseSelection.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/DatabaseTable/DatabaseSelection.tsx b/src/renderer/components/DatabaseTable/DatabaseSelection.tsx index 30db1df..46f11a4 100644 --- a/src/renderer/components/DatabaseTable/DatabaseSelection.tsx +++ b/src/renderer/components/DatabaseTable/DatabaseSelection.tsx @@ -21,7 +21,9 @@ function DatabaseSelectionModal({ const databaseList = useMemo(() => { if (schema) { - return Object.keys(schema); + const databaseListUnsort = Object.keys(schema); + databaseListUnsort.sort(); + return databaseListUnsort; } return []; }, [schema]); From 5c79bdd37da8db5be9152f8ebdf834e87b9196c8 Mon Sep 17 00:00:00 2001 From: "Visal .In" Date: Sat, 29 Jul 2023 09:12:19 +0700 Subject: [PATCH 2/2] fix: fixing the bug reported from Sonar --- src/renderer/components/DatabaseTable/DatabaseSelection.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/components/DatabaseTable/DatabaseSelection.tsx b/src/renderer/components/DatabaseTable/DatabaseSelection.tsx index 46f11a4..1ea38a9 100644 --- a/src/renderer/components/DatabaseTable/DatabaseSelection.tsx +++ b/src/renderer/components/DatabaseTable/DatabaseSelection.tsx @@ -22,7 +22,7 @@ function DatabaseSelectionModal({ const databaseList = useMemo(() => { if (schema) { const databaseListUnsort = Object.keys(schema); - databaseListUnsort.sort(); + databaseListUnsort.sort((a, b) => a.localeCompare(b)); return databaseListUnsort; } return [];