app/controllers/admin/invitations_controller.rb

@@ -1,28 +1,12 @@
 class Admin::InvitationsController < Admin::BaseController
-  before_action :set_current_section
-
   def index
-    @username = params[:username].presence
-    accepted_scope = Invitation.used.order('used_at desc')
-    unused_scope = Invitation.unused
-
-    if @username
-      accepted_scope = accepted_scope.joins(:user).where(users: { cn: @username })
-      unused_scope = unused_scope.joins(:user).where(users: { cn: @username })
-    end
-
-    @pagy, @invitations_used = pagy(accepted_scope)
+    @current_section = :invitations
+    @pagy, @invitations_used = pagy(Invitation.used.order('used_at desc'))
 
     @stats = {
-      available: unused_scope.count,
-      accepted: accepted_scope.count,
-      users_with_referrals: accepted_scope.distinct.count(:user_id)
+      available: Invitation.unused.count,
+      accepted: @invitations_used.length,
+      users_with_referrals: Invitation.used.distinct.count(:user_id)
     }
   end
-
-  private
-
-    def set_current_section
-      @current_section = :invitations
-    end
 end

app/controllers/admin/users_controller.rb

@@ -24,10 +24,6 @@ class Admin::UsersController < Admin::BaseController
 
   # GET /admin/users/:username
   def show
-    @invitees = @user.invitees
-    @recent_invitees = @user.invitees.order(created_at: :desc).limit(5)
-    @more_invitees = (@invitees - @recent_invitees).count
-
     if Setting.lndhub_admin_enabled?
       @lndhub_user = @user.lndhub_user
     end

app/views/admin/_username_search_form.html.erb

@@ -1,11 +0,0 @@
-<%= form_with url: path, method: :get, local: true, class: "flex gap-1" do %>
-  <%= text_field_tag :username, @username, placeholder: 'Filter by username' %>
-  <%= button_tag type: 'submit', name: nil, title: "Filter", class: 'btn-md btn-icon btn-outline' do %>
-    <%= render partial: "icons/filter", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
-  <% end %>
-  <% if @username %>
-    <%= link_to path, title: "Remove filter", class: 'btn-md btn-icon btn-outline' do  %>
-      <%= render partial: "icons/x", locals: { custom_class: "text-red-600 h-4 w-4 inline" } %>
-    <% end %>
-  <% end %>
-<% end %>

app/views/admin/donations/index.html.erb

@@ -19,8 +19,17 @@
   </section>
 
   <section>
-    <%= render partial: "admin/username_search_form",
-               locals: { path: admin_donations_path } %>
+    <%= form_with url: admin_donations_path, method: :get, local: true, class: "flex gap-1" do %>
+      <%= text_field_tag :username, @username, placeholder: 'Filter by username' %>
+      <%= button_tag type: 'submit', name: nil, title: "Filter", class: 'btn-md btn-icon btn-outline' do %>
+        <%= render partial: "icons/filter", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %>
+      <% end %>
+      <% if @username %>
+        <%= link_to admin_donations_path, title: "Remove filter", class: 'btn-md btn-icon btn-outline' do  %>
+          <%= render partial: "icons/x", locals: { custom_class: "text-red-600 h-4 w-4 inline" } %>
+        <% end %>
+      <% end %>
+    <% end %>
   </section>
 
   <% if @pending_donations.present? %>

app/views/admin/invitations/index.html.erb

@@ -21,12 +21,6 @@
       ) %>
     <% end %>
   </section>
-
-  <section>
-    <%= render partial: "admin/username_search_form",
-               locals: { path: admin_invitations_path } %>
-  </section>
-
   <% if @invitations_used.any? %>
     <section>
       <h3>Accepted</h3>

app/views/admin/users/show.html.erb

@@ -99,13 +99,10 @@
           <tr>
             <th class="align-top">Invited users</th>
             <td class="align-top">
-            <% if @invitees.any? %>
+            <% if @user.invitees.length > 0 %>
               <ul class="mb-0">
-              <% @recent_invitees.each do |invitee| %>
-                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: "ks-text-link" %></li>
-              <% end %>
-              <% if @more_invitees > 0 %>
-                <li>and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn), class: "ks-text-link" %></li>
+              <% @user.invitees.order(cn: :asc).each do |invitee| %>
+                <li class="leading-none mb-2 last:mb-0"><%= link_to invitee.cn, admin_user_path(invitee.cn), class: 'ks-text-link' %></li>
               <% end %>
               </ul>
             <% else %>&mdash;<% end %>