Merge branch 'vij-cleanup-sort-views' into 'master'

Remove unused view and associated helper method

See merge request gitlab-org/gitlab!64621

app/helpers/sorting_helper.rb

@@ -168,19 +168,6 @@ module SortingHelper
     }
   end
 
-  def member_sort_options_hash
-    {
-      sort_value_access_level_asc  => sort_title_access_level_asc,
-      sort_value_access_level_desc => sort_title_access_level_desc,
-      sort_value_last_joined       => sort_title_last_joined,
-      sort_value_name              => sort_title_name_asc,
-      sort_value_name_desc         => sort_title_name_desc,
-      sort_value_oldest_joined     => sort_title_oldest_joined,
-      sort_value_oldest_signin     => sort_title_oldest_signin,
-      sort_value_recently_signin   => sort_title_recently_signin
-    }
-  end
-
   def sortable_item(item, path, sorted_by)
     link_to item, path, class: sorted_by == item ? 'is-active' : ''
   end

app/helpers/sorting_titles_values_helper.rb

@@ -2,14 +2,6 @@
 
 module SortingTitlesValuesHelper
   # Titles.
-  def sort_title_access_level_asc
-    s_('SortOptions|Access level, ascending')
-  end
-
-  def sort_title_access_level_desc
-    s_('SortOptions|Access level, descending')
-  end
-
   def sort_title_created_date
     s_('SortOptions|Created date')
   end
@@ -42,10 +34,6 @@ module SortingTitlesValuesHelper
     s_('SortOptions|Largest repository')
   end
 
-  def sort_title_last_joined
-    s_('SortOptions|Last joined')
-  end
-
   def sort_title_latest_activity
     s_('SortOptions|Last updated')
   end
@@ -82,10 +70,6 @@ module SortingTitlesValuesHelper
     s_('SortOptions|Oldest created')
   end
 
-  def sort_title_oldest_joined
-    s_('SortOptions|Oldest joined')
-  end
-
   def sort_title_oldest_signin
     s_('SortOptions|Oldest sign in')
   end
@@ -167,14 +151,6 @@ module SortingTitlesValuesHelper
   end
 
   # Values.
-  def sort_value_access_level_asc
-    'access_level_asc'
-  end
-
-  def sort_value_access_level_desc
-    'access_level_desc'
-  end
-
   def sort_value_created_date
     'created_date'
   end
@@ -207,10 +183,6 @@ module SortingTitlesValuesHelper
     'storage_size_desc'
   end
 
-  def sort_value_last_joined
-    'last_joined'
-  end
-
   def sort_value_latest_activity
     'latest_activity_desc'
   end
@@ -247,10 +219,6 @@ module SortingTitlesValuesHelper
     'oldest_sign_in'
   end
 
-  def sort_value_oldest_joined
-    'oldest_joined'
-  end
-
   def sort_value_oldest_updated
     'updated_asc'
   end

app/views/shared/members/_sort_dropdown.html.haml

-.dropdown.inline.qa-user-sort-dropdown{ data: { testid: 'user-sort-dropdown' } }
-  = dropdown_toggle(member_sort_options_hash[@sort], { toggle: 'dropdown', testid: 'dropdown-toggle' })
-  %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
-    %li.dropdown-header
-      = _("Sort by")
-    - member_sort_options_hash.each do |value, title|
-      %li
-        = link_to filter_group_project_member_path(sort: value), class: ("is-active" if @sort == value) do
-          = title
-    %li.divider
-    %li{ data: { testid: 'filter-members-with-inherited-permissions' } }
-      = link_to filter_group_project_member_path(with_inherited_permissions: nil), class: ("is-active" unless params[:with_inherited_permissions].present?) do
-        = _("Show all members")
-    %li{ data: { testid: 'filter-members-with-inherited-permissions' } }
-      = link_to filter_group_project_member_path(with_inherited_permissions: 'exclude'), class: ("is-active" if params[:with_inherited_permissions] == 'exclude') do
-        = _("Show only direct members")
-    %li{ data: { testid: 'filter-members-with-inherited-permissions' } }
-      = link_to filter_group_project_member_path(with_inherited_permissions: 'only'), class: ("is-active" if params[:with_inherited_permissions] == 'only') do
-        = _("Show only inherited members")

locale/gitlab.pot

@@ -29807,9 +29807,6 @@ msgstr ""
 msgid "Show all issues."
 msgstr ""
 
-msgid "Show all members"
-msgstr ""
-
 msgid "Show all test cases."
 msgstr ""
 
@@ -29870,12 +29867,6 @@ msgstr ""
 msgid "Show one file at a time"
 msgstr ""
 
-msgid "Show only direct members"
-msgstr ""
-
-msgid "Show only inherited members"
-msgstr ""
-
 msgid "Show parent pages"
 msgstr ""
 
@@ -30426,12 +30417,6 @@ msgstr ""
 msgid "Sort direction: Descending"
 msgstr ""
 
-msgid "SortOptions|Access level, ascending"
-msgstr ""
-
-msgid "SortOptions|Access level, descending"
-msgstr ""
-
 msgid "SortOptions|Blocking"
 msgstr ""
 
@@ -30465,9 +30450,6 @@ msgstr ""
 msgid "SortOptions|Last created"
 msgstr ""
 
-msgid "SortOptions|Last joined"
-msgstr ""
-
 msgid "SortOptions|Last updated"
 msgstr ""
 
@@ -30510,9 +30492,6 @@ msgstr ""
 msgid "SortOptions|Oldest created"
 msgstr ""
 
-msgid "SortOptions|Oldest joined"
-msgstr ""
-
 msgid "SortOptions|Oldest last activity"
 msgstr ""