Flattened message display

Author: dutow

app/controllers/topics_controller.rb

@@ -23,14 +23,9 @@ def index
   def show
     messages_scope = @topic.messages.includes(:sender, reply_to: :sender)
 
-    @view_mode = params[:view].in?(%w[flat threaded]) ? params[:view] : 'threaded'
-    @sort_order = params[:sort].to_s == 'desc' ? :desc : :asc
-
-    @messages = if @view_mode == 'flat'
-                  messages_scope.order(created_at: @sort_order)
-                else
-                  messages_scope.order(:created_at)
-                end
+    @view_mode = 'flat'
+    @sort_order = :asc
+    @messages = messages_scope.order(created_at: @sort_order)
     @message_numbers = @messages.each_with_index.to_h { |msg, idx| [msg.id, idx + 1] }
     preload_read_state!
     auto_mark_aware!

app/views/topics/show.html.slim

@@ -99,14 +99,6 @@
   .thread-notes-container
     = render "notes/note_stack", topic: @topic, message: nil, notes: thread_notes
 
-.view-toggle-bar
-  .view-toggle-group
-    = link_to "Threaded", topic_path(@topic, view: "threaded"), class: ["toggle-btn", ("active" if @view_mode == "threaded")].compact.join(" ")
-    = link_to "Flat", topic_path(@topic, view: "flat"), class: ["toggle-btn", ("active" if @view_mode == "flat")].compact.join(" ")
-  .view-toggle-group
-    = link_to "Oldest First", topic_path(@topic, view: @view_mode, sort: "asc"), class: ["toggle-btn", ("active" if @sort_order == :asc)].compact.join(" ")
-    = link_to "Newest First", topic_path(@topic, view: @view_mode, sort: "desc"), class: ["toggle-btn", ("active" if @sort_order == :desc)].compact.join(" ")
-
 .messages-container class=(["messages-container", @view_mode, (@sort_order == :desc ? "desc" : "asc")].compact.join(" "))
   - if user_signed_in?
     .thread-actions data-controller="thread-actions" data-thread-actions-topic-id-value=@topic.id data-thread-actions-read-all-url-value=read_all_topic_path(@topic, format: :json)