From 38116f64e418d8600f915026a1485f506bb81c89 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Mon, 6 Oct 2025 10:43:46 +0200
Subject: [PATCH] Higher fidelity for watching/unwatching cards

---
 app/controllers/cards/watches_controller.rb       |  2 --
 app/views/cards/_messages.html.erb                | 14 +-------------
 app/views/cards/comments/_watchers.html.erb       | 13 +++++++++++++
 app/views/cards/watches/_refresh.turbo_stream.erb |  7 +++++++
 app/views/cards/watches/_watch_button.html.erb    | 13 +++++++++++++
 app/views/cards/watches/create.turbo_stream.erb   |  1 +
 app/views/cards/watches/destroy.turbo_stream.erb  |  1 +
 app/views/cards/watches/show.html.erb             | 12 +-----------
 test/controllers/cards/watches_controller_test.rb |  4 ----
 9 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 app/views/cards/comments/_watchers.html.erb
 create mode 100644 app/views/cards/watches/_refresh.turbo_stream.erb
 create mode 100644 app/views/cards/watches/_watch_button.html.erb
 create mode 100644 app/views/cards/watches/create.turbo_stream.erb
 create mode 100644 app/views/cards/watches/destroy.turbo_stream.erb

diff --git a/app/controllers/cards/watches_controller.rb b/app/controllers/cards/watches_controller.rb
index 7556e2000..7308c2279 100644
--- a/app/controllers/cards/watches_controller.rb
+++ b/app/controllers/cards/watches_controller.rb
@@ -3,11 +3,9 @@ class Cards::WatchesController < ApplicationController
 
   def create
     @card.watch_by Current.user
-    redirect_back_or_to @card
   end
 
   def destroy
     @card.unwatch_by Current.user
-    redirect_back_or_to @card
   end
 end
diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index f6ab5a37d..144be94cc 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -3,19 +3,7 @@
     <%= render partial: "cards/comments/comment", collection: card.comments.chronologically, cached: true %>
     <%= render "cards/comments/new", card: card %>
 
-    <div class="comments__subscribers flex flex-column margin-block-start txt-align-start full-width">
-      <strong class="txt-uppercase">Subscribers</strong>
-
-      <p class="margin-none-block-start margin-block-end-half">
-        <%= pluralize(@card.watchers.without(User.system).count, "person") %> will be notified when someone comments on this.
-      </p>
-
-      <div class="flex align-center flex-wrap gap-half max-width txt-normal">
-        <% @card.watchers.without(User.system).alphabetically.each do |watcher| %>
-          <%= avatar_tag watcher %>
-        <% end %>
-      </div>
-    </div>
+    <%= render "cards/comments/watchers", card: card %>
   <% end %>
 
   <footer class="delete-card txt-align-center full-width flex flex-column margin-block-start-double">
