From a2d48d6527867cc38d7e94f356e45b8c45d64ceb Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 21 Jul 2025 11:55:15 +0300
Subject: [PATCH] Replace role_icons helper with erb template

Goes in the opposite direction of 75300566e123c36599398cdd2e33f7b3e4e49808. The reasons for that commit are unclear because it produced larger code that later had to use safe_join.
---
 app/helpers/user_roles_helper.rb       |  4 --
 app/views/users/_role_icons.html.erb   |  3 +
 app/views/users/show.html.erb          |  5 +-
 test/helpers/user_roles_helper_test.rb | 87 --------------------------
 4 files changed, 7 insertions(+), 92 deletions(-)
 create mode 100644 app/views/users/_role_icons.html.erb

diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb
index 02017bdb9..0e72d4102 100644
--- a/app/helpers/user_roles_helper.rb
+++ b/app/helpers/user_roles_helper.rb
@@ -1,8 +1,4 @@
 module UserRolesHelper
-  def role_icons(user)
-    safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ")
-  end
-
   def role_icon(user, role)
     if current_user&.administrator?
       if user.role?(role)
diff --git a/app/views/users/_role_icons.html.erb b/app/views/users/_role_icons.html.erb
new file mode 100644
index 000000000..785b9d16c
--- /dev/null
+++ b/app/views/users/_role_icons.html.erb
@@ -0,0 +1,3 @@
+<% UserRole::ALL_ROLES.each do |role| %>
+  <%= role_icon @user, role %>
+<% end %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index f9b0a61ed..c57e7a654 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -11,7 +11,10 @@
       <% end %>
     </div>
     <div class="col">
-      <h1><%= @user.display_name %> <%= role_icons(@user) %></h1>
+      <h1>
+        <%= @user.display_name %>
+        <%= render "role_icons" %>
+      </h1>
       <% if current_user and @user.id == current_user.id %>
         <!-- Displaying user's own profile page -->
         <nav class='secondary-actions'>
diff --git a/test/helpers/user_roles_helper_test.rb b/test/helpers/user_roles_helper_test.rb
index 3b63889a3..3d84f8423 100644
--- a/test/helpers/user_roles_helper_test.rb
+++ b/test/helpers/user_roles_helper_test.rb
@@ -82,91 +82,4 @@ class UserRolesHelperTest < ActionView::TestCase
       end
     end
   end
-
-  def test_role_icons_normal
-    self.current_user = create(:user)
-
-    icons = role_icons(current_user)
-    assert_dom_equal "", icons
-
-    icons = role_icons(create(:moderator_user))
-    icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-    assert_dom icons_dom, "svg:root > title", :text => "This user is a moderator"
-
-    icons = role_icons(create(:importer_user))
-    icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-    assert_dom icons_dom, "svg:root > title", :text => "This user is a importer"
-
-    icons = role_icons(create(:super_user))
-    icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-    assert_dom icons_dom, "svg:root", :count => 3 do
-      assert_dom "> title", :text => "This user is an administrator"
-      assert_dom "> title", :text => "This user is a moderator"
-      assert_dom "> title", :text => "This user is a importer"
-    end
-  end
-
-  def test_role_icons_administrator
-    self.current_user = create(:administrator_user)
-
-    create(:user) do |user|
-      icons = role_icons(user)
-      icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-      assert_dom icons_dom, "a:root", :count => 3
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'administrator')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant administrator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'moderator')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant moderator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'importer')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant importer access"
-      end
-    end
-
-    create(:moderator_user) do |user|
-      icons = role_icons(user)
-      icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-      assert_dom icons_dom, "a:root", :count => 3
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'administrator')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant administrator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'moderator')}'][data-method='delete']" do
-        assert_dom "> svg > title", :text => "Revoke moderator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'importer')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant importer access"
-      end
-    end
-
-    create(:importer_user) do |user|
-      icons = role_icons(user)
-      icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-      assert_dom icons_dom, "a:root", :count => 3
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'administrator')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant administrator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'moderator')}'][data-method='post']" do
-        assert_dom "> svg > title", :text => "Grant moderator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'importer')}'][data-method='delete']" do
-        assert_dom "> svg > title", :text => "Revoke importer access"
-      end
-    end
-
-    create(:super_user) do |user|
-      icons = role_icons(user)
-      icons_dom = Rails::Dom::Testing.html_document_fragment.parse(icons)
-      assert_dom icons_dom, "a:root", :count => 3
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'administrator')}'][data-method='delete']" do
-        assert_dom "> svg > title", :text => "Revoke administrator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'moderator')}'][data-method='delete']" do
-        assert_dom "> svg > title", :text => "Revoke moderator access"
-      end
-      assert_dom icons_dom, "a:root[href='#{user_role_path(user, 'importer')}'][data-method='delete']" do
-        assert_dom "> svg > title", :text => "Revoke importer access"
-      end
-    end
-  end
 end
-- 
2.39.5