consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use link list helper in admin menus

Browse Source 
For now we're not including lists with nested lists.
This commit is contained in:
Javi Martín
2020-12-05 17:35:21 +01:00
parent c156621a4c
commit 55d2cfe5b1
9 changed files with 340 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

363
app/components/admin/menu_component.html.erb
View File

@@ -35,28 +35,29 @@
<li>
<a href="#" class="booths-link"><%= t("admin.menu.title_booths") %></a>
<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>
<li <%= "class=is-active" if controller_name == "booths" &&
action_name != "available" %>>
<%= link_to t("admin.menu.poll_booths"), admin_booths_path %>
</li>
<li <%= "class=is-active" if (controller_name == "polls" &&
action_name == "booth_assignments") ||
controller_name == "booth_assignments" &&
action_name == "manage" %>>
<%= link_to t("admin.menu.poll_booth_assignments"), booth_assignments_admin_polls_path %>
</li>
<li <%= "class=is-active" if %w[shifts booths].include?(controller_name) &&
%w[available new].include?(action_name) %>>
<%= link_to t("admin.menu.poll_shifts"), available_admin_booths_path %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.poll_officers"),
admin_officers_path,
%w[officers officer_assignments].include?(controller_name)
],
[
t("admin.menu.poll_booths"),
admin_booths_path,
controller_name == "booths" && action_name != "available"
],
[
t("admin.menu.poll_booth_assignments"),
booth_assignments_admin_polls_path,
controller_name == "polls" && action_name == "booth_assignments" || controller_name == "booth_assignments" && action_name == "manage"
],
[
t("admin.menu.poll_shifts"),
available_admin_booths_path,
%w[shifts booths].include?(controller_name) && %w[available new].include?(action_name)
],
id: "booths_menu", class: ("is-active" if booths?)
) %>
</li>
<% if feature?(:signature_sheets) %>
@@ -67,120 +68,151 @@
<li>
<a href="#" class="messages-link"><%= t("admin.menu.messaging_users") %></a>
<ul id="messaging_users_menu" <%= "class=is-active" if messages_menu_active? %>>
<li <%= "class=is-active" if controller_name == "newsletters" %>>
<%= link_to t("admin.menu.newsletters"), admin_newsletters_path %>
</li>
<li <%= "class=is-active" if controller_name == "admin_notifications" %>>
<%= link_to t("admin.menu.admin_notifications"), admin_admin_notifications_path %>
</li>
<li <%= "class=is-active" if controller_name == "system_emails" %>>
<%= link_to t("admin.menu.system_emails"), admin_system_emails_path %>
</li>
<li <%= "class=is-active" if controller_name == "emails_download" %>>
<%= link_to t("admin.menu.emails_download"), admin_emails_download_index_path %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.newsletters"),
admin_newsletters_path,
controller_name == "newsletters"
],
[
t("admin.menu.admin_notifications"),
admin_admin_notifications_path,
controller_name == "admin_notifications"
],
[
t("admin.menu.system_emails"),
admin_system_emails_path,
controller_name == "system_emails"
],
[
t("admin.menu.emails_download"),
admin_emails_download_index_path,
controller_name == "emails_download"
],
id: "messaging_users_menu", class: ("is-active" if messages_menu_active?)
) %>
</li>
<li>
<a href="#" class="site-customization-link"><%= t("admin.menu.title_site_customization") %></a>
<ul <%= "class=is-active" if customization? &&
controller.class.parent != Admin::Poll::Questions::Answers %>>
<li <%= "class=is-active" if homepage? %>>
<%= link_to t("admin.menu.site_customization.homepage"), admin_homepage_path %>
</li>
<li <%= "class=is-active" if pages? || controller_name == "pages" %>>
<%= link_to t("admin.menu.site_customization.pages"), admin_site_customization_pages_path %>
</li>
<li <%= "class=is-active" if controller_name == "banners" %>>
<%= link_to t("admin.menu.banner"), admin_banners_path %>
</li>
<li <%= "class=is-active" if controller_name == "information_texts" %>>
<%= link_to t("admin.menu.site_customization.information_texts"), admin_site_customization_information_texts_path %>
</li>
<li <%= "class=is-active" if controller_name == "documents" %>>
<%= link_to t("admin.menu.site_customization.documents"),
admin_site_customization_documents_path %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.site_customization.homepage"),
admin_homepage_path,
homepage?
],
[
t("admin.menu.site_customization.pages"),
admin_site_customization_pages_path,
pages? || controller_name == "pages"
],
[
t("admin.menu.banner"),
admin_banners_path,
controller_name == "banners"
],
[
t("admin.menu.site_customization.information_texts"),
admin_site_customization_information_texts_path,
controller_name == "information_texts"
],
[
t("admin.menu.site_customization.documents"),
admin_site_customization_documents_path,
controller_name == "documents"
],
class: ("is-active" if customization? && controller.class.parent != Admin::Poll::Questions::Answers)
) %>
</li>
<li>
<a href="#" class="moderated-content-link"><%= t("admin.menu.title_moderated_content") %></a>
<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 %>
</li>
<% end %>
<% if feature?(:debates) %>
<li <%= "class=is-active" if controller_name == "hidden_debates" %>>
<%= link_to t("admin.menu.hidden_debates"), admin_hidden_debates_path %>
</li>
<% end %>
<% if feature?(:budgets) %>
<li <%= "class=is-active" if controller_name == "hidden_budget_investments" %>>
<%= link_to t("admin.menu.hidden_budget_investments"), admin_hidden_budget_investments_path %>
</li>
<% end %>
<li <%= "class=is-active" if controller_name == "hidden_comments" %>>
<%= link_to t("admin.menu.hidden_comments"), admin_hidden_comments_path %>
</li>
<li <%= "class=is-active" if controller_name == "hidden_proposal_notifications" %>>
<%= link_to t("admin.menu.hidden_proposal_notifications"), admin_hidden_proposal_notifications_path %>
</li>
<li <%= "class=is-active" if controller_name == "hidden_users" %>>
<%= link_to t("admin.menu.hidden_users"), admin_hidden_users_path %>
</li>
<li <%= "class=is-active" if controller_name == "activity" %>>
<%= link_to t("admin.menu.activity"), admin_activity_path %>
</li>
</ul>
<%= link_list(
(
[
t("admin.menu.hidden_proposals"),
admin_hidden_proposals_path,
controller_name == "hidden_proposals"
] if feature?(:proposals)
),
(
[
t("admin.menu.hidden_debates"),
admin_hidden_debates_path,
controller_name == "hidden_debates"
] if feature?(:debates)
),
(
[
t("admin.menu.hidden_budget_investments"),
admin_hidden_budget_investments_path,
controller_name == "hidden_budget_investments"
] if feature?(:budgets)
),
[
t("admin.menu.hidden_comments"),
admin_hidden_comments_path,
controller_name == "hidden_comments"
],
[
t("admin.menu.hidden_proposal_notifications"),
admin_hidden_proposal_notifications_path,
controller_name == "hidden_proposal_notifications"
],
[
t("admin.menu.hidden_users"),
admin_hidden_users_path,
controller_name == "hidden_users"
],
[
t("admin.menu.activity"),
admin_activity_path,
controller_name == "activity"
],
class: ("is-active" if moderated_content?)
) %>
</li>
<li>
<a href="#" class="profiles-link"><%= t("admin.menu.title_profiles") %></a>
<ul <%= "class=is-active" if profiles? %>>
<li <%= "class=is-active" if controller_name == "administrators" %>>
<%= link_to t("admin.menu.administrators"), admin_administrators_path %>
</li>
<li <%= "class=is-active" if controller_name == "organizations" %>>
<%= link_to t("admin.menu.organizations"), admin_organizations_path %>
</li>
<li <%= "class=is-active" if controller_name == "officials" %>>
<%= link_to t("admin.menu.officials"), admin_officials_path %>
</li>
<li <%= "class=is-active" if controller_name == "moderators" %>>
<%= link_to t("admin.menu.moderators"), admin_moderators_path %>
</li>
<li <%= "class=is-active" if controller_name == "valuators" %>>
<%= link_to t("admin.menu.valuators"), admin_valuators_path %>
</li>
<li <%= "class=is-active" if controller_name == "managers" %>>
<%= link_to t("admin.menu.managers"), admin_managers_path %>
</li>
<li <%= "class=is-active" if controller_name == "users" %>>
<%= link_to t("admin.menu.users"), admin_users_path %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.administrators"),
admin_administrators_path,
controller_name == "administrators"
],
[
t("admin.menu.organizations"),
admin_organizations_path,
controller_name == "organizations"
],
[
t("admin.menu.officials"),
admin_officials_path,
controller_name == "officials"
],
[
t("admin.menu.moderators"),
admin_moderators_path,
controller_name == "moderators"
],
[
t("admin.menu.valuators"),
admin_valuators_path,
controller_name == "valuators"
],
[
t("admin.menu.managers"),
admin_managers_path,
controller_name == "managers"
],
[
t("admin.menu.users"),
admin_users_path,
controller_name == "users"
],
class: ("is-active" if profiles?)
) %>
</li>
<li class="<%= "is-active" if controller_name == "stats" %>">
@@ -189,45 +221,54 @@
<li>
<a href="#" class="settings-link"><%= t("admin.menu.title_settings") %></a>
<ul <%= "class=is-active" if settings? %>>
<li <%= "class=is-active" if controller_name == "settings" %>>
<%= link_to t("admin.menu.settings"), admin_settings_path %>
</li>
<li <%= "class=is-active" if controller_name == "tags" %>>
<%= link_to t("admin.menu.proposals_topics"), admin_tags_path %>
</li>
<li <%= "class=is-active" if controller_name == "geozones" %>>
<%= link_to t("admin.menu.geozones"), admin_geozones_path %>
</li>
<li <%= "class=is-active" if controller_name == "images" &&
controller.class.parent != Admin::Poll::Questions::Answers %>>
<%= link_to t("admin.menu.site_customization.images"), admin_site_customization_images_path %>
</li>
<li <%= "class=is-active" if controller_name == "content_blocks" %>>
<%= link_to t("admin.menu.site_customization.content_blocks"), admin_site_customization_content_blocks_path %>
</li>
<li <%= "class=is-active" if local_census_records? %>>
<%= link_to t("admin.menu.local_census_records"), admin_local_census_records_path %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.settings"),
admin_settings_path,
controller_name == "settings"
],
[
t("admin.menu.proposals_topics"),
admin_tags_path,
controller_name == "tags"
],
[
t("admin.menu.geozones"),
admin_geozones_path,
controller_name == "geozones"
],
[
t("admin.menu.site_customization.images"),
admin_site_customization_images_path,
controller_name == "images" && controller.class.parent != Admin::Poll::Questions::Answers
],
[
t("admin.menu.site_customization.content_blocks"),
admin_site_customization_content_blocks_path,
controller_name == "content_blocks"
],
[
t("admin.menu.local_census_records"),
admin_local_census_records_path,
local_census_records?
],
class: ("is-active" if settings?)
) %>
</li>
<li>
<a href="#" class="dashboard-link"><%= t("admin.menu.dashboard") %></a>
<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>
<li <%= "class=is-active" if controller_name == "administrator_tasks" %>>
<%= link_to admin_dashboard_administrator_tasks_path do %>
<%= t("admin.menu.administrator_tasks") %>
<% end %>
</li>
</ul>
<%= link_list(
[
t("admin.menu.dashboard_actions"),
admin_dashboard_actions_path,
controller_name == "actions"
],
[
t("admin.menu.administrator_tasks"),
admin_dashboard_administrator_tasks_path,
controller_name == "administrator_tasks"
],
class: ("is-active" if dashboard?)
) %>
</li>
</ul>

