Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 42 insertions, 1 deletions

diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index ed1b35338ae..de6990041a6 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -238,7 +238,7 @@ module SortingHelper
     end
 
     link_to(url, type: 'button', class: link_class, title: s_('SortOptions|Sort direction')) do
-      sprite_icon(icon, size: 16)
+      sprite_icon(icon)
     end
   end
 
@@ -581,6 +581,47 @@ module SortingHelper
   def sort_value_expire_date
     'expired_asc'
   end
+
+  def packages_sort_options_hash
+    {
+      sort_value_recently_created  => sort_title_created_date,
+      sort_value_oldest_created    => sort_title_created_date,
+      sort_value_name              => sort_title_name,
+      sort_value_name_desc         => sort_title_name,
+      sort_value_version_desc      => sort_title_version,
+      sort_value_version_asc       => sort_title_version,
+      sort_value_type_desc         => sort_title_type,
+      sort_value_type_asc          => sort_title_type,
+      sort_value_project_name_desc => sort_title_project_name,
+      sort_value_project_name_asc  => sort_title_project_name
+    }
+  end
+
+  def packages_reverse_sort_order_hash
+    {
+      sort_value_recently_created  => sort_value_oldest_created,
+      sort_value_oldest_created    => sort_value_recently_created,
+      sort_value_name              => sort_value_name_desc,
+      sort_value_name_desc         => sort_value_name,
+      sort_value_version_desc      => sort_value_version_asc,
+      sort_value_version_asc       => sort_value_version_desc,
+      sort_value_type_desc         => sort_value_type_asc,
+      sort_value_type_asc          => sort_value_type_desc,
+      sort_value_project_name_desc => sort_value_project_name_asc,
+      sort_value_project_name_asc  => sort_value_project_name_desc
+    }
+  end
+
+  def packages_sort_option_title(sort_value)
+    packages_sort_options_hash[sort_value] || sort_title_created_date
+  end
+
+  def packages_sort_direction_button(sort_value)
+    reverse_sort = packages_reverse_sort_order_hash[sort_value]
+    url = package_sort_path(sort: reverse_sort)
+
+    sort_direction_button(url, reverse_sort, sort_value)
+  end
 end
 
 SortingHelper.prepend_if_ee('::EE::SortingHelper')