Add invite filter (#5862)

diff --git a/app/controllers/admin/invites_controller.rb b/app/controllers/admin/invites_controller.rb
index 607588d901a5d4920321c1aefef42b59d8140a00..faccaa7c899da1be4084738991b065a0233810af 100644 (file)
--- a/app/controllers/admin/invites_controller.rb
+++ b/app/controllers/admin/invites_controller.rb
@@ -5,7 +5,7 @@ module Admin
     def index
       authorize :invite, :index?
 
-      @invites = Invite.includes(user: :account).page(params[:page])
+      @invites = filtered_invites.includes(user: :account).page(params[:page])
       @invite  = Invite.new
     end
 
@@ -35,5 +35,13 @@ module Admin
     def resource_params
       params.require(:invite).permit(:max_uses, :expires_in)
     end
+
+    def filtered_invites
+      InviteFilter.new(filter_params).results
+    end
+
+    def filter_params
+      params.permit(:available, :expired)
+    end
   end
 end

diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index e0fae9d9a2c217d9d26590ab0dae2a8cc4199ca4..73250cbf56e63d145f8a64cfd51ea2407185101b 100644 (file)
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -3,8 +3,9 @@
 module Admin::FilterHelper
   ACCOUNT_FILTERS = %i(local remote by_domain silenced suspended recent username display_name email ip).freeze
   REPORT_FILTERS = %i(resolved account_id target_account_id).freeze
+  INVITE_FILTER = %i(available expired).freeze
 
-  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS
+  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
     new_url = filtered_url_for(link_to_params)

diff --git a/app/models/invite.rb b/app/models/invite.rb
index 7626f4cfa14b9cdfa033c79eac99c9f2874ceb10..6907c1f1d8f31fbd5841a446fa2b229748e2fee7 100644 (file)
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -17,6 +17,9 @@ class Invite < ApplicationRecord
   belongs_to :user, required: true
   has_many :users, inverse_of: :invite
 
+  scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
+  scope :expired, -> { where.not(expires_at: nil).where('expires_at < ?', Time.now.utc) }
+
   before_validation :set_code
 
   attr_reader :expires_in

diff --git a/app/models/invite_filter.rb b/app/models/invite_filter.rb
new file mode 100644 (file)
index 0000000..7d89bad
--- /dev/null
+++ b/app/models/invite_filter.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class InviteFilter
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def results
+    scope = Invite.order(created_at: :desc)
+
+    params.each do |key, value|
+      scope.merge!(scope_for(key, value)) if value.present?
+    end
+
+    scope
+  end
+
+  private
+
+  def scope_for(key, _value)
+    case key.to_s
+    when 'available'
+      Invite.available
+    when 'expired'
+      Invite.expired
+    else
+      raise "Unknown filter: #{key}"
+    end
+  end
+end

diff --git a/app/views/admin/invites/index.html.haml b/app/views/admin/invites/index.html.haml
index 52a748fe0e880db18cff21bb3120a448781bfb22..944a6047141b8f3651c87b28a9383a3fc6a4b7d9 100644 (file)
--- a/app/views/admin/invites/index.html.haml
+++ b/app/views/admin/invites/index.html.haml
@@ -1,6 +1,14 @@
 - content_for :page_title do
   = t('admin.invites.title')
 
+.filters
+  .filter-subset
+    %strong= t('admin.invites.filter.title')
+    %ul
+      %li= filter_link_to t('admin.invites.filter.all'), available: nil, expired: nil
+      %li= filter_link_to t('admin.invites.filter.available'), available: 1, expired: nil
+      %li= filter_link_to t('admin.invites.filter.expired'), available: nil, expired: 1
+
 - if policy(:invite).create?
   %p= t('invites.prompt')
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2719a4f8ccacafb60a7e1d3163674e3148139e7c..5b9d43b9f346c002d40d9174d38b35cd0a700355 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -232,6 +232,11 @@ en:
       search: Search
       title: Known instances
     invites:
+      filter:
+        all: All
+        available: Available
+        expired: Expired
+        title: Filter
       title: Invites
     reports:
       action_taken_by: Action taken by