From a62db1e24b8842808a2504d4866701378583852f Mon Sep 17 00:00:00 2001
From: Tania <10127682+undef1nd@users.noreply.github.com>
Date: Fri, 29 Dec 2023 11:35:15 +0100
Subject: [PATCH] Nested Folders: Move SharedWithMe to the top of the folders
 list (#79875)

---
 pkg/services/folder/folderimpl/folder.go  | 2 +-
 pkg/tests/api/folders/api_folders_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/services/folder/folderimpl/folder.go b/pkg/services/folder/folderimpl/folder.go
index 7d2a776b8bb..5ac459669d9 100644
--- a/pkg/services/folder/folderimpl/folder.go
+++ b/pkg/services/folder/folderimpl/folder.go
@@ -263,7 +263,7 @@ func (s *Service) getRootFolders(ctx context.Context, q *folder.GetChildrenQuery
 
 	// add "shared with me" folder on the 1st page
 	if (q.Page == 0 || q.Page == 1) && len(q.FolderUIDs) != 0 {
-		children = append(children, &folder.SharedWithMeFolder)
+		children = append([]*folder.Folder{&folder.SharedWithMeFolder}, children...)
 	}
 
 	return children, nil
diff --git a/pkg/tests/api/folders/api_folders_test.go b/pkg/tests/api/folders/api_folders_test.go
index f58c08338cd..fa934a996c1 100644
--- a/pkg/tests/api/folders/api_folders_test.go
+++ b/pkg/tests/api/folders/api_folders_test.go
@@ -128,7 +128,7 @@ func TestGetFolders(t *testing.T) {
 		for i := range res.Payload {
 			actualFolders = append(actualFolders, res.Payload[i].UID)
 		}
-		assert.Equal(t, []string{"folder-0", "folder-1", "folder-2", "folder-3", "folder-4", folder.SharedWithMeFolderUID}, actualFolders)
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1", "folder-2", "folder-3", "folder-4"}, actualFolders)
 	})
 
 	t.Run("Pagination works as expect for editor", func(t *testing.T) {
@@ -140,7 +140,7 @@ func TestGetFolders(t *testing.T) {
 		for i := range res.Payload {
 			actualFolders = append(actualFolders, res.Payload[i].UID)
 		}
-		assert.Equal(t, []string{"folder-0", "folder-1", folder.SharedWithMeFolderUID}, actualFolders)
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1"}, actualFolders)
 
 		page = int64(2)
 		res, err = editorClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))
@@ -168,7 +168,7 @@ func TestGetFolders(t *testing.T) {
 		for i := range res.Payload {
 			actualFolders = append(actualFolders, res.Payload[i].UID)
 		}
-		assert.Equal(t, []string{"folder-0", "folder-1", "folder-2", "folder-4", folder.SharedWithMeFolderUID}, actualFolders)
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1", "folder-2", "folder-4"}, actualFolders)
 	})
 
 	t.Run("Pagination works as expect for viewer", func(t *testing.T) {
@@ -180,7 +180,7 @@ func TestGetFolders(t *testing.T) {
 		for i := range res.Payload {
 			actualFolders = append(actualFolders, res.Payload[i].UID)
 		}
-		assert.Equal(t, []string{"folder-0", "folder-1", folder.SharedWithMeFolderUID}, actualFolders)
+		assert.Equal(t, []string{folder.SharedWithMeFolderUID, "folder-0", "folder-1"}, actualFolders)
 
 		page = int64(2)
 		res, err = viewerClient.Folders.GetFolders(folders.NewGetFoldersParams().WithLimit(&limit).WithPage(&page))