Merge pull request #1550 from codidact/cellio/894-sort-by-activity

ArtOfCode- · web-flow · commit 87c06d1a2407 · 2025-03-06T02:12:21.000Z
add activity sort to search results, match order with category sorts
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
@@ -22,10 +22,12 @@ def search_posts
 
     posts = if search_string.present?
               posts.search(search_data[:search]).user_sort({ term: params[:sort], default: :search_score },
-                                                           relevance: :search_score, score: :score, age: :created_at)
+                                                           relevance: :search_score,
+                                                           score: :score, age: :created_at,
+                                                           activity: :updated_at)
             else
               posts.user_sort({ term: params[:sort], default: :score },
-                              score: :score, age: :created_at)
+                              score: :score, age: :created_at, activity: :updated_at)
             end
 
     [posts, qualifiers]
diff --git a/app/views/search/search.html.erb b/app/views/search/search.html.erb
@@ -14,10 +14,12 @@
     <div class="button-list is-gutterless has-margin-2">
       <%= link_to 'Relevance', request.params.merge(sort: 'relevance'), class: "button is-outlined is-muted #{params[:sort] == 'relevance' || params[:sort].nil? ? 'is-active' : ''}",
                   role: 'button', 'aria-label': 'Sort by relevance' %>
-      <%= link_to 'Score', request.params.merge(sort: 'score'), class: "button is-outlined is-muted #{params[:sort] == 'score' ? 'is-active' : ''}",
-                  role: 'button', 'aria-label': 'Sort by score' %>
+      <%= link_to 'Activity', request.params.merge(sort: 'activity'), class: "button is-outlined is-muted #{params[:sort] == 'activity' ? 'is-active' : ''}",
+                  role: 'button', 'aria-label': 'Sort by activity' %>
       <%= link_to 'Age', request.params.merge(sort: 'age'), class: "button is-outlined is-muted #{params[:sort] == 'age' ? 'is-active' : ''}",
                   role: 'button', 'aria-label': 'Sort by age' %>
+      <%= link_to 'Score', request.params.merge(sort: 'score'), class: "button is-outlined is-muted #{params[:sort] == 'score' ? 'is-active' : ''}",
+                  role: 'button', 'aria-label': 'Sort by score' %>
     </div>
   </div>
 
