From 83104f8d2b081cc09852b5efc7b69bf2442a404e Mon Sep 17 00:00:00 2001
From: Ridhwana <Ridhwana.Khan16@gmail.com>
Date: Fri, 8 Apr 2022 14:48:39 +0200
Subject: [PATCH] Refactor the way we show organizations on the member index
 view (#17177)

---
 app/views/admin/users/_member_index.html.erb  | 20 +++++--------------
 .../admin/users/index/_organizations.html.erb |  5 +++++
 2 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 app/views/admin/users/index/_organizations.html.erb

diff --git a/app/views/admin/users/_member_index.html.erb b/app/views/admin/users/_member_index.html.erb
index f9a6fa9ac..7d4e796f8 100644
--- a/app/views/admin/users/_member_index.html.erb
+++ b/app/views/admin/users/_member_index.html.erb
@@ -9,7 +9,7 @@
     <div class="block xl:hidden fs-s">
       <h2 class="member-data-heading fs-s py-2 -mx-4 px-6 color-base-60">Members</h2>
       <ul class="list-none mx-2">
-        <% @users.includes([:organization_memberships]).each do |user| %>
+        <% @users.includes([:organizations]).each do |user| %>
           <li class="py-4">
             <article>
               <header class="flex items-center justify-between m:justify-start mb-2">
@@ -79,13 +79,7 @@
                   </div>
                 </dl>
                 <div>
-                  <% if user.organization_memberships.any? %>
-                    <% user.organization_memberships.includes([:organization]).each do |org_membership| %>
-                      <span class="crayons-hover-tooltip" data-tooltip="<%= org_membership.organization.name %>">
-                        <img src="<%= org_membership.organization.profile_image_url_for(length: 64) %>" width="32" height="32" alt="<%= org_membership.organization.name %>" class="c-link crayons-logo crayons-logo--l">
-                      </span>
-                    <% end %>
-                  <% end %>
+                  <%= render "admin/users/index/organizations", organizations: user.organizations %>
                 </div>
               </div>
             </article>
@@ -107,7 +101,7 @@
         </tr>
       </thead>
       <tbody class="crayons-card">
-        <% @users.includes([:organization_memberships]).each do |user| %>
+        <% @users.includes([:organizations]).each do |user| %>
         <tr>
           <td>
             <div class="flex s:items-start flex-col s:flex-row">
@@ -142,12 +136,8 @@
           </p>
           </td>
           <td>
-            <% if user.organization_memberships.any? %>
-              <% user.organization_memberships.includes([:organization]).each do |org_membership| %>
-                <span class="crayons-hover-tooltip" data-tooltip="<%= org_membership.organization.name %>">
-                  <img src="<%= org_membership.organization.profile_image_url_for(length: 64) %>" width="32" height="32" alt="<%= org_membership.organization.name %>" class="c-link crayons-logo crayons-logo--l">
-                </span>
-              <% end %>
+            <% if user.organizations.any? %>
+              <%= render "admin/users/index/organizations", organizations: user.organizations %>
             <% else %>
               -
             <% end %>
diff --git a/app/views/admin/users/index/_organizations.html.erb b/app/views/admin/users/index/_organizations.html.erb
new file mode 100644
index 000000000..e74c2809f
--- /dev/null
+++ b/app/views/admin/users/index/_organizations.html.erb
@@ -0,0 +1,5 @@
+  <% organizations.each do |organization| %>
+    <span class="crayons-hover-tooltip" data-tooltip="<%= organization.name %>">
+      <img src="<%= organization.profile_image_url_for(length: 64) %>" width="32" height="32" alt="<%= organization.name %>" class="c-link crayons-logo crayons-logo--l">
+    </span>
+  <% end %>