Add new sort option "most_stars" to "Group > Children" pages

4 files changed, 36 insertions, 5 deletions

diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 53bd43d4861..8ed2a2ec9f4 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -48,15 +48,21 @@ module SortingHelper
 
   def groups_sort_options_hash
     {
-      sort_value_name => sort_title_name,
-      sort_value_name_desc => sort_title_name_desc,
+      sort_value_name             => sort_title_name,
+      sort_value_name_desc        => sort_title_name_desc,
       sort_value_recently_created => sort_title_recently_created,
-      sort_value_oldest_created => sort_title_oldest_created,
+      sort_value_oldest_created   => sort_title_oldest_created,
       sort_value_recently_updated => sort_title_recently_updated,
-      sort_value_oldest_updated => sort_title_oldest_updated
+      sort_value_oldest_updated   => sort_title_oldest_updated
     }
   end
 
+  def subgroups_sort_options_hash
+    groups_sort_options_hash.merge(
+      sort_value_most_stars => sort_title_most_stars
+    )
+  end
+
   def admin_groups_sort_options_hash
     groups_sort_options_hash.merge(
       sort_value_largest_group => sort_title_largest_group
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 6a293daaf95..cc294f6a931 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -53,7 +53,7 @@
             = _("Archived projects")
 
     .nav-controls
-      = render "shared/groups/dropdown"
+      = render "shared/groups/dropdown", options_hash: subgroups_sort_options_hash
 
   .tab-content
     #subgroups_and_projects.tab-pane
diff --git a/changelogs/unreleased/48684-sort-projects-by-stars-in-groups.yml b/changelogs/unreleased/48684-sort-projects-by-stars-in-groups.yml
new file mode 100644
index 00000000000..01681adab24
--- /dev/null
+++ b/changelogs/unreleased/48684-sort-projects-by-stars-in-groups.yml
@@ -0,0 +1,4 @@
+---
+title: Add new sort option "most_stars" to "Group > Children" pages
+merge_request: 22121
+author: Rene Hennig
diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index ac961e98a61..4e6f73ef58a 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -101,4 +101,25 @@ describe 'Group show page' do
       expect(page).to have_emoji('smile')
     end
   end
+
+  context 'where group has projects' do
+    let(:user) { create(:user) }
+
+    before do
+      group.add_owner(user)
+      sign_in(user)
+    end
+
+    it 'allows users to sorts projects by most stars', :js do
+      project1 = create(:project, namespace: group, star_count: 2)
+      project2 = create(:project, namespace: group, star_count: 3)
+      project3 = create(:project, namespace: group, star_count: 0)
+
+      visit group_path(group, sort: :stars_desc)
+
+      expect(find('.group-row:nth-child(1) .namespace-title > a')).to have_content(project2.title)
+      expect(find('.group-row:nth-child(2) .namespace-title > a')).to have_content(project1.title)
+      expect(find('.group-row:nth-child(3) .namespace-title > a')).to have_content(project3.title)
+    end
+  end
 end