Change default workshop sort to created (instead of title) (#549)

* Change default workshop sort to created (instead of title)

* Fix test to expect created is the default sort

Author: maebeale

app/controllers/workshops_controller.rb

@@ -3,8 +3,9 @@
 class WorkshopsController < ApplicationController
 
   def index
-    search_service = WorkshopSearchService.new(params, super_user: current_user.super_user?).call
-    @sort = params[:sort] # search_service.default_sort
+    search_service = WorkshopSearchService.new(params,
+                                               super_user: current_user.super_user?).call
+    @sort = search_service.sort
 
     @workshops = search_service.workshops
                                .includes(:categories, :sectors, :windows_type, :user, :images, :bookmarks)

app/services/workshop_search_service.rb

@@ -19,7 +19,7 @@ def call
 
 	# Compute the effective sort
 	def default_sort
-		params[:sort].presence || 'title'
+		params[:sort].presence || "created"
 		# return params[:sort] if params[:sort].present?
 		# return 'keywords' if params[:query].present? # only when returning weighted results from # search_by_query
 		# 'title'
@@ -153,7 +153,7 @@ def order_by_params
 		when 'keywords'
 			# already ordered in filter_by_query
 		else
-			@workshops = @workshops.order(title: :asc)
+			@workshops = @workshops.order(created_at: :asc, title: :asc)
 		end
 	end
 

app/views/workshops/_sort_by_options.html.erb

@@ -1,15 +1,15 @@
 <div class="flex items-center gap-1">
   <label class="flex items-center gap-1 cursor-pointer">
     <%= radio_button_tag :sort, "created",
-                         @sort == "created" %>
+                         @sort == "created" || !params[:sort].present? %>
     <span class="text-sm">Newest</span>
   </label>
 </div>
 
 <div class="flex items-center gap-1">
   <label class="flex items-center gap-1 cursor-pointer">
     <%= radio_button_tag :sort, "title",
-                         @sort == "title" || !params[:sort].present? %>
+                         @sort == "title" %>
     <span class="text-sm">Title</span>
   </label>
 </div>

spec/services/workshop_search_service_spec.rb

@@ -73,9 +73,9 @@
 				expect(service.sort).to eq('keywords')
 			end
 
-			it "defaults to title if no query or sort is provided" do
+			it "defaults to created if no query or sort is provided" do
 				service = WorkshopSearchService.new({}).call
-				expect(service.sort).to eq('title')
+				expect(service.sort).to eq('created')
 			end
 		end
 	end