add removing flash-messages, update podcasts

o-200 · Dec 28, 2024 · f4ce2f0 · f4ce2f0
1 parent b82cd2c
commit f4ce2f0
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/app/controllers/podcasts_controller.rb b/app/controllers/podcasts_controller.rb
@@ -19,13 +19,14 @@ def create
 
     respond_to do |format|
       if @podcast.save
+        flash[:notice] = "Your podcast was successfully created."
         format.turbo_stream do
           render turbo_stream: [
             turbo_stream.replace("podcast_frame", partial: "podcasts/podcast", locals: { podcast: @podcast }),
-            turbo_stream.update("notice", "Your podcast was successfully created.")
+            turbo_stream.append("flash", partial: "layouts/flash", locals: { message: notice })
           ]
         end
-        format.html { redirect_to @podcast, notice: "Your podcast was successfully created." }
+        format.html { redirect_to @podcast, notice: notice }
       else
         format.turbo_stream do
           render turbo_stream: [
@@ -48,10 +49,11 @@ def update
 
     respond_to do |format|
       if @podcast.update(podcast_params)
+        flash[:notice] = "Your podcast was successfully updated."
         format.turbo_stream do
           render turbo_stream: [
             turbo_stream.replace("podcast_frame", partial: "podcasts/podcast", locals: { podcast: @podcast }),
-            turbo_stream.update("notice", "Your podcast was successfully updated.")
+            turbo_stream.append("flash", partial: "layouts/flash", locals: { message: notice })
           ]
         end
         format.html { redirect_to @podcast, notice: "Your podcast was successfully updated." }

diff --git a/...avascript/controllers/hello_controller.js → ...script/controllers/removals_controller.js b/...avascript/controllers/hello_controller.js → ...script/controllers/removals_controller.js
@@ -2,6 +2,12 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   connect() {
-    this.element.textContent = "Hello World!"
+    setTimeout(() => {
+      this.remove()
+    }, 3000)
+  }
+
+  remove() {
+    this.element.remove()
   }
 }
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
@@ -0,0 +1,5 @@
+<% flash.each do |flash_type, message| %>
+  <div class="flash__message alert alert-info" data-controller="removals" data-action="animationend->removals#remove">
+    <%= message %>
+  </div>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -22,12 +22,9 @@
       <div class="container">
         <%= render "layouts/header" %>
 
-        <% if notice %>
-          <p class="alert alert-info"><%= notice %></p>
-        <% end %>
-        <% if alert %>
-          <p class="alert alert-warning"><%= alert %></p>
-        <% end %>
+        <div id="flash" class="flash">
+          <%= render "layouts/flash" %>
+        </div>
 
         <div class="mb-3">
           <%= yield %>

diff --git a/spec/features/podcasts/edit_update_spec.rb b/spec/features/podcasts/edit_update_spec.rb
@@ -14,7 +14,7 @@
     scenario "the current podcast details in the form" do
       expect(page).to have_content("Редактировать Podcast: #{podcast.title}")
 
-      expect(find_field('podcast[title]').value).to eq(podcast.title)
+      expect(find_field('podcast[title]').value).to       eq(podcast.title)
       expect(find_field('podcast[description]').value).to eq(podcast.description)
     end
 
@@ -30,13 +30,16 @@
 
   # context 'user updates the podcast' do
   scenario "successfully updates the podcast title and description" do
-    fill_in 'podcast[title]', with: "Updated Podcast Title"
-    fill_in 'podcast[description]', with: "Updated description."
+    title = "Updated Podcast Title"
+    description = "Updated description."
+
+    fill_in 'podcast[title]',       with: title
+    fill_in 'podcast[description]', with: description
     click_button 'Submit Podcast'
 
-    # expect(page).to have_content("Podcast was successfully updated.")
-    expect(page).to have_content("Updated Podcast Title")
-    expect(page).to have_content("Updated description.")
+    expect(page).to have_content("Your podcast was successfully updated.")
+    expect(page).to have_content(title)
+    expect(page).to have_content(description)
   end
 
   scenario "see error" do

diff --git a/spec/features/podcasts/new_create_spec.rb b/spec/features/podcasts/new_create_spec.rb
@@ -26,7 +26,7 @@
       click_button 'Submit Podcast'
 
       expect(current_path).to eq(podcast_path(Podcast.last))
-      # expect(page).to have_content("Your podcast was successfully created.")
+      expect(page).to have_content("Your podcast was successfully created.")
       expect(page).to have_content(podcast.title)
       expect(page).to have_content(podcast.description)
     end