Fix sorting for epics, things were broken because of small refactoring

app/controllers/concerns/issuable_collections.rb

@@ -91,7 +91,7 @@ module IssuableCollections
     options = {
       scope: params[:scope],
       state: params[:state],
-      sort: set_sort_order_from_cookie || default_sort_order
+      sort: params[:sort] || set_sort_order_from_cookie || default_sort_order
     }
 
     # Used by view to highlight active option

ee/app/controllers/concerns/epics_actions.rb

@@ -13,14 +13,4 @@ module EpicsActions
   def default_sort_order
     sort_value_recently_created
   end
-
-  def update_cookie_value(value)
-    case value
-    when 'start_date_asc'  then sort_value_start_date
-    when 'end_date_asc'    then sort_value_end_date
-    when 'end_date_desc'   then sort_value_end_date_later
-    else
-      super(value)
-    end
-  end
 end

ee/app/controllers/groups/epics_controller.rb

@@ -9,6 +9,11 @@ class Groups::EpicsController < Groups::ApplicationController
 
   before_action :check_epics_available!
   before_action :epic, except: [:index, :create]
+
+  # This callback should be executed before the :set_issuables_index
+  # otherwise sorting will be ignored for epics.
+  before_action :set_epics_sorting, only: :index
+
   before_action :set_issuables_index, only: :index
   before_action :authorize_update_issuable!, only: :update
   before_action :authorize_create_epic!, only: [:create]
@@ -101,10 +106,4 @@ class Groups::EpicsController < Groups::ApplicationController
   def authorize_create_epic!
     return render_404 unless can?(current_user, :create_epic, group)
   end
-
-  def filter_params
-    set_epics_sorting
-
-    super.merge(start_date: params[:start_date], end_date: params[:end_date])
-  end
 end

ee/app/controllers/groups/roadmap_controller.rb

@@ -7,11 +7,10 @@ module Groups
     before_action :check_epics_available!
     before_action :group
     before_action :persist_roadmap_layout, only: [:show]
+    before_action :set_epics_sorting, only: :index
 
     def show
       # show roadmap for a group
-      set_epics_sorting
-
       @sort = params[:sort] || default_sort_order
       @epics_count = EpicsFinder.new(current_user, group_id: @group.id).execute.count
     end

ee/app/helpers/ee/sorting_helper.rb

@@ -14,6 +14,15 @@ module EE
       }.merge(super)
     end
 
+    def epics_sort_options_hash
+      {
+        sort_value_recently_created => sort_title_created_date,
+        sort_value_recently_updated => sort_title_recently_updated,
+        sort_value_start_date  => sort_title_start_date,
+        sort_value_end_date => sort_title_end_date
+      }
+    end
+
     def sort_title_start_date
       s_('SortOptions|Start date')
     end

ee/app/views/shared/epic/_sort_dropdown.html.haml

-- sorted_by = sort_options_hash[@sort]
+- sorted_by = epics_sort_options_hash[@sort]
 
 .dropdown.inline.prepend-left-10
   .btn-group
@@ -7,10 +7,14 @@
       = icon('chevron-down')
     %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
       %li
-        = sortable_item(sort_title_created_date,     page_filter_path(sort: sort_value_created_date,     label: true), sorted_by)
+        = sortable_item(sort_title_created_date, page_filter_path(sort: sort_value_recently_created, label: true), sorted_by)
         = sortable_item(sort_title_recently_updated, page_filter_path(sort: sort_value_recently_updated, label: true), sorted_by)
-        = sortable_item(sort_title_start_date,       page_filter_path(sort: sort_value_start_date, label: true), sorted_by)
-        = sortable_item(sort_title_end_date,         page_filter_path(sort: sort_value_end_date, label: true), sorted_by)
+        = sortable_item(sort_title_start_date, page_filter_path(sort: sort_value_start_date, label: true), sorted_by)
+        = sortable_item(sort_title_end_date, page_filter_path(sort: sort_value_end_date, label: true), sorted_by)
     %button.dropdown-toggle-split.pt-2{ type: 'button' }
       = sprite_icon('sort-highest', size: 16)
       -# = sprite_icon('sort-lowest', size: 16)
+      = sorted_by
+      = |
+      = @sort
+