diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb index a11402fe1..aeef68680 100644 --- a/app/controllers/conversations_controller.rb +++ b/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 diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 8aff33231..01590b89f 100644 --- a/app/controllers/messages_controller.rb +++ b/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 diff --git a/app/javascript/stimulus/search_controller.js b/app/javascript/stimulus/search_controller.js deleted file mode 100644 index 65b58720d..000000000 --- a/app/javascript/stimulus/search_controller.js +++ /dev/null @@ -1,37 +0,0 @@ -import { Controller } from "@hotwired/stimulus" - -export default class extends Controller { - static targets = [ "input", "clear" ] - - inputTargetConnected() { - this.setSearchClearIcon() - } - - disconnect() { - clearTimeout(this.timeout) - } - - clear() { - this.inputTarget.value = "" - this.element.requestSubmit() - } - - unfocus() { - this.inputTarget.autofocus = false - } - - search() { - clearTimeout(this.timeout) - this.setSearchClearIcon() - this.timeout = setTimeout(() => { - this.element.requestSubmit() - }, 500) - } - - setSearchClearIcon() { - if (this.inputTarget.value.length > 0) - this.clearTarget.classList.remove("hidden") - else - this.clearTarget.classList.add("hidden") - } -} diff --git a/app/models/conversation.rb b/app/models/conversation.rb index af2245e3b..61106f911 100644 --- a/app/models/conversation.rb +++ b/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 = [ diff --git a/app/views/conversations/index.html.erb b/app/views/conversations/index.html.erb deleted file mode 100644 index 951113dc7..000000000 --- a/app/views/conversations/index.html.erb +++ /dev/null @@ -1,57 +0,0 @@ - -
- <%= form_with(url: conversations_path, - data: { turbo_frame: "nav_conversations", controller: "search" }, - class: "contents", - method: :get - ) do |form| %> -
- <%= form.text_field :query, - value: @query, - placeholder: "Search", - id: "search-input", - autofocus: @query.nil? ? false : true, - class: %| - w-full - p-2 py-1 - border border-gray-200 rounded-lg - text-black dark:text-gray-800 - |, - data: { - search_target: "input", - turbo_permanent: true, - action: %| - blur->search#unfocus - input->search#search - %| - } - %> - <%= icon "x-circle", - variant: :mini, - size: 18, - class: "cursor-pointer text-gray-800 absolute right-1 top-1/2 transform -translate-y-1/2", - data: { search_target: "clear", action: "click->search#clear" } - %> -
- <% end %> -
- -
- - > - <% @nav_conversations.each do |named_time_span, conversations| %> -
- <%= named_time_span %> -
- - <%= render conversations %> - <% end %> - -
- diff --git a/app/views/messages/_nav_column.html.erb b/app/views/messages/_nav_column.html.erb index 19372969b..8b359a07e 100644 --- a/app/views/messages/_nav_column.html.erb +++ b/app/views/messages/_nav_column.html.erb @@ -25,8 +25,19 @@ <% end %> - +
+ + > + <% @nav_conversations.each do |named_time_span, conversations| %> +
+ <%= named_time_span %> +
+ + <%= render conversations %> + <% end %> + +
diff --git a/config/routes.rb b/config/routes.rb index 73386abb5..e954284bd 100644 --- a/config/routes.rb +++ b/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 diff --git a/test/models/conversation_test.rb b/test/models/conversation_test.rb index 58a38ac94..f382e7c79 100644 --- a/test/models/conversation_test.rb +++ b/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