Merge pull request #867 from basecamp/flavorjones/collections-flash

Collections controllers render flash notices

app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
-  include Authentication, CurrentRequest, CurrentTimezone, SetPlatform, WriterAffinity
+  include Authentication, CurrentRequest, CurrentTimezone, SetPlatform, TurboFlash, WriterAffinity
 
   stale_when_importmap_changes
   allow_browser versions: :modern

app/controllers/collections/entropy_configurations_controller.rb

@@ -4,7 +4,10 @@ class Collections::EntropyConfigurationsController < ApplicationController
   def update
     @collection.entropy_configuration.update!(entropy_configuration_params)
 
-    render turbo_stream: turbo_stream.replace([ @collection, :entropy_configuration ], partial: "collections/edit/auto_close", locals: { collection: @collection })
+    render turbo_stream: [
+        turbo_stream.replace([ @collection, :entropy_configuration ], partial: "collections/edit/auto_close", locals: { collection: @collection }),
+        turbo_stream_flash(notice: "Saved")
+      ]
   end
 
   private

app/controllers/collections/publications_controller.rb

@@ -3,12 +3,18 @@ class Collections::PublicationsController < ApplicationController
 
   def create
     @collection.publish
-    render turbo_stream: turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection })
+    render turbo_stream: [
+        turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection }),
+        turbo_stream_flash(notice: "Saved")
+      ]
   end
 
   def destroy
     @collection.unpublish
     @collection.reload
-    render turbo_stream: turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection })
+    render turbo_stream: [
+        turbo_stream.replace([ @collection, :publication ], partial: "collections/edit/publication", locals: { collection: @collection }),
+        turbo_stream_flash(notice: "Saved")
+      ]
   end
 end

app/controllers/collections/workflows_controller.rb

@@ -5,7 +5,10 @@ class Collections::WorkflowsController < ApplicationController
 
   def update
     @collection.update! workflow: @workflow
-    render turbo_stream: turbo_stream.replace([ @collection, :workflows ], partial: "collections/edit/workflows", locals: { collection: @collection })
+    render turbo_stream: [
+        turbo_stream.replace([ @collection, :workflows ], partial: "collections/edit/workflows", locals: { collection: @collection }),
+        turbo_stream_flash(notice: "Saved")
+      ]
   end
 
   private

app/controllers/collections_controller.rb

@@ -19,7 +19,7 @@ class CollectionsController < ApplicationController
     @collection.update! collection_params
     @collection.accesses.revise granted: grantees, revoked: revokees if grantees_changed?
 
-    redirect_to edit_collection_path(@collection), notice: "Changes saved"
+    redirect_to edit_collection_path(@collection), notice: "Saved"
   end
 
   def destroy

app/controllers/concerns/turbo_flash.rb

@@ -0,0 +1,6 @@
+module TurboFlash
+  private
+    def turbo_stream_flash(**flash_options)
+      turbo_stream.replace(:flash, partial: "layouts/shared/flash", locals: { flash: flash_options })
+    end
+end

app/views/layouts/application.html.erb

@@ -8,13 +8,7 @@
       <%= yield :header %>
     </header>
 
-    <% if notice = flash[:notice] || flash[:alert] %>
-      <div class="flash" data-controller="element-removal" data-action="animationend->element-removal#remove">
-        <div class="flash__inner shadow">
-          <%= notice %>
-        </div>
-      </div>
-    <% end %>
+    <%= render "layouts/shared/flash" %>
 
     <main id="main">
       <%= yield %>

app/views/layouts/shared/_flash.html.erb

@@ -0,0 +1,9 @@
+<%= turbo_frame_tag :flash do %>
+  <% if notice = flash[:notice] || flash[:alert] %>
+    <div class="flash" data-controller="element-removal" data-action="animationend->element-removal#remove">
+      <div class="flash__inner shadow">
+        <%= notice %>
+      </div>
+    </div>
+  <% end %>
+<% end %>