From bbd4d3e62df13194106eecb35464253d4a789237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sun, 29 Jan 2023 04:19:04 +0100
Subject: [PATCH] Render components instead of partials in headers

We were using partials to render components in order to ease the
transition of custom code from earlier versions of Consul. However,
that was back in Consul 1.4, and now these views looked a bit messy
since they sometimes rendered components and sometimes they
rendered partials.
---
 app/components/layout/admin_header_component.html.erb | 2 +-
 app/views/layouts/_header.html.erb                    | 6 +++---
 app/views/shared/_locale_switcher.html.erb            | 1 -
 app/views/shared/_top_links.html.erb                  | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 app/views/shared/_locale_switcher.html.erb
 delete mode 100644 app/views/shared/_top_links.html.erb

diff --git a/app/components/layout/admin_header_component.html.erb b/app/components/layout/admin_header_component.html.erb
index 457594448..9975ed46d 100644
--- a/app/components/layout/admin_header_component.html.erb
+++ b/app/components/layout/admin_header_component.html.erb
@@ -1,6 +1,6 @@
 <header class="header">
   <div class="top-links">
-    <%= render "shared/locale_switcher" %>
+    <%= render Layout::LocaleSwitcherComponent.new %>
 
     <%= link_to root_path do %>
       <%= t("admin.dashboard.index.back", org: setting["org_name"]) %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index bdbbf3dde..f55bb1031 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -4,9 +4,9 @@
   <% end %>
 
   <div class="top-links">
-    <%= render "shared/locale_switcher" %>
+    <%= render Layout::LocaleSwitcherComponent.new %>
     <div class="hide-for-small-only">
-      <%= render "shared/top_links" %>
+      <%= render Layout::TopLinksComponent.new %>
     </div>
   </div>
 
@@ -23,7 +23,7 @@
       <div class="show-for-small-only">
         <div class="subnavigation subnavigation-with-top-links">
           <%= render Layout::SubnavigationComponent.new %>
-          <%= render "shared/top_links" %>
+          <%= render Layout::TopLinksComponent.new %>
         </div>
       </div>
     <% end %>
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
deleted file mode 100644
index 175443cfe..000000000
--- a/app/views/shared/_locale_switcher.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render Layout::LocaleSwitcherComponent.new %>
diff --git a/app/views/shared/_top_links.html.erb b/app/views/shared/_top_links.html.erb
deleted file mode 100644
index b5d5cd7a3..000000000
--- a/app/views/shared/_top_links.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render Layout::TopLinksComponent.new %>