2
app/components/admin/menu_component.rb
View File

@@ -1,4 +1,6 @@
class Admin::MenuComponent < ApplicationComponent
include LinkListHelper
private
def moderated_content?

14
app/components/sdg_management/menu_component.html.erb
View File

@@ -1,5 +1,9 @@
<ul class="sdg-content-menu">
<li class="<%= "is-active" if sdg? %>">
<%= link_to t("sdg_management.menu.sdg_content"), sdg_management_goals_path, class: "goals-link" %>
</li>
</ul>
<%= link_list(
[
t("sdg_management.menu.sdg_content"),
sdg_management_goals_path,
sdg?,
class: "goals-link"
],
class: "sdg-content-menu"
) %>

2
app/components/sdg_management/menu_component.rb
View File

@@ -1,4 +1,6 @@
class SDGManagement::MenuComponent < ApplicationComponent
include LinkListHelper
private
def sdg?

4
app/helpers/link_list_helper.rb
View File

@@ -3,8 +3,8 @@ module LinkListHelper
return "" if links.compact.empty?
tag.ul(options) do
safe_join(links.compact.map do |text, url, **link_options|
tag.li do
safe_join(links.compact.map do |text, url, is_active = false, **link_options|
tag.li(class: ("is-active" if is_active)) do
link_to text, url, link_options
end
end)

79
app/views/management/_menu.html.erb
View File

@@ -1,41 +1,50 @@
<ul id="admin_menu" data-accordion-menu>
<li class="section-title">
<a href="#" class="users-link"><%= t("management.menu.users") %></a>
<ul class="is-active">
<li <%= "class=is-active" if menu_users? %>>
<%= link_to t("management.menu.select_user"), management_document_verifications_path %>
</li>
<% if managed_user.email %>
<li <%= "class=is-active" if menu_edit_password_email? %>>
<%= link_to t("management.account.menu.reset_password_email"), edit_password_email_management_account_path %>
</li>
<% end %>
<li <%= "class=is-active" if menu_edit_password_manually? %>>
<%= link_to t("management.account.menu.reset_password_manually"), edit_password_manually_management_account_path %>
</li>
<li <%= "class=is-active" if menu_create_proposal? %>>
<%= link_to t("management.menu.create_proposal"), new_management_proposal_path %>
</li>
<li <%= "class=is-active" if menu_support_proposal? %>>
<%= link_to t("management.menu.support_proposals"), management_proposals_path %>
</li>
<% if Setting["process.budgets"] %>
<li <%= "class=is-active" if menu_create_investments? %>>
<%= link_to t("management.menu.create_budget_investment"), create_investments_management_budgets_path %>
</li>
<li <%= "class=is-active" if menu_support_investments? %>>
<%= link_to t("management.menu.support_budget_investments"), support_investments_management_budgets_path %>
</li>
<% end %>
</li>
</ul>
<%= link_list(
[
t("management.menu.select_user"),
management_document_verifications_path,
menu_users?
],
(
[
t("management.account.menu.reset_password_email"),
edit_password_email_management_account_path,
menu_edit_password_email?
] if managed_user.email
),
[
t("management.account.menu.reset_password_manually"),
edit_password_manually_management_account_path,
menu_edit_password_manually?
],
[
t("management.menu.create_proposal"),
new_management_proposal_path,
menu_create_proposal?
],
[
t("management.menu.support_proposals"),
management_proposals_path,
menu_support_proposal?
],
(
[
t("management.menu.create_budget_investment"),
create_investments_management_budgets_path,
menu_create_investments?
] if Setting["process.budgets"]
),
(
[
t("management.menu.support_budget_investments"),
support_investments_management_budgets_path,
menu_support_investments?
] if Setting["process.budgets"]
),
class: "is-active"
) %>
</li>
<% if Setting["process.budgets"] %>

83
app/views/moderation/_menu.html.erb
View File

@@ -1,35 +1,48 @@
<ul id="moderation_menu">
<li>
<%= link_to t("moderation.dashboard.index.title"), moderation_root_path %>
</li>
<% if feature?(:proposals) %>
<li <%= "class=is-active" if controller_name == "proposals" %>>
<%= link_to t("moderation.menu.proposals"), moderation_proposals_path, class: "proposals-link" %>
</li>
<li <%= "class=is-active" if controller_name == "proposal_notifications" %>>
<%= link_to t("moderation.menu.proposal_notifications"), moderation_proposal_notifications_path, class: "proposal-notifications-link" %>
</li>
<% end %>
<% if feature?(:debates) %>
<li <%= "class=is-active" if controller_name == "debates" %>>
<%= link_to t("moderation.menu.flagged_debates"), moderation_debates_path, class: "debates-link" %>
</li>
<% end %>
<% if feature?(:budgets) %>
<li <%= "class=is-active" if controller_name == "investments" %>>
<%= link_to t("moderation.menu.flagged_investments"), moderation_budget_investments_path, class: "investments-link" %>
</li>
<% end %>
<li <%= "class=is-active" if controller_name == "comments" %>>
<%= link_to t("moderation.menu.flagged_comments"), moderation_comments_path, class: "comments-link" %>
</li>
<li <%= "class=is-active" if controller_name == "users" %>>
<%= link_to t("moderation.menu.users"), moderation_users_path, class: "users-link" %>
</li>
</ul>
<%= link_list(
[t("moderation.dashboard.index.title"), moderation_root_path],
(
[
t("moderation.menu.proposals"),
moderation_proposals_path,
controller_name == "proposals",
class: "proposals-link"
] if feature?(:proposals)
),
(
[
t("moderation.menu.proposal_notifications"),
moderation_proposal_notifications_path,
controller_name == "proposal_notifications",
class: "proposal-notifications-link"
] if feature?(:proposals)
),
(
[
t("moderation.menu.flagged_debates"),
moderation_debates_path,
controller_name == "debates",
class: "debates-link"
] if feature?(:debates)
),
(
[
t("moderation.menu.flagged_investments"),
moderation_budget_investments_path,
controller_name == "investments",
class: "investments-link"
] if feature?(:budgets)
),
[
t("moderation.menu.flagged_comments"),
moderation_comments_path,
controller_name == "comments",
class: "comments-link"
],
[
t("moderation.menu.users"),
moderation_users_path,
controller_name == "users",
class: "users-link"
],
id: "moderation_menu"
) %>

16
app/views/valuation/_menu.html.erb
View File

@@ -1,11 +1,5 @@
<ul id="valuation_menu">
<li>
<%= link_to t("valuation.menu.title"), valuation_root_path %>
</li>
<% if feature?(:budgets) %>
<li <%= "class=is-active" if controller_name == "budget_investments" %>>
<%= link_to t("valuation.menu.budgets"), valuation_budgets_path, class: "budgets-link" %>
</li>
<% end %>
</ul>
<%= link_list(
[t("valuation.menu.title"), valuation_root_path],
[t("valuation.menu.budgets"), valuation_budgets_path, controller_name == "budget_investments", class: "budgets-link"],
id: "valuation_menu"
) %>

26
spec/helpers/link_list_helper_spec.rb
View File

@@ -32,6 +32,32 @@ describe LinkListHelper do
expect(page).to have_css "a.root", count: 1, exact_text: "Home"
expect(page).to have_css "a#info", count: 1, exact_text: "Info"
end
it "accepts an optional condition to check the active element" do
render helper.link_list(
["Home", "/", false],
["Info", "/info", true],
["Help", "/help"]
)
expect(page).to have_css "li", count: 3
expect(page).to have_css "li.is-active", count: 1, exact_text: "Info"
end
it "allows passing both the active condition and link options" do
render helper.link_list(
["Home", "/", false, class: "root"],
["Info", "/info", true, id: "info"],
["Help", "/help", rel: "help"]
)
expect(page).to have_css "li", count: 3
expect(page).to have_css "li.is-active", count: 1, exact_text: "Info"
expect(page).to have_css "a.root", count: 1, exact_text: "Home"
expect(page).to have_css "a#info", count: 1, exact_text: "Info"
expect(page).to have_css "a[rel='help']", count: 1, exact_text: "Help"
end
end
attr_reader :content