diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index bc0d4a9c5..1c9c66bcb 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -4,7 +4,6 @@ class CommentsController < ApplicationController def create @bubble.capture new_comment - redirect_to @bubble end def show diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb new file mode 100644 index 000000000..0fc940b37 --- /dev/null +++ b/app/helpers/messages_helper.rb @@ -0,0 +1,11 @@ +module MessagesHelper + def messages_tag(bubble, &) + turbo_frame_tag dom_id(bubble, :messages), + class: "comments align-center center borderless margin flex flex-column gap-half", + style: "--bubble-color: <%= bubble.color %>", + data: { + controller: "created-by-current-user", + created_by_current_user_mine_class: "comment--mine" + }, & + end +end diff --git a/app/views/bubbles/_messages.html.erb b/app/views/bubbles/_messages.html.erb index 446b424c9..49f8655d8 100644 --- a/app/views/bubbles/_messages.html.erb +++ b/app/views/bubbles/_messages.html.erb @@ -1,10 +1,6 @@ -
+<%= messages_tag(bubble) do %> <%# Template Dependency: comments/comment %> <%# Template Dependency: event_summaries/event_summary %> <%= render bubble.messages, cached: true %> <%= render "comments/new", bubble: bubble %> -
+<% end %> diff --git a/app/views/comments/create.html.erb b/app/views/comments/create.html.erb new file mode 100644 index 000000000..d669eecaf --- /dev/null +++ b/app/views/comments/create.html.erb @@ -0,0 +1 @@ +<%= render "bubbles/messages", bubble: @bubble %> diff --git a/test/controllers/comments_controller_test.rb b/test/controllers/comments_controller_test.rb index b011a1a71..0c8713eb9 100644 --- a/test/controllers/comments_controller_test.rb +++ b/test/controllers/comments_controller_test.rb @@ -10,6 +10,6 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest post bucket_bubble_comments_url(buckets(:writebook), bubbles(:logo), params: { comment: { body: "Agreed." } }) end - assert_redirected_to bucket_bubble_url(buckets(:writebook), bubbles(:logo)) + assert_response :success end end