diff --git a/app/views/cards/comments/_watchers.html.erb b/app/views/cards/comments/_watchers.html.erb
new file mode 100644
index 000000000..800fbb014
--- /dev/null
+++ b/app/views/cards/comments/_watchers.html.erb
@@ -0,0 +1,13 @@
+<div id="<%= dom_id(card, :comment_watchers) %>" class="comments__subscribers flex flex-column margin-block-start txt-align-start full-width">
+  <strong class="txt-uppercase">Subscribers</strong>
+
+  <p class="margin-none-block-start margin-block-end-half">
+    <%= pluralize(card.watchers.without(User.system).count, "person") %> will be notified when someone comments on this.
+  </p>
+
+  <div class="flex align-center flex-wrap gap-half max-width txt-normal">
+    <% card.watchers.without(User.system).alphabetically.each do |watcher| %>
+      <%= avatar_tag watcher %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/cards/watches/_refresh.turbo_stream.erb b/app/views/cards/watches/_refresh.turbo_stream.erb
new file mode 100644
index 000000000..6d9397b61
--- /dev/null
+++ b/app/views/cards/watches/_refresh.turbo_stream.erb
@@ -0,0 +1,7 @@
+<%= turbo_stream.replace dom_id(card, :watch_button) do %>
+  <%= render "cards/watches/watch_button", card: card %>
+<% end %>
+
+<%= turbo_stream.replace dom_id(card, :comment_watchers) do %>
+  <%= render "cards/comments/watchers", card: card %>
+<% end %>
diff --git a/app/views/cards/watches/_watch_button.html.erb b/app/views/cards/watches/_watch_button.html.erb
new file mode 100644
index 000000000..3344d9c31
--- /dev/null
+++ b/app/views/cards/watches/_watch_button.html.erb
@@ -0,0 +1,13 @@
+<div id="<%= dom_id(card, :watch_button) %>">
+  <% if card.watched_by? Current.user %>
+    <%= button_to card_watch_path(card), method: :delete, class: "btn btn--reversed", data: { controller: "tooltip" } do %>
+      <%= icon_tag "bell" %>
+      <span class="for-screen-reader">Stop watching</span>
+    <% end %>
+  <% else %>
+    <%= button_to card_watch_path(card), class: "btn", data: { controller: "tooltip" } do %>
+      <%= icon_tag "bell-off" %>
+      <span class="for-screen-reader">Watch this</span>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/cards/watches/create.turbo_stream.erb b/app/views/cards/watches/create.turbo_stream.erb
new file mode 100644
index 000000000..058b71dd1
--- /dev/null
+++ b/app/views/cards/watches/create.turbo_stream.erb
@@ -0,0 +1 @@
+<%= render "cards/watches/refresh", card: @card %>
\ No newline at end of file
diff --git a/app/views/cards/watches/destroy.turbo_stream.erb b/app/views/cards/watches/destroy.turbo_stream.erb
new file mode 100644
index 000000000..1e4d21b35
--- /dev/null
+++ b/app/views/cards/watches/destroy.turbo_stream.erb
@@ -0,0 +1 @@
+<%= render "cards/watches/refresh", card: @card %>
diff --git a/app/views/cards/watches/show.html.erb b/app/views/cards/watches/show.html.erb
index b62dee483..44892190d 100644
--- a/app/views/cards/watches/show.html.erb
+++ b/app/views/cards/watches/show.html.erb
@@ -1,13 +1,3 @@
 <%= turbo_frame_tag dom_id(@card, :watch) do %>
-  <% if @card.watched_by? Current.user %>
-      <%= button_to card_watch_path(@card), method: :delete, class: "btn btn--reversed", data: { controller: "tooltip" } do %>
-        <%= icon_tag "bell" %>
-        <span class="for-screen-reader">Stop watching</span>
-      <% end %>
-  <% else %>
-      <%= button_to card_watch_path(@card), class: "btn", data: { controller: "tooltip" } do %>
-        <%= icon_tag "bell-off" %>
-        <span class="for-screen-reader">Watch this</span>
-      <% end %>
-  <% end %>
+  <%= render "cards/watches/watch_button", card: @card %>
 <% end %>
diff --git a/test/controllers/cards/watches_controller_test.rb b/test/controllers/cards/watches_controller_test.rb
index 8338922de..5440a326b 100644
--- a/test/controllers/cards/watches_controller_test.rb
+++ b/test/controllers/cards/watches_controller_test.rb
@@ -11,8 +11,6 @@ class Cards::WatchesControllerTest < ActionDispatch::IntegrationTest
     assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: false, to: true do
       post card_watch_path(cards(:logo))
     end
-
-    assert_redirected_to cards(:logo)
   end
 
   test "destroy" do
@@ -21,7 +19,5 @@ class Cards::WatchesControllerTest < ActionDispatch::IntegrationTest
     assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: true, to: false do
       delete card_watch_path(cards(:logo))
     end
-
-    assert_redirected_to cards(:logo)
   end
 end