From ce0577d3c1cf8c88d0388ec6d7280207f6385a02 Mon Sep 17 00:00:00 2001
From: Jose Farias <jose@37signals.com>
Date: Fri, 13 Dec 2024 14:07:48 -0600
Subject: [PATCH] Users can remove themselves from buckets

---
 app/controllers/buckets_controller.rb       | 2 +-
 app/helpers/accesses_helper.rb              | 9 ---------
 app/views/buckets/_access_toggle.erb        | 4 ++--
 test/controllers/buckets_controller_test.rb | 4 ++--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/controllers/buckets_controller.rb b/app/controllers/buckets_controller.rb
index e46ee83c4..b6cbe66dc 100644
--- a/app/controllers/buckets_controller.rb
+++ b/app/controllers/buckets_controller.rb
@@ -24,7 +24,7 @@ class BucketsController < ApplicationController
     @bucket.update! bucket_params
     @bucket.accesses.revise granted: grantees, revoked: revokees
 
-    redirect_to edit_bucket_path(@bucket)
+    redirect_to bubbles_path(bucket_ids: [ @bucket ])
   end
 
   def destroy
diff --git a/app/helpers/accesses_helper.rb b/app/helpers/accesses_helper.rb
index f113cec24..38fd5b78a 100644
--- a/app/helpers/accesses_helper.rb
+++ b/app/helpers/accesses_helper.rb
@@ -5,13 +5,4 @@ module AccessesHelper
       locals: { selected: selected },
       cached: ->(user) { [ user, selected ] }
   end
-
-  def access_toggle_tag(user, &)
-    tag.li class: "flex align-center gap-half margin-none unpad", data: {
-      value: user.name.downcase,
-      creator_id: user.id,
-      controller: "created-by-current-user",
-      created_by_current_user_target: "creation",
-      created_by_current_user_mine_class: "toggler--toggled" }, &
-  end
 end
diff --git a/app/views/buckets/_access_toggle.erb b/app/views/buckets/_access_toggle.erb
index dfa42a2b1..1b2482ef4 100644
--- a/app/views/buckets/_access_toggle.erb
+++ b/app/views/buckets/_access_toggle.erb
@@ -1,4 +1,4 @@
-<%= access_toggle_tag user do %>
+<li class="flex align-center gap-half margin-none unpad" data-value="<%= user.name.downcase %>">
   <figure class="avatar flex-item-no-shrink">
     <%= avatar_tag user, loading: :lazy %>
   </figure>
@@ -18,4 +18,4 @@
     <span class="switch__btn round"></span>
     <span class="for-screen-reader">Give <%= user.name %> access</span>
   </label>
-<% end %>
+</li>
diff --git a/test/controllers/buckets_controller_test.rb b/test/controllers/buckets_controller_test.rb
index 03e2854ec..d73be679e 100644
--- a/test/controllers/buckets_controller_test.rb
+++ b/test/controllers/buckets_controller_test.rb
@@ -34,7 +34,7 @@ class BucketsControllerTest < ActionDispatch::IntegrationTest
   test "update" do
     patch bucket_url(buckets(:writebook)), params: { bucket: { name: "Writebook bugs" }, user_ids: users(:david, :jz).pluck(:id) }
 
-    assert_redirected_to edit_bucket_url(buckets(:writebook))
+    assert_redirected_to bubbles_url(bucket_ids: [ buckets(:writebook) ])
     assert_equal "Writebook bugs", buckets(:writebook).reload.name
     assert_equal users(:david, :jz), buckets(:writebook).users
     assert_not buckets(:writebook).all_access?
@@ -47,7 +47,7 @@ class BucketsControllerTest < ActionDispatch::IntegrationTest
 
     patch bucket_url(bucket), params: { bucket: { name: "Bugs", all_access: true } }
 
-    assert_redirected_to edit_bucket_url(bucket)
+    assert_redirected_to bubbles_url(bucket_ids: [ bucket ])
     assert bucket.reload.all_access?
     assert_equal accounts("37s").users, bucket.users
   end