From 365164c34bb9a2bb05eb932843f24d405f514c0d Mon Sep 17 00:00:00 2001
From: AlexisSouquiere <alexis.souquiere@gmail.com>
Date: Tue, 27 Jun 2023 16:56:10 +0200
Subject: [PATCH] Fix inconsistency in default selected cluster

---
 client/src/utils/Routes.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/utils/Routes.js b/client/src/utils/Routes.js
index d13f7db8c..f189a050e 100644
--- a/client/src/utils/Routes.js
+++ b/client/src/utils/Routes.js
@@ -31,6 +31,7 @@ import Root from '../components/Root';
 import KsqlDBList from '../containers/KsqlDB/KsqlDBList/KsqlDBList';
 import KsqlDBStatement from '../containers/KsqlDB/KsqlDBStatement';
 import KsqlDBQuery from '../containers/KsqlDB/KsqlDBQuery';
+import sortBy from 'lodash/sortBy';
 
 class Routes extends Root {
   state = {
@@ -50,9 +51,10 @@ class Routes extends Root {
     const { clusterId } = this.state;
     try {
       const resClusters = await this.getApi(uriClusters());
+      let sortedClusters = sortBy(resClusters.data || [], cluster => cluster.id);
       this.setState({
-        clusters: resClusters.data,
-        clusterId: resClusters.data ? resClusters.data[0].id : '',
+        clusters: sortedClusters,
+        clusterId: sortedClusters ? sortedClusters[0].id : '',
         loading: false
       });
     } catch (err) {