add-pagination-to-proprietor-account-show-tables

app/controllers/proprietor/accounts_controller.rb

@@ -20,6 +20,10 @@ def show
       add_breadcrumb t(:'hyrax.controls.home'), root_path
       add_breadcrumb t(:'hyrax.admin.sidebar.accounts'), proprietor_accounts_path
       add_breadcrumb @account.tenant, edit_proprietor_account_path(@account)
+
+      admin_page = params[:user_superadmin_page]
+      @current_superusers = User.where(email: @account.admin_emails).page(admin_page).per(5) if @account.admin_emails
+      @current_nonadmin_users = User.order('email').page(params[:user_page]).per(5)
     end
 
     # GET /accounts/new

app/views/proprietor/accounts/show.html.erb

@@ -58,6 +58,7 @@
       <div class="panel-body">
         <div class="tab-content clearfix">
           <div class="tab-pane active" id="current-admins-tab">
+          <% if @current_superusers.present? %>
             <table class="table table-striped">
               <thead>
                 <th><%= t('.current_admins.email') %></th>
@@ -70,7 +71,7 @@
                     <td></td>
                   </tr>
                 <% else %>
-                  <% @account.admin_emails.each do |email| %>
+                  <% @current_superusers.each do |email| %>
                     <tr>
                       <td><%= email %></td>
                       <td>
@@ -92,15 +93,21 @@
                 <% end %>
               </tbody>
             </table>
+            <%= page_entries_info(@current_superusers) %><br />
+            <%= paginate(@current_superusers, param_name: :user_superadmin_page, params: {anchor: 'current-admins-tab'}) %>
+            <% else %>
+              <p>There are currently no admins assigned to this tenant. Please add some.</p>
+            <% end %>
           </div>
           <div class="tab-pane" id="all-users-tab">
+          <% if @current_nonadmin_users.present? %>
             <table class="table table-striped">
               <thead>
                 <th><%= t('.current_admins.email') %></th>
                 <th><%= t('.current_admins.actions') %></th>
               </thead>
               <tbody>
-                <% User.all.each do |user| %>
+                <% @current_nonadmin_users.each do |user| %>
                   <tr>
                     <td><%= user.email %></td>
                     <td>
@@ -118,7 +125,11 @@
                 <% end %>
               </tbody>
             </table>
-
+            <%= page_entries_info(@current_nonadmin_users) %><br />
+            <%= paginate(@current_nonadmin_users, param_name: :user_page, params: {anchor: 'all-users-tab'}) %>
+            <% else %>
+              <p>There are currently no users added to this tenant. Please add some.</p>
+            <% end %>
           </div>
         </div>
       </div>

spec/controllers/proprietor/accounts_controller_spec.rb

@@ -60,6 +60,7 @@
 
     describe "GET #show" do
       it "assigns the requested account as @account" do
+        allow_any_instance_of(Account).to receive(:admin_emails).and_return([user.email])
         get :show, params: { id: account.to_param }
         expect(assigns(:account)).to eq(account)
       end
@@ -158,6 +159,7 @@
 
     describe "GET #show" do
       it "assigns the requested account as @account" do
+        allow_any_instance_of(Account).to receive(:admin_emails).and_return([user.email])
         get :show, params: { id: account.to_param }
         expect(assigns(:account)).to eq(account)
       end

spec/views/proprietor/accounts/show.html.erb_spec.rb

@@ -2,8 +2,8 @@
 
 RSpec.describe "proprietor/accounts/show", type: :view do
   let(:account) { FactoryBot.create(:account) }
-  let(:admin1) { build(:user) }
-  let(:admin2) { build(:user) }
+  let(:superadmin1) { FactoryBot.create(:superadmin, email: '[email protected]') }
+  let(:superadmin2) { FactoryBot.create(:superadmin, email: '[email protected]') }
 
   before do
     allow(Apartment::Tenant).to receive(:switch).with(account.tenant) do |&block|
@@ -30,21 +30,20 @@
       render
     end
 
-    it 'displays "No administrators exist"' do
-      expect(rendered).to have_content('No administrators exist')
+    it 'displays "No administrators message"' do
+      expect(rendered).to have_content('There are currently no admins assigned to this tenant. Please add some.')
     end
   end
 
   context 'with admin users' do
     before do
-      allow(account).to receive(:admin_emails).and_return([admin1.email, admin2.email])
+      allow(account).to receive(:admin_emails).and_return([superadmin1.email, superadmin2.email])
       render
     end
 
-    it 'displays each user email and a remove button' do
-      expect(rendered).to have_content(admin1.email)
-      expect(rendered).to have_content(admin2.email)
-      expect(rendered).to have_css("input[class='btn btn-danger'][value='Remove']")
+    it 'displays each admin email' do
+      expect(rendered).to match(/[email protected]/)
+      expect(rendered).to match(/[email protected]/)
     end
   end
 end