From f9e110aa9b38cf37808f875827e56813eb94c4b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Sat, 20 Jun 2020 14:37:23 +0200
Subject: [PATCH] Simplify method names in admin menu component

We no longer need to use the `menu_` prefix, since now these methods
aren't helper methods anymore, and so their names won't collide with
other helpers.
---
 app/components/admin/menu_component.html.erb | 22 +++++++++---------
 app/components/admin/menu_component.rb       | 24 ++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/components/admin/menu_component.html.erb b/app/components/admin/menu_component.html.erb
index b7a85121c..5c2d3edd2 100644
--- a/app/components/admin/menu_component.html.erb
+++ b/app/components/admin/menu_component.html.erb
@@ -25,7 +25,7 @@
   </li>
 
   <% if feature?(:polls) %>
-    <li class="section-title <%= "is-active" if menu_polls? %>">
+    <li class="section-title <%= "is-active" if polls? %>">
       <%= link_to admin_polls_path do %>
         <span class="icon-checkmark-circle"></span>
         <strong><%= t("admin.menu.polls") %></strong>
@@ -43,7 +43,7 @@
   <% end %>
 
   <% if feature?(:budgets) %>
-    <li class="section-title <%= "is-active" if menu_budgets? %>">
+    <li class="section-title <%= "is-active" if budgets? %>">
       <%= link_to admin_budgets_path do %>
         <span class="icon-budget"></span>
         <strong><%= t("admin.menu.budgets") %></strong>
@@ -56,7 +56,7 @@
       <span class="icon-box"></span>
       <strong><%= t("admin.menu.title_booths") %></strong>
     </a>
-    <ul id="booths_menu" <%= "class=is-active" if menu_booths? %>>
+    <ul id="booths_menu" <%= "class=is-active" if booths? %>>
       <li <%= "class=is-active" if %w[officers officer_assignments].include?(controller_name) %>>
         <%= link_to t("admin.menu.poll_officers"), admin_officers_path %>
       </li>
@@ -117,14 +117,14 @@
       <span class="icon-edit"></span>
       <strong><%= t("admin.menu.title_site_customization") %></strong>
     </a>
-    <ul <%= "class=is-active" if menu_customization? &&
+    <ul <%= "class=is-active" if customization? &&
                                  controller.class.parent != Admin::Poll::Questions::Answers %>>
 
-      <li <%= "class=is-active" if menu_homepage? %>>
+      <li <%= "class=is-active" if homepage? %>>
         <%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %>
       </li>
 
-      <li <%= "class=is-active" if menu_pages? || controller_name == "pages" %>>
+      <li <%= "class=is-active" if pages? || controller_name == "pages" %>>
         <%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
       </li>
 
@@ -148,7 +148,7 @@
       <span class="icon-eye"></span>
       <strong><%= t("admin.menu.title_moderated_content") %></strong>
     </a>
-    <ul <%= "class=is-active" if menu_moderated_content? %>>
+    <ul <%= "class=is-active" if moderated_content? %>>
       <% if feature?(:proposals) %>
         <li <%= "class=is-active" if controller_name == "hidden_proposals" %>>
           <%= link_to t("admin.menu.hidden_proposals"), admin_hidden_proposals_path %>
@@ -190,7 +190,7 @@
       <span class="icon-organizations"></span>
       <strong><%= t("admin.menu.title_profiles") %></strong>
     </a>
-    <ul <%= "class=is-active" if menu_profiles? %>>
+    <ul <%= "class=is-active" if profiles? %>>
       <li <%= "class=is-active" if controller_name == "administrators" %>>
         <%= link_to t("admin.menu.administrators"), admin_administrators_path %>
       </li>
@@ -232,7 +232,7 @@
       <span class="icon-settings"></span>
       <strong><%= t("admin.menu.title_settings") %></strong>
     </a>
-    <ul <%= "class=is-active" if menu_settings? %>>
+    <ul <%= "class=is-active" if settings? %>>
       <li <%= "class=is-active" if controller_name == "settings" %>>
         <%= link_to t("admin.menu.settings"), admin_settings_path %>
       </li>
@@ -254,7 +254,7 @@
         <%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path %>
       </li>
 
-      <li <%= "class=is-active" if submenu_local_census_records? %>>
+      <li <%= "class=is-active" if local_census_records? %>>
         <%= link_to t("admin.menu.local_census_records"), admin_local_census_records_path %>
       </li>
     </ul>
@@ -264,7 +264,7 @@
       <span class="icon-check"></span>
       <strong><%= t("admin.menu.dashboard") %></strong>
     </a>
-    <ul <%= "class=is-active" if menu_dashboard? %>>
+    <ul <%= "class=is-active" if dashboard? %>>
       <li <%= "class=is-active" if controller_name == "actions" %>>
         <%= link_to t("admin.menu.dashboard_actions"), admin_dashboard_actions_path %>
       </li>
diff --git a/app/components/admin/menu_component.rb b/app/components/admin/menu_component.rb
index bb4f6ab92..d9dec8727 100644
--- a/app/components/admin/menu_component.rb
+++ b/app/components/admin/menu_component.rb
@@ -1,7 +1,7 @@
 class Admin::MenuComponent < ApplicationComponent
   private
 
-    def menu_moderated_content?
+    def moderated_content?
       moderated_sections.include?(controller_name) && controller.class.parent != Admin::Legislation
     end
 
@@ -10,50 +10,50 @@ class Admin::MenuComponent < ApplicationComponent
        "hidden_budget_investments", "hidden_proposal_notifications"]
     end
 
-    def menu_budgets?
+    def budgets?
       controller_name.starts_with?("budget")
     end
 
-    def menu_polls?
+    def polls?
       controller.class.parent == Admin::Poll::Questions::Answers ||
         %w[polls active_polls recounts results questions answers].include?(controller_name) &&
         action_name != "booth_assignments"
     end
 
-    def menu_booths?
+    def booths?
       %w[officers booths shifts booth_assignments officer_assignments].include?(controller_name) ||
         controller_name == "polls" && action_name == "booth_assignments"
     end
 
-    def menu_profiles?
+    def profiles?
       %w[administrators organizations officials moderators valuators managers users].include?(controller_name)
     end
 
-    def menu_settings?
+    def settings?
       controllers_names = ["settings", "tags", "geozones", "images", "content_blocks",
                            "local_census_records", "imports"]
       controllers_names.include?(controller_name) &&
         controller.class.parent != Admin::Poll::Questions::Answers
     end
 
-    def menu_customization?
+    def customization?
       ["pages", "banners", "information_texts", "documents"].include?(controller_name) ||
-        menu_homepage? || menu_pages?
+        homepage? || pages?
     end
 
-    def menu_homepage?
+    def homepage?
       ["homepage", "cards"].include?(controller_name) && params[:page_id].nil?
     end
 
-    def menu_pages?
+    def pages?
       ["pages", "cards"].include?(controller_name) && params[:page_id].present?
     end
 
-    def menu_dashboard?
+    def dashboard?
       ["actions", "administrator_tasks"].include?(controller_name)
     end
 
-    def submenu_local_census_records?
+    def local_census_records?
       controller_name == "local_census_records" ||
         (controller_name == "imports" && controller.class.parent == Admin::LocalCensusRecords)
     end