Add Instance class to list admin records (#3443)

diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index b8f170ec28555ea9f50d623d5d315898b67d686f..ac93248a8563f1f6810b88ba31396dd727a73a0a 100644 (file)
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -3,13 +3,18 @@
 module Admin
   class InstancesController < BaseController
     def index
-      @instances = ordered_instances.page(params[:page])
+      @instances = ordered_instances
     end
 
     private
 
+    def paginated_instances
+      Account.remote.by_domain_accounts.page(params[:page])
+    end
+    helper_method :paginated_instances
+
     def ordered_instances
-      Account.remote.by_domain_accounts
+      paginated_instances.map { |account| Instance.new(account) }
     end
   end
 end

diff --git a/app/models/instance.rb b/app/models/instance.rb
new file mode 100644 (file)
index 0000000..6d5c9c2
--- /dev/null
+++ b/app/models/instance.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Instance
+  include ActiveModel::Model
+
+  attr_accessor :domain, :accounts_count
+
+  def initialize(account)
+    @domain = account.domain
+    @accounts_count = account.accounts_count
+  end
+end

diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index e5955e6bf7e2add7ea51cfd610c195f21435c9c5..be21d6bf7b88ff5a5056e2619f6f790005075ef0 100644 (file)
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -7,6 +7,6 @@
       %th= t('admin.instances.domain_name')
       %th= t('admin.instances.account_count')
   %tbody
-    = render partial: 'instance', collection: @instances
+    = render @instances
 
-= paginate @instances
+= paginate paginated_instances