From b596430920a3d95ce270b14497de6e6ef918ab46 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Fri, 5 Jul 2024 13:53:47 +0200 Subject: [PATCH] Orders results of the GetAll remote clusters store method (#27548) --- server/channels/api4/remote_cluster_test.go | 2 -- server/channels/store/sqlstore/remote_cluster_store.go | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/channels/api4/remote_cluster_test.go b/server/channels/api4/remote_cluster_test.go index 8e25e67480..1bf89be6a2 100644 --- a/server/channels/api4/remote_cluster_test.go +++ b/server/channels/api4/remote_cluster_test.go @@ -14,8 +14,6 @@ import ( ) func TestGetRemoteClusters(t *testing.T) { - t.Skip("MM-59324") - t.Run("Should not work if the remote cluster service is not enabled", func(t *testing.T) { th := Setup(t) defer th.TearDown() diff --git a/server/channels/store/sqlstore/remote_cluster_store.go b/server/channels/store/sqlstore/remote_cluster_store.go index 913151bc2f..2994eeceff 100644 --- a/server/channels/store/sqlstore/remote_cluster_store.go +++ b/server/channels/store/sqlstore/remote_cluster_store.go @@ -172,7 +172,8 @@ func (s sqlRemoteClusterStore) GetAll(offset, limit int, filter model.RemoteClus query := s.getQueryBuilder(). Select(remoteClusterFields("rc")...). - From("RemoteClusters rc") + From("RemoteClusters rc"). + OrderBy("rc.DisplayName, rc.Name") if filter.InChannel != "" { query = query.Where("rc.RemoteId IN (SELECT scr.RemoteId FROM SharedChannelRemotes scr WHERE scr.ChannelId = ?)", filter.InChannel)