Move support user primary nav to the service header

DFE-Digital · Oct 4, 2024 · 3dca5f4 · 3dca5f4
1 parent 80ced40
commit 3dca5f4
Show file tree

Hide file tree

Showing 71 changed files with 99 additions and 135 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -29,7 +29,10 @@
       <% header.with_product_name(name: service_name) %>
 
       <% if current_user %>
-        <% header.with_navigation_item(text: t(".your_account"), href: account_path) %>
+        <%# header.with_navigation_item(text: t(".your_account"), href: account_path) %>
+        <% if current_user.support_user? && current_service == :placements %>
+          <%= render "placements/support/header_navigation", header: %>
+        <% end %>
         <% header.with_navigation_item(text: t(".sign_out"), href: sign_out_path) %>
       <% end %>
     <% end %>

diff --git a/app/views/placements/support/_header_navigation.html.erb b/app/views/placements/support/_header_navigation.html.erb
@@ -0,0 +1,5 @@
+<%# locals: (header:) %>
+
+<% header.with_navigation_item(text: t(".organisations"), href: support_organisations_path, active: false) %>
+<% header.with_navigation_item(text: t(".users"), href: support_support_users_path, active: false) %>
+<% header.with_navigation_item(text: t(".settings"), href: placements_support_settings_path, active: false) %>
diff --git a/app/views/placements/support/mailers/index.html.erb b/app/views/placements/support/mailers/index.html.erb
@@ -1,5 +1,3 @@
-<% render "placements/support/primary_navigation", current_navigation: :settings %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_settings_path) %>
 <% end %>

diff --git a/app/views/placements/support/organisations/add_organisation/edit.html.erb b/app/views/placements/support/organisations/add_organisation/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/organisations/index.html.erb b/app/views/placements/support/organisations/index.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, t(".title", organisation_count: @pagy.count) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <div class="govuk-width-container" data-controller="filter">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">

diff --git a/app/views/placements/support/providers/new.html.erb b/app/views/placements/support/providers/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, @provider_form.errors.any? ? t(".title_with_error") : t(".title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_organisation_path) %>
 <% end %>

diff --git a/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb b/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/providers/partner_schools/index.html.erb b/app/views/placements/support/providers/partner_schools/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/providers/partner_schools/remove.html.erb b/app/views/placements/support/providers/partner_schools/remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", provider_name: @provider.name, school_name: @partner_school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_partner_school_path(@provider, @partner_school)) %>
 <% end %>

diff --git a/app/views/placements/support/providers/partner_schools/show.html.erb b/app/views/placements/support/providers/partner_schools/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", partner_school_name: @partner_school.name, provider_name: @provider.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_partner_schools_path) %>
 <% end %>

diff --git a/app/views/placements/support/providers/provider_options.html.erb b/app/views/placements/support/providers/provider_options.html.erb
@@ -3,7 +3,7 @@
 <% else %>
   <% content_for :page_title, t(".title", provider_count: providers.count, search_param:) %>
 <% end %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_provider_path) %>
 <% end %>

diff --git a/app/views/placements/support/providers/show.html.erb b/app/views/placements/support/providers/show.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/providers/users/add_user/edit.html.erb b/app/views/placements/support/providers/users/add_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/providers/users/index.html.erb b/app/views/placements/support/providers/users/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/providers/users/remove.html.erb b/app/views/placements/support/providers/users/remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @user.full_name, organisation_name: @organisation.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_user_path(@organisation, @user)) %>
 <% end %>

diff --git a/app/views/placements/support/providers/users/show.html.erb b/app/views/placements/support/providers/users/show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize("#{@user.full_name} - #{@provider.name}") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_users_path(@provider)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb b/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/mentors/can_not_remove.html.erb b/app/views/placements/support/schools/mentors/can_not_remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @mentor.full_name, school_name: @school.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentor_path(school_id: @school.id, id: @mentor.id)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/mentors/confirm_remove.html.erb b/app/views/placements/support/schools/mentors/confirm_remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @mentor.full_name, school_name: @school.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentor_path(school_id: @school.id, id: @mentor.id)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/mentors/index.html.erb b/app/views/placements/support/schools/mentors/index.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(@school.name) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= @school.name %></h1>
 

