Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a helper to get active links #4285

Merged
merged 5 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions app/helpers/contents_list_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module ContentsListHelper
def contents_list(current_path, links)
links.map do |link|
content = {
href: link["href"],
text: link["text"],
}

content[:active] = true if current_path == link["href"]
content[:items] = contents_list(current_path, link["items"]) if link["items"].present?

content
end
end
end
20 changes: 10 additions & 10 deletions app/views/landing_page/blocks/_main_navigation.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@

<nav id="app-b-main-nav__nav">
<ul class="app-b-main-nav__ul">
<% block.data["links"].each do |link| %>
<% contents_list(request.path, block.data["links"]).each do |link| %>
<%
li_classes = "app-b-main-nav__listitem"
li_aria = { current: true } if link["active"]
li_aria = { current: true } if link[:active]
%>
<%= tag.li(class: li_classes, aria: li_aria) do %>
<%
link_classes = "app-b-main-nav__link govuk-link govuk-link--no-underline"
link_classes << " app-b-main-nav__link--active" if link["active"]
link_classes << " app-b-main-nav__link--active" if link[:active]
%>
<%= tag.a(href: link["link"], class: link_classes) do %>
<%= tag.a(href: link[:href], class: link_classes) do %>
<span class="app-b-main-nav__mobile-border"></span>
<%= link["label"] %>
<%= link[:text] %>
<% end %>
<% if link["children"] %>
<% if link[:items] %>
<ul class="app-b-main-nav__childlist">
<% link["children"].each do |child_link| %>
<% link[:items].each do |child_link| %>
<%
child_link_classes = "app-b-main-nav__link govuk-link govuk-link--no-underline"
child_link_classes << " app-b-main-nav__link--active" if child_link["active"]
child_link_classes << " app-b-main-nav__link--active" if child_link[:active]
%>
<li class="app-b-main-nav__listitem">
<%= tag.a(href: child_link["link"], class: child_link_classes) do %>
<%= tag.a(href: child_link[:href], class: child_link_classes) do %>
<span class="app-b-main-nav__mobile-border"></span>
<%= child_link["label"] %>
<%= child_link[:text] %>
<% end %>
</li>
<% end %>
Expand Down
20 changes: 8 additions & 12 deletions lib/data/landing_page_content_items/landing_page.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
blocks:
- type: main_navigation
links:
- label: Ipsums for Lorem
link: /ipsum
active: true
- label: Our Lorem
link: /our-lorem
active: false
- text: Ipsums for Lorem
href: /ipsum
- text: Our Lorem
href: /landing-page/sub-page-1
children:
- label: Child 1
link: /a
active: false
- label: Child 2
link: /b
active: false
- text: Child 1
href: /a
- text: Child 2
href: /b
title: Service name
title_link: /landing-page
- type: hero
Expand Down
13 changes: 13 additions & 0 deletions lib/data/landing_page_content_items/sub_page_1.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
blocks:
- type: main_navigation
links:
- text: Ipsums for Lorem
href: /ipsum
- text: Our Lorem
href: /landing-page/sub-page-1
children:
- text: Child 1
href: /a
- text: Child 2
href: /b
title: Service name
title_link: /landing-page
- type: govspeak
content: |
<h2>Sub Page 1</h2>
Expand Down
13 changes: 13 additions & 0 deletions spec/fixtures/landing_page.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
blocks:
- type: main_navigation
links:
- text: Ipsums for Lorem
href: /ipsum
- text: Our Lorem
href: /landing-page/sub-page-1
children:
- text: Child 1
href: /a
- text: Child 2
href: /b
title: Service name
title_link: /landing-page
- type: hero
image:
alt: "Placeholder alt text"
Expand Down
131 changes: 131 additions & 0 deletions spec/helpers/contents_list_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
RSpec.describe ContentsListHelper do
include ContentsListHelper

describe "#contents_list" do
let(:current_path) { "/active-page" }

it "returns a list of links" do
links = [{
"href" => "/landing-page",
"text" => "Landing page",
}]

expected = [{
href: "/landing-page",
text: "Landing page",
}]

expect(contents_list(current_path, links)).to eq(expected)
end

it "sets a link to active if it matches the current path" do
links = [{
"href" => "/active-page",
"text" => "Active page",
}]

expected = [{
href: "/active-page",
text: "Active page",
active: true,
}]

expect(contents_list(current_path, links)).to eq(expected)
end

context "when there are nested links" do
it "returns a list of nested links" do
links = [
{
"href" => "/landing-page",
"text" => "Landing page",
},
{
"href" => "/our-lorem",
"text" => "Our Lorem",
"items" => [
{
"href" => "/a",
"text" => "Child 1",
},
{
"href" => "/b",
"text" => "Child 2",
},
],
},
]

expected = [
{
href: "/landing-page",
text: "Landing page",
},
{
href: "/our-lorem",
text: "Our Lorem",
items: [
{
href: "/a",
text: "Child 1",
},
{
href: "/b",
text: "Child 2",
},
],
},
]

expect(contents_list(current_path, links)).to eq(expected)
end

it "sets nested link to active if it matches the current path" do
links = [
{
"href" => "/landing-page",
"text" => "Landing page",
},
{
"href" => "/our-lorem",
"text" => "Our Lorem",
"items" => [
{
"href" => "/a",
"text" => "Child 1",
},
{
"href" => "/active-page",
"text" => "Active page",
},
],
},
]

expected = [
{
href: "/landing-page",
text: "Landing page",
},
{
href: "/our-lorem",
text: "Our Lorem",
items: [
{
href: "/a",
text: "Child 1",
},
{
href: "/active-page",
text: "Active page",
active: true,
},
],
},
]

expect(contents_list(current_path, links)).to eq(expected)
end
end
end
end
6 changes: 6 additions & 0 deletions spec/system/landing_page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,11 @@

assert_selector ".landing-page .blocks-container"
end

it "renders main navigation" do
visit base_path

assert_selector ".app-b-main-nav .app-b-main-nav__heading-p"
end
end
end