🐞🔨 Gizmo: Fix bug where removing a Gizmo fails

- #1565 OK this is also a bit much; but it does fix the bug. I'm going to try and tighten it up a bit
zinc-collective · Jun 25, 2023 · 8706547 · 8706547
1 parent b6dd7a1
commit 8706547
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/app/assets/stylesheets/components/button.scss b/app/assets/stylesheets/components/button.scss
@@ -1,10 +1,11 @@
+/* @todo DELETE ME */
 @layer components {
   [type="reset"],
   [type="button"],
   [type="submit"],
   button,
   .button {
-    @apply font-bold py-2 px-4 my-1 rounded bg-primary-500 text-white text-center transition ease-in-out duration-150;
+    @apply font-bold py-2 px-4 rounded bg-primary-500 text-white text-center transition ease-in-out duration-150;
 
     &:hover {
       @apply bg-primary-700;

diff --git a/app/views/furnitures/_form.html.erb b/app/views/furnitures/_form.html.erb
@@ -1,14 +1,17 @@
 <section id="<%= dom_id(furniture) %>">
   <%- if policy(furniture).edit? %>
-    <%= form_with(model: [furniture.room.space, furniture.room, furniture], local: true) do |form| %>
+    <%= form_with(model: [furniture.room.space, furniture.room, furniture]) do |form| %>
       <div>
         <%= render partial: furniture.furniture.form_template, locals: { form: form } %>
       </div>
       <footer>
         <%- if policy(furniture).destroy? %>
-          <%= form.button name: "_method", value: "delete", class: "--danger" do %>
-            <%=t('.destroy')%>
-          <%- end %>
+          <%= render ButtonComponent.new(
+                      label: t('.destroy', name: furniture.furniture.model_name.human.titleize),
+                      href: [furniture.room.space, furniture.room, furniture],
+                      title: t('.destroy', name: furniture.furniture.model_name.human.titleize),
+                      method: :delete,
+                      scheme: :danger) %>
         <%- end %>
 
         <%- if furniture.furniture.attribute_names.present? %>

diff --git a/app/views/furnitures/_furniture.html.erb b/app/views/furnitures/_furniture.html.erb
@@ -12,6 +12,7 @@
                         label: t('icons.edit'),
                         href: edit_href,
                         method: :get,
+                        turbo_stream: true,
                         title: t('.edit_title', name: furniture.furniture.model_name.human.titleize),
                         scheme: :secondary) %>
         <%- end %>

diff --git a/spec/system/furniture_spec.rb b/spec/system/furniture_spec.rb
@@ -5,7 +5,6 @@
   include ActiveJob::TestHelper
   it "Managing Furniture" do
     space = create(:space, :with_entrance, :with_members, member_count: 1)
-    # Sign in to the Space
     sign_in(space.members.first, space)
 
     add_gizmo("Markdown Text Block", room: space.entrance)