+
+ <% if ActiveModel::Type::Boolean.new.cast(params[:archived]) %>
+ <%= link_to "View active", people_path, class: "admin-only btn btn-secondary-outline" %>
+ <% else %>
+ <%= link_to "View archived", people_path(archived: true), class: "admin-only btn btn-secondary-outline" %>
+ <% end %>
<% if allowed_to?(:new?, Person) %>
<%= link_to "New Person",
new_person_path,
diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb
index d8fdc59d3b..fba70d9d8b 100644
--- a/app/views/people/show.html.erb
+++ b/app/views/people/show.html.erb
@@ -48,6 +48,24 @@
<%= render "bookmarks/editable_bookmark_button", resource: @person.object %>
+ <% if allowed_to?(:archive?, @person) %>
+
+ <% if @person.discarded? %>
+
+ Archived
+
+ <%= link_to unarchive_person_path(@person), class: "btn btn-secondary px-3 py-1 text-sm",
+ data: { turbo_method: :patch } do %>
+ Restore
+ <% end %>
+ <% else %>
+ <%= link_to archive_person_path(@person), class: "btn btn-secondary px-3 py-1 text-sm",
+ data: { turbo_method: :patch } do %>
+ Archive
+ <% end %>
+ <% end %>
+
+ <% end %>
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 61c351fd38..3b279e11d1 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -8,6 +8,7 @@ en:
send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
failure:
already_authenticated: "You are already signed in."
+ archived: "Invalid email or password. Please email us or fill out our Contact Us form for assistance."
inactive: "Invalid email or password. Please email us or fill out our Contact Us form for assistance."
invalid: "Invalid email or password. Please email us or fill out our Contact Us form for assistance."
locked: "Please email us or fill out our Contact Us form for assistance."
diff --git a/config/routes.rb b/config/routes.rb
index 529c0cc97e..7cffd6e9ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -172,6 +172,8 @@
get :workshop_logs
get :checkout
get :bio
+ patch :archive
+ patch :unarchive
end
resources :comments, only: [ :index, :create, :update ]
end
diff --git a/db/migrate/20260615120000_add_discarded_at_to_people_and_users.rb b/db/migrate/20260615120000_add_discarded_at_to_people_and_users.rb
new file mode 100644
index 0000000000..efbe4ad6e6
--- /dev/null
+++ b/db/migrate/20260615120000_add_discarded_at_to_people_and_users.rb
@@ -0,0 +1,17 @@
+class AddDiscardedAtToPeopleAndUsers < ActiveRecord::Migration[8.1]
+ def up
+ add_column :people, :discarded_at, :datetime unless column_exists?(:people, :discarded_at)
+ add_index :people, :discarded_at unless index_exists?(:people, :discarded_at)
+
+ add_column :users, :discarded_at, :datetime unless column_exists?(:users, :discarded_at)
+ add_index :users, :discarded_at unless index_exists?(:users, :discarded_at)
+ end
+
+ def down
+ remove_index :people, :discarded_at if index_exists?(:people, :discarded_at)
+ remove_column :people, :discarded_at if column_exists?(:people, :discarded_at)
+
+ remove_index :users, :discarded_at if index_exists?(:users, :discarded_at)
+ remove_column :users, :discarded_at if column_exists?(:users, :discarded_at)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 87e2573c42..93ddd7efa6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -948,6 +948,7 @@
t.integer "created_by_id"
t.string "credentials"
t.date "date_of_birth"
+ t.datetime "discarded_at"
t.string "display_name_preference"
t.string "email"
t.string "email_2"
@@ -988,6 +989,7 @@
t.integer "updated_by_id"
t.string "youtube_url"
t.index ["created_by_id"], name: "index_people_on_created_by_id"
+ t.index ["discarded_at"], name: "index_people_on_discarded_at"
t.index ["updated_by_id"], name: "index_people_on_updated_by_id"
end
@@ -1267,6 +1269,7 @@
t.integer "created_by_id"
t.datetime "current_sign_in_at", precision: nil
t.string "current_sign_in_ip"
+ t.datetime "discarded_at"
t.string "email", default: "", null: false
t.string "email_type"
t.string "encrypted_password", default: "", null: false
@@ -1307,6 +1310,7 @@
t.index ["agency_id"], name: "index_users_on_agency_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
t.index ["created_by_id"], name: "index_users_on_created_by_id"
+ t.index ["discarded_at"], name: "index_users_on_discarded_at"
t.index ["email"], name: "index_users_on_email", unique: true
t.index ["favorite_event_id"], name: "index_users_on_favorite_event_id"
t.index ["person_id"], name: "index_users_on_person_id"
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5d85c58635..0b5f7976e9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -231,6 +231,12 @@
user = create(:user, locked: true)
expect(user.active_for_authentication?).to be false
end
+
+ it "returns false when discarded (archived)" do
+ user = create(:user)
+ user.discard!
+ expect(user.active_for_authentication?).to be false
+ end
end
describe "#first_name_or_email" do
diff --git a/spec/policies/person_policy_spec.rb b/spec/policies/person_policy_spec.rb
index c299741f0f..8d82a39967 100644
--- a/spec/policies/person_policy_spec.rb
+++ b/spec/policies/person_policy_spec.rb
@@ -111,6 +111,20 @@ def policy_for(record: nil, user:)
end
end
+ describe "#archive?" do
+ context "with an admin" do
+ subject { policy_for(record: create(:person), user: admin_user) }
+
+ it { is_expected.to be_allowed_to(:archive?) }
+ end
+
+ context "with a regular user" do
+ subject { policy_for(record: create(:person), user: regular_user) }
+
+ it { is_expected.not_to be_allowed_to(:archive?) }
+ end
+ end
+
describe "relation_scope" do
context "with admin user" do
let(:policy) { policy_for(record: Person, user: admin_user) }
diff --git a/spec/requests/people_archive_spec.rb b/spec/requests/people_archive_spec.rb
new file mode 100644
index 0000000000..ec3852d3e2
--- /dev/null
+++ b/spec/requests/people_archive_spec.rb
@@ -0,0 +1,48 @@
+require "rails_helper"
+
+RSpec.describe "People archiving and deletion", type: :request do
+ let(:admin) { create(:user, :admin) }
+
+ before { sign_in admin }
+
+ describe "PATCH /people/:id/archive" do
+ it "archives the person and their user" do
+ person = create(:person)
+
+ patch archive_person_path(person)
+
+ expect(response).to redirect_to(person_path(person))
+ expect(person.reload).to be_discarded
+ expect(person.user.reload).to be_discarded
+ end
+ end
+
+ describe "PATCH /people/:id/unarchive" do
+ it "restores an archived person and their user" do
+ person = create(:person)
+ PersonArchivalService.new(person).archive!
+
+ patch unarchive_person_path(person)
+
+ expect(response).to redirect_to(person_path(person))
+ expect(person.reload).to be_kept
+ expect(person.user.reload).to be_kept
+ end
+ end
+
+ describe "GET /people (archived filter)" do
+ it "hides archived people by default and shows them when archived=true" do
+ active = create(:person, first_name: "Active", last_name: "Person")
+ archived = create(:person, first_name: "Archived", last_name: "Person")
+ PersonArchivalService.new(archived).archive!
+
+ get people_path, headers: { "Turbo-Frame" => "people_results" }
+ expect(response.body).to include("Active Person")
+ expect(response.body).not_to include("Archived Person")
+
+ get people_path(archived: true), headers: { "Turbo-Frame" => "people_results" }
+ expect(response.body).to include("Archived Person")
+ expect(response.body).not_to include("Active Person")
+ end
+ end
+end
diff --git a/spec/services/person_archival_service_spec.rb b/spec/services/person_archival_service_spec.rb
new file mode 100644
index 0000000000..a644ac6e78
--- /dev/null
+++ b/spec/services/person_archival_service_spec.rb
@@ -0,0 +1,44 @@
+require "rails_helper"
+
+RSpec.describe PersonArchivalService do
+ describe "#archive!" do
+ it "discards the person and their user together" do
+ person = create(:person)
+ user = person.user
+
+ described_class.new(person).archive!
+
+ expect(person.reload).to be_discarded
+ expect(user.reload).to be_discarded
+ end
+
+ it "discards a person without a user" do
+ person = create(:person, user: nil)
+
+ described_class.new(person).archive!
+
+ expect(person.reload).to be_discarded
+ end
+
+ it "blocks a discarded user from authenticating" do
+ person = create(:person)
+
+ described_class.new(person).archive!
+
+ expect(person.user.reload.active_for_authentication?).to be false
+ end
+ end
+
+ describe "#restore!" do
+ it "undiscards the person and their user together" do
+ person = create(:person)
+ user = person.user
+ described_class.new(person).archive!
+
+ described_class.new(person).restore!
+
+ expect(person.reload).to be_kept
+ expect(user.reload).to be_kept
+ end
+ end
+end