diff --git a/app/views/placements/support/schools/mentors/show.html.erb b/app/views/placements/support/schools/mentors/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", mentor_name: @mentor.full_name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentors_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/new.html.erb b/app/views/placements/support/schools/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, @school_form.errors.any? ? t(".title_with_error") : t(".title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_organisation_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb b/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/partner_providers/index.html.erb b/app/views/placements/support/schools/partner_providers/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/schools/partner_providers/remove.html.erb b/app/views/placements/support/schools/partner_providers/remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", provider_name: @partner_provider.name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_partner_provider_path(@school, @partner_provider)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/partner_providers/show.html.erb b/app/views/placements/support/schools/partner_providers/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", partner_provider_name: @partner_provider.name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_partner_providers_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/placements/add_placement/edit.html.erb b/app/views/placements/support/schools/placements/add_placement/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/placements/can_not_remove.html.erb b/app/views/placements/support/schools/placements/can_not_remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", subject_names: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placement_path(@school, @placement)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/placements/confirm_remove.html.erb b/app/views/placements/support/schools/placements/confirm_remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", subject_names: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placement_path(@school, @placement)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/placements/edit_placement/edit.html.erb b/app/views/placements/support/schools/placements/edit_placement/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/placements/index.html.erb b/app/views/placements/support/schools/placements/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, t(".page_title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= @school.name %></h1>
 

diff --git a/app/views/placements/support/schools/placements/show.html.erb b/app/views/placements/support/schools/placements/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", placement_name: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placements_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/school_options.html.erb b/app/views/placements/support/schools/school_options.html.erb
@@ -4,7 +4,6 @@
   <% content_for :page_title, t(".title", school_count: schools.count, search_param:) %>
 <% end %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_school_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/show.html.erb b/app/views/placements/support/schools/show.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/schools/users/add_user/edit.html.erb b/app/views/placements/support/schools/users/add_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/schools/users/index.html.erb b/app/views/placements/support/schools/users/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/schools/users/remove.html.erb b/app/views/placements/support/schools/users/remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @user.full_name, organisation_name: @organisation.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_user_path(@organisation, @user)) %>
 <% end %>

diff --git a/app/views/placements/support/schools/users/show.html.erb b/app/views/placements/support/schools/users/show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize("#{@user.full_name} - #{@school.name}") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_users_path(@school)) %>
 <% end %>

diff --git a/app/views/placements/support/settings/index.html.erb b/app/views/placements/support/settings/index.html.erb
@@ -1,5 +1,4 @@
 <%# content_for :page_title, t(".heading", records: @pagy.count) %>
-<%= render "placements/support/primary_navigation", current_navigation: :settings %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">

diff --git a/app/views/placements/support/support_users/add_support_user/edit.html.erb b/app/views/placements/support/support_users/add_support_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>

diff --git a/app/views/placements/support/support_users/index.html.erb b/app/views/placements/support/support_users/index.html.erb
@@ -1,5 +1,4 @@
 <% content_for(:page_title) { t(".page_title") } %>
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
 
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= t(".heading") %></h1>

diff --git a/app/views/placements/support/support_users/remove.html.erb b/app/views/placements/support/support_users/remove.html.erb
@@ -1,7 +1,5 @@
 <% content_for(:page_title) { t(".page_title", user_name: @support_user.full_name) } %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_support_user_path(@support_user)) %>
 <% end %>

diff --git a/app/views/placements/support/support_users/show.html.erb b/app/views/placements/support/support_users/show.html.erb
@@ -1,7 +1,5 @@
 <% content_for(:page_title) { @support_user.full_name } %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <% content_for(:before_content) do %>
   <%= govuk_back_link href: placements_support_support_users_path %>
 <% end %>

diff --git a/config/locales/en/placements/support/header_navigation.yml b/config/locales/en/placements/support/header_navigation.yml
@@ -0,0 +1,7 @@
+en:
+  placements:
+    support:
+      header_navigation:
+        users: Support users
+        organisations: Organisations
+        settings: Settings
diff --git a/...placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb b/...placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb
@@ -191,9 +191,9 @@ def given_i_am_signed_in_as_a_support_user
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 

diff --git a/...placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb b/...placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb
@@ -55,9 +55,9 @@ def when_i_click_add_organisation
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 

diff --git a/...m/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb b/...m/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb
@@ -95,9 +95,9 @@ def when_i_visit_the_partner_schools_page_for(provider)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 

diff --git a/...t/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb b/...t/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb
@@ -113,9 +113,9 @@ def when_i_visit_the_add_partner_school_page_for(provider)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 

diff --git a/...lacements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb b/...lacements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb
@@ -100,9 +100,9 @@ def when_i_visit_the_partner_schools_page_for(provider:, school:)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 

diff --git a/...lacements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb b/...lacements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb
@@ -55,9 +55,9 @@ def then_i_see_the_details_for(school)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end