From 4589360dd1afbac09cc2ad743d8a676afbac60de Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Wed, 2 Jul 2025 22:15:21 -0400
Subject: [PATCH] Collection publication edits render a turbo frame

so we don't disturb the rest of the edit page.
---
 .../collections/publications_controller.rb    |  5 +-
 .../collections/edit/_publication.html.erb    | 97 ++++++++++---------
 .../publications_controller_test.rb           |  4 +-
 3 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/app/controllers/collections/publications_controller.rb b/app/controllers/collections/publications_controller.rb
index feb5ae4b7..2ded7eda2 100644
--- a/app/controllers/collections/publications_controller.rb
+++ b/app/controllers/collections/publications_controller.rb
@@ -3,11 +3,12 @@ class Collections::PublicationsController < ApplicationController
 
   def create
     @collection.publish
-    redirect_to edit_collection_path(@collection)
+    render turbo_stream: turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection })
   end
 
   def destroy
     @collection.unpublish
-    redirect_to edit_collection_path(@collection)
+    @collection.reload
+    render turbo_stream: turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection })
   end
 end
diff --git a/app/views/collections/edit/_publication.html.erb b/app/views/collections/edit/_publication.html.erb
index 72f315b8d..921cd6fe2 100644
--- a/app/views/collections/edit/_publication.html.erb
+++ b/app/views/collections/edit/_publication.html.erb
@@ -1,54 +1,55 @@
-<div class="margin-block">
-  <strong class="divider txt-large">Public link</strong>
-  <p class="margin-none-block-start">Turn on the Public link to share this collection with anyone in the world. They won’t need to log in and they won’t be able to see anything else in Fizzy.</p>
+<%= turbo_frame_tag @collection, :publication do %>
+  <div class="margin-block">
+    <strong class="divider txt-large">Public link</strong>
+    <p class="margin-none-block-start">Turn on the Public link to share this collection with anyone in the world. They won’t need to log in and they won’t be able to see anything else in Fizzy.</p>
 
-  <% if collection.published? %>
-    <div class="border-radius pad fill-selected">
-      <div class="flex-inline center justify-between gap">
-        <span class="txt-large"><%= icon_tag "lock" %></span>
-        <label class="switch flex align-center justify-between">
-          <%= form_with url: collection_publication_path(collection), method: :delete, data: { controller: "form" } do |form| %>
-            <%= form.check_box :published, class: "switch__input", checked: true, data: { action: "change->form#submit" } %>
-            <span class="switch__btn round"></span>
-            <span class="for-screen-reader">Turn off the public link</span>
-          <% end %> 
-        </label>
-        <span class="txt-large"><%= icon_tag "world" %></span>
-      </div>
+    <% if collection.published? %>
+      <div class="border-radius pad fill-selected">
+        <div class="flex-inline center justify-between gap">
+          <span class="txt-large"><%= icon_tag "lock" %></span>
+          <label class="switch flex align-center justify-between">
+            <%= form_with url: collection_publication_path(collection), method: :delete, data: { controller: "form" } do |form| %>
+              <%= form.check_box :published, class: "switch__input", checked: true, data: { action: "change->form#submit" } %>
+              <span class="switch__btn round"></span>
+              <span class="for-screen-reader">Turn off the public link</span>
+            <% end %>
+          </label>
+          <span class="txt-large"><%= icon_tag "world" %></span>
+        </div>
 
-      <div class="flex align-center gap-half margin-block">
-        <%= text_field_tag :publication_url, published_collection_url(collection), disabled: true, class: "full-width input fill-white" %>
-        <div class="flex align-center justify-center gap-half">
-          <%= button_to_copy_to_clipboard(published_collection_url(collection)) do %>
-            <%= icon_tag "copy-paste" %>
-            <span class="for-screen-reader">Copy public link</span>
+        <div class="flex align-center gap-half margin-block">
+          <%= text_field_tag :publication_url, published_collection_url(collection), disabled: true, class: "full-width input fill-white" %>
+          <div class="flex align-center justify-center gap-half">
+            <%= button_to_copy_to_clipboard(published_collection_url(collection)) do %>
+              <%= icon_tag "copy-paste" %>
+              <span class="for-screen-reader">Copy public link</span>
+            <% end %>
+          </div>
+        </div>
+        <strong class="margin-block-end-half flex justify-center txt-small">Add an optional description to the public page</strong>
+        <div class="border-radius input fill-white">
+          <%= form_with model: collection, class: "txt-align-start", data: { controller: "form" } do |form| %>
+            <%= form.rich_textarea :public_description, class: "rich-text-content txt-small",
+              placeholder: "Add a public note about this collection…",
+              data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } %>
+            <%= form.button "Save changes", type: :submit, class: "btn txt-small" %>
           <% end %>
         </div>
       </div>
-      <strong class="margin-block-end-half flex justify-center txt-small">Add an optional description to the public page</strong>
-      <div class="border-radius input fill-white">
-        <%= form_with model: collection, class: "txt-align-start", data: { controller: "form" } do |form| %>
-          <%= form.rich_textarea :public_description, class: "rich-text-content txt-small",
-            placeholder: "Add a public note about this collection…",
-            data: { action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel:stop" } %>
-          <%= form.button "Save changes", type: :submit, class: "btn txt-small" %>
-        <% end %>
+    <% else %>
+      <div class="border-radius pad fill-shade">
+        <div class="flex-inline center justify-between gap">
+          <span class="txt-large"><%= icon_tag "lock" %></span>
+          <label class="switch flex align-center justify-between">
+            <%= form_with url: collection_publication_path(collection), method: :post, data: { controller: "form" } do |form| %>
+              <%= form.check_box :published, class: "switch__input", checked: false, data: { action: "change->form#submit" } %>
+              <span class="switch__btn round"></span>
+              <span class="for-screen-reader">Turn on the public link</span>
+            <% end %>
+          </label>
+          <span class="txt-large"><%= icon_tag "world" %></span>
+        </div>
       </div>
-    </div>
-  <% else %>
-    <div class="border-radius pad fill-shade">
-      <div class="flex-inline center justify-between gap">
-        <span class="txt-large"><%= icon_tag "lock" %></span>
-        <label class="switch flex align-center justify-between">
-          <%= form_with url: collection_publication_path(collection), method: :post, data: { controller: "form" } do |form| %>
-            <%= form.check_box :published, class: "switch__input", checked: false, data: { action: "change->form#submit" } %>
-            <span class="switch__btn round"></span>
-            <span class="for-screen-reader">Turn on the public link</span>
-          <% end %> 
-        </label>
-        <span class="txt-large"><%= icon_tag "world" %></span>
-      </div>
-    </div>
-  <% end %>
-</div>
-
+    <% end %>
+  </div>
+<% end %>
diff --git a/test/controllers/collections/publications_controller_test.rb b/test/controllers/collections/publications_controller_test.rb
index 2bd9ec1dc..da24c22da 100644
--- a/test/controllers/collections/publications_controller_test.rb
+++ b/test/controllers/collections/publications_controller_test.rb
@@ -13,7 +13,7 @@ class Collections::PublicationsControllerTest < ActionDispatch::IntegrationTest
       post collection_publication_path(@collection)
     end
 
-    assert_redirected_to edit_collection_path(@collection)
+    assert_turbo_stream action: :replace, target: dom_id(@collection, :publication)
   end
 
   test "unpublish a collection" do
@@ -24,6 +24,6 @@ class Collections::PublicationsControllerTest < ActionDispatch::IntegrationTest
       delete collection_publication_path(@collection)
     end
 
-    assert_redirected_to edit_collection_path(@collection)
+    assert_turbo_stream action: :replace, target: dom_id(@collection, :publication)
   end
 end