52cd70dfa3
On self-hosted instances without email configured, users created from Super Admin can get stuck in an unconfirmed state. This PR implements the default at the Super Admin frontend form layer, not in backend creation logic. What changed: - Added a custom `ConfirmedAtField` for Super Admin user forms. - Prefills `confirmed_at` with current time on the **New User** form (`GET /super_admin/users/new`). - Kept backend create behavior unchanged (`resource_class.new(resource_params)`), so API/manual payloads still behave normally. Behavior: - In Super Admin UI, `confirmed_at` is prefilled by default. - If someone wants an unconfirmed user, they can clear the `confirmed_at` field before saving. - If `confirmed_at` is omitted from payload entirely, the created user remains unconfirmed. Scope note: external signup flows are intentionally unchanged in this PR (`/api/v1/accounts`, `/api/v2/accounts`, and social/omniauth signup behavior are not modified). ## Demo https://github.com/user-attachments/assets/436abbb0-d4cf-49a6-a1b8-4b6aa85aa09f
111 lines
3.2 KiB
Ruby
111 lines
3.2 KiB
Ruby
require 'administrate/base_dashboard'
|
|
|
|
class UserDashboard < Administrate::BaseDashboard
|
|
# ATTRIBUTE_TYPES
|
|
# a hash that describes the type of each of the model's fields.
|
|
#
|
|
# Each different type represents an Administrate::Field object,
|
|
# which determines how the attribute is displayed
|
|
# on pages throughout the dashboard.
|
|
ATTRIBUTE_TYPES = {
|
|
account_users: Field::HasMany,
|
|
id: Field::Number.with_options(searchable: true),
|
|
avatar_url: AvatarField,
|
|
avatar: Field::ActiveStorage.with_options(
|
|
destroy_url: proc do |_namespace, _resource, attachment|
|
|
[:avatar_super_admin_user, { attachment_id: attachment.id }]
|
|
end
|
|
),
|
|
provider: Field::String,
|
|
uid: Field::String,
|
|
password: Field::Password,
|
|
sign_in_count: Field::Number,
|
|
current_sign_in_at: Field::DateTime,
|
|
last_sign_in_at: Field::DateTime,
|
|
current_sign_in_ip: Field::String,
|
|
last_sign_in_ip: Field::String,
|
|
confirmation_token: Field::String,
|
|
confirmed_at: ConfirmedAtField,
|
|
confirmation_sent_at: Field::DateTime,
|
|
unconfirmed_email: Field::String,
|
|
name: Field::String.with_options(searchable: true),
|
|
display_name: Field::String,
|
|
email: Field::String.with_options(searchable: true),
|
|
tokens: Field::String.with_options(searchable: false),
|
|
created_at: Field::DateTime,
|
|
updated_at: Field::DateTime,
|
|
pubsub_token: Field::String,
|
|
type: Field::Select.with_options(collection: [nil, 'SuperAdmin']),
|
|
accounts: CountField,
|
|
access_token: Field::HasOne
|
|
}.freeze
|
|
|
|
# COLLECTION_ATTRIBUTES
|
|
# an array of attributes that will be displayed on the model's index page.
|
|
#
|
|
# By default, it's limited to four items to reduce clutter on index pages.
|
|
# Feel free to add, remove, or rearrange items.
|
|
COLLECTION_ATTRIBUTES = %i[
|
|
id
|
|
avatar_url
|
|
name
|
|
email
|
|
accounts
|
|
type
|
|
].freeze
|
|
|
|
# SHOW_PAGE_ATTRIBUTES
|
|
# an array of attributes that will be displayed on the model's show page.
|
|
SHOW_PAGE_ATTRIBUTES = %i[
|
|
id
|
|
avatar_url
|
|
name
|
|
type
|
|
display_name
|
|
email
|
|
unconfirmed_email
|
|
created_at
|
|
updated_at
|
|
confirmed_at
|
|
account_users
|
|
access_token
|
|
].freeze
|
|
|
|
# FORM_ATTRIBUTES
|
|
# an array of attributes that will be displayed
|
|
# on the model's form (`new` and `edit`) pages.
|
|
FORM_ATTRIBUTES = %i[
|
|
name
|
|
avatar
|
|
display_name
|
|
email
|
|
password
|
|
confirmed_at
|
|
type
|
|
].freeze
|
|
|
|
# COLLECTION_FILTERS
|
|
# a hash that defines filters that can be used while searching via the search
|
|
# field of the dashboard.
|
|
#
|
|
# For example to add an option to search for open resources by typing "open:"
|
|
# in the search field:
|
|
#
|
|
# COLLECTION_FILTERS = {
|
|
# open: ->(resources) { resources.where(open: true) }
|
|
# }.freeze
|
|
COLLECTION_FILTERS = {
|
|
super_admin: ->(resources) { resources.where(type: 'SuperAdmin') },
|
|
confirmed: ->(resources) { resources.where.not(confirmed_at: nil) },
|
|
unconfirmed: ->(resources) { resources.where(confirmed_at: nil) },
|
|
recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
|
|
}.freeze
|
|
|
|
# Overwrite this method to customize how users are displayed
|
|
# across all pages of the admin dashboard.
|
|
#
|
|
def display_resource(user)
|
|
"##{user.id} #{user.name}"
|
|
end
|
|
end
|