preserving sorting on problems index errbit#1067

Commit is a squash merge to master from mfrederickson:fix-1052-sorting
since. The source branch became stale and required a conflict
resolution. Thanks to @mfrederickson for the contribution.

Author: stevecrozz

app/helpers/sort_helper.rb

@@ -5,6 +5,7 @@ def link_for_sort(name, field = nil)
     current = (params_sort == field)
     order   = (current && (params_order == "asc")) ? "desc" : "asc"
     url     = request.path + "?sort=#{field}&order=#{order}"
+    url    += "&all_errs=true" if all_errs
     options = {}
     options.merge!(class: "current #{order}") if current
     link_to(name, url, options)

app/views/apps/show.html.haml

@@ -13,9 +13,9 @@
   - if current_user.admin?
     = link_to t('.edit'), edit_app_path(app), :class => 'button'
   - if all_errs
-    = link_to t('.unresolved_errs'), app_path(app), :class => 'button'
+    = link_to t('.unresolved_errs'), app_path(app, sort: params_sort, order: params_order), :class => 'button'
   - else
-    = link_to t('.all_errs'), app_path(app, :all_errs => true), :class => 'button'
+    = link_to t('.all_errs'), app_path(app, all_errs: true, sort: params_sort, order: params_order), :class => 'button'
 
   - if app.watched_by?(current_user)
     = link_to t('.unwatch'), app_watcher_path(app_id: app, id: current_user.id), method: :delete, class: 'button'

app/views/problems/_search.html.haml

@@ -1,2 +1,2 @@
-= form_tag search_problems_path(:all_errs => all_errs, :app_id => app_id), :method => :get, :remote => true do
+= form_tag search_problems_path(:all_errs => all_errs, :app_id => app_id, :sort => params_sort, :order => params_order), :method => :get, :remote => true do
     = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')

app/views/problems/index.html.haml

@@ -4,9 +4,9 @@
 
 - content_for :action_bar do
   - if all_errs
-    = link_to t('.hide_resolved'), problems_path, :class => 'button'
+    = link_to t('.hide_resolved'), problems_path(sort: params_sort, order: params_order), :class => 'button'
   - else
-    = link_to t('.show_resolved'), problems_path(:all_errs => true), :class => 'button'
+    = link_to t('.show_resolved'), problems_path(all_errs: true, sort: params_sort, order: params_order), :class => 'button'
 
 %section
   = render 'problems/search', :all_errs => all_errs, :app_id => nil

spec/views/apps/show.html.haml_spec.rb

@@ -9,6 +9,8 @@
   before do
     allow(view).to receive(:app).and_return(app)
     allow(view).to receive(:all_errs).and_return(false)
+    allow(view).to receive(:params_order).and_return('asc')
+    allow(view).to receive(:params_sort).and_return('latest_notice_at')
     allow(controller).to receive(:current_user).and_return(user)
   end
 

spec/views/problems/index.html.haml_spec.rb

@@ -8,7 +8,8 @@
     allow(view).to receive(:problems).and_return(
       Kaminari.paginate_array([problem_1, problem_2]).page(1).per(10)
     )
-    allow(view).to receive(:params_sort).and_return('asc')
+    allow(view).to receive(:params_sort).and_return('last_notice_at')
+    allow(view).to receive(:params_order).and_return('asc')
     allow(controller).to receive(:current_user).and_return(Fabricate(:user))
   end