Revert "Add basic text search of conversations (#576)"

This reverts commit da4b146.

app/controllers/conversations_controller.rb

@@ -1,12 +1,8 @@
 class ConversationsController < ApplicationController
   before_action :set_conversation, only: [:show, :edit, :update, :destroy]
+  before_action :set_nav_conversations
   before_action :set_nav_assistants
 
-  def index
-    @query = params[:query]
-    @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user, @query)
-  end
-
   def show
   end
 
@@ -32,6 +28,10 @@ def destroy
 
   private
 
+  def set_nav_conversations
+    @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user)
+  end
+
   def set_nav_assistants
     @nav_assistants = Current.user.assistants.ordered
   end

app/controllers/messages_controller.rb

@@ -6,6 +6,7 @@ class MessagesController < ApplicationController
   before_action :set_conversation,          only: [:index]
   before_action :set_assistant,             only: [:index, :new, :edit, :create]
   before_action :set_message,               only: [:show, :edit, :update]
+  before_action :set_nav_conversations,     only: [:index, :new]
   before_action :set_nav_assistants,        only: [:index, :new]
   before_action :set_conversation_starters, only: [:new]
 
@@ -45,6 +46,7 @@ def create
       redirect_to conversation_messages_path(@message.conversation, version: @message.version), status: :see_other
     else
       # what's the right flow for a failed message create? it's not this, but hacking it so tests pass until we have a plan
+      set_nav_conversations
       set_nav_assistants
       @new_message = @assistant.messages.new
 
@@ -80,6 +82,10 @@ def set_message
     redirect_to root_url, status: :unauthorized if @message.conversation.user != Current.user
   end
 
+  def set_nav_conversations
+    @nav_conversations = Conversation.grouped_by_increasing_time_interval_for_user(Current.user)
+  end
+
   def set_nav_assistants
     @nav_assistants = Current.user.assistants.ordered
   end

app/models/conversation.rb

@@ -27,14 +27,8 @@ class Conversation < ApplicationRecord
   #  "Last Month" => relation,
   #  "Older" => relation
   # }
-  def self.grouped_by_increasing_time_interval_for_user(user, query = nil)
-    if query.blank?
-      nav_conversations = user.conversations.ordered
-    else
-      nav_conversations = user.conversations.joins(:messages).ordered.where("messages.content_text ILIKE ?", "%#{query}%").
-        or(user.conversations.ordered.where("title ILIKE ?", "%#{query}%")).
-        select("DISTINCT conversations.*")
-    end
+  def self.grouped_by_increasing_time_interval_for_user(user)
+    nav_conversations = user.conversations.ordered
 
     keys = ["Today", "Yesterday", "This Week", "This Month", "Last Month", "Older"]
     values = [

app/views/messages/_nav_column.html.erb

@@ -25,8 +25,19 @@
   <% end %>
 </section>
 
-<turbo-frame id="nav-conversations"
-  src="<%= conversations_path %>"
-  loading="lazy"
-  data-turbo-permanent
-/>
+<section class="text-gray-950 dark:text-gray-100 select-none">
+  <turbo-frame  id="conversations"
+                target="conversation"
+                data-controller="radio-behavior"
+                data-radio-behavior-selected-class="relationship"
+                class="block mb-24" <%# ensures the last conversation's menu has room to open %>
+  >
+    <% @nav_conversations.each do |named_time_span, conversations| %>
+      <header class="mx-2 mt-10 mb-2 text-xs font-semibold text-gray-300 text-opacity-1 dark:text-gray-500">
+        <%= named_time_span %>
+      </header>
+
+      <%= render conversations %>
+    <% end %>
+  </turbo-frame>
+</section>

config/routes.rb

@@ -7,7 +7,7 @@
     resources :messages, only: [:new, :create, :edit]
   end
 
-  resources :conversations, only: [:index, :show, :edit, :update, :destroy] do
+  resources :conversations, only: [:show, :edit, :update, :destroy] do
     resources :messages, only: [:index]
   end
 

test/models/conversation_test.rb

@@ -125,38 +125,4 @@ class ConversationTest < ActiveSupport::TestCase
       assert_equal 3, grouped_conversations["Older"].count
     end
   end
-
-  test "#grouped_by_increasing_time_interval_for_user with a query returning a single conversation title" do
-    user = users(:keith)
-    query = "Ruby"
-
-    grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten
-
-    assert_equal 1, grouped_conversations.count
-    assert_equal conversations(:ruby_version), grouped_conversations.first, "Should have returned this conversation based on title"
-  end
-
-  test "#grouped_by_increasing_time_interval_for_user with a query returning a single conversation message" do
-    user = users(:keith)
-    query = "alive"
-
-    grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten
-
-    assert_equal 1, grouped_conversations.count
-    assert_equal conversations(:greeting), grouped_conversations.first, "Should have returned this conversation based on message content"
-  end
-
-  test "#grouped_by_increasing_time_interval_for_user with a query returning matching conversation titles and a message" do
-    user = users(:keith)
-    query = "test"
-
-    grouped_conversations = Conversation.grouped_by_increasing_time_interval_for_user(user, query).values.flatten
-
-    assert_equal 3, grouped_conversations.count
-    assert_equal [
-      conversations(:attachment).id, # matches title
-      conversations(:attachments).id, # matches title
-      conversations(:ruby_version).id # matches "latest" in messages
-    ].sort, grouped_conversations.map(&:id).sort, "Should have returned these conversations based on title and message content"
-  end
 end