From dc8c6afc20f331a508fae3f10871576ae2edf1f8 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 6 Feb 2025 15:13:58 +0000 Subject: [PATCH 1/5] Remove page title --- app/views/candidate_interface/content/providers.html.erb | 3 --- config/locales/en.yml | 1 - 2 files changed, 4 deletions(-) diff --git a/app/views/candidate_interface/content/providers.html.erb b/app/views/candidate_interface/content/providers.html.erb index 63d74b8fab0..53f293357e6 100644 --- a/app/views/candidate_interface/content/providers.html.erb +++ b/app/views/candidate_interface/content/providers.html.erb @@ -1,8 +1,5 @@ -<% content_for :title, t('page_titles.providers') %> - <% cache 'courses-grouped-by-region-and-provider', expires_in: 15.minutes do %>

- <%= t('page_titles.providers') %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index a6983ff46a6..8e7586d6f6c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -278,7 +278,6 @@ en: confirmation: Your reference for %{full_name} has been submitted finish: Thank you decline: Decline to give a reference - providers: Courses on this service decisions: offer: Details of offer accept_offer: Are you sure you want to accept this offer? From 5bf447851182a5c02bdad512224eedb1defa031d Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 6 Feb 2025 15:16:14 +0000 Subject: [PATCH 2/5] Remove provider regions translations --- .../grouped_provider_courses_component.rb | 2 +- .../candidate_interface/provider_regions.yml | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 config/locales/candidate_interface/provider_regions.yml diff --git a/app/components/candidate_interface/grouped_provider_courses_component.rb b/app/components/candidate_interface/grouped_provider_courses_component.rb index 1faa96ec6c7..d741eeeac64 100644 --- a/app/components/candidate_interface/grouped_provider_courses_component.rb +++ b/app/components/candidate_interface/grouped_provider_courses_component.rb @@ -3,7 +3,7 @@ class GroupedProviderCoursesComponent < ViewComponent::Base include ViewHelper def label_for(region_code) - region_code.present? ? I18n.t("provider_regions.#{region_code}") : I18n.t('provider_regions.no_region_specified') + end def courses_grouped_by_provider_and_region diff --git a/config/locales/candidate_interface/provider_regions.yml b/config/locales/candidate_interface/provider_regions.yml deleted file mode 100644 index 48e6a3efd2a..00000000000 --- a/config/locales/candidate_interface/provider_regions.yml +++ /dev/null @@ -1,17 +0,0 @@ -en: - provider_regions: - channel_islands: Channel Islands - east_midlands: East Midlands - eastern: East of England - isle_of_man: Isle of Man - london: London - no_region: No region - no_region_specified: No region specified - north_east: North East - north_west: North West - scotland: Scotland - south_east: South East - south_west: South West - wales: Wales - west_midlands: West Midlands - yorkshire_and_the_humber: Yorkshire and the Humber From fad606be73e53fd110bbfb3f6eba23556e0d3210 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 6 Feb 2025 15:46:30 +0000 Subject: [PATCH 3/5] Remove GetCoursesByProviderAndRegion --- .../grouped_provider_courses_component.rb | 1 - .../get_courses_by_provider_and_region.rb | 13 ------------- .../grouped_provider_courses_component_spec.rb | 16 ---------------- 3 files changed, 30 deletions(-) delete mode 100644 app/queries/get_courses_by_provider_and_region.rb diff --git a/app/components/candidate_interface/grouped_provider_courses_component.rb b/app/components/candidate_interface/grouped_provider_courses_component.rb index d741eeeac64..ecc5a421edd 100644 --- a/app/components/candidate_interface/grouped_provider_courses_component.rb +++ b/app/components/candidate_interface/grouped_provider_courses_component.rb @@ -7,7 +7,6 @@ def label_for(region_code) end def courses_grouped_by_provider_and_region - GetCoursesByProviderAndRegion.call end end end diff --git a/app/queries/get_courses_by_provider_and_region.rb b/app/queries/get_courses_by_provider_and_region.rb deleted file mode 100644 index 36901632a94..00000000000 --- a/app/queries/get_courses_by_provider_and_region.rb +++ /dev/null @@ -1,13 +0,0 @@ -class GetCoursesByProviderAndRegion - RegionProviderCourses = Struct.new(:region_code, :provider_name, :courses) - - def self.call - Course - .current_cycle - .includes(:provider) - .order('providers.region_code', 'providers.name') - .group_by { |course| [course.provider.region_code, course.provider.name] } - .map { |region_provider, courses| RegionProviderCourses.new(region_provider[0], region_provider[1], courses) } - .group_by(&:region_code) - end -end diff --git a/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb b/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb index c9514c55bbd..a8c5e58c7aa 100644 --- a/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb +++ b/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb @@ -4,22 +4,6 @@ let(:course) { create(:course) } before do - allow(GetCoursesByProviderAndRegion).to receive(:call).and_return( - { - 'north_west' => [ - GetCoursesByProviderAndRegion::RegionProviderCourses.new('north_west', course.provider.name, [course]), - GetCoursesByProviderAndRegion::RegionProviderCourses.new('north_west', 'Westerly Sixth Form', []), - ], - 'south_east' => [ - GetCoursesByProviderAndRegion::RegionProviderCourses.new('south_east', 'Southerly College', []), - GetCoursesByProviderAndRegion::RegionProviderCourses.new('south_east', 'Easterly Sixth Form', []), - ], - nil => [ - GetCoursesByProviderAndRegion::RegionProviderCourses.new(nil, 'Wimbley College', []), - GetCoursesByProviderAndRegion::RegionProviderCourses.new(nil, 'Worbley Sixth Form', []), - ], - }, - ) end it 'renders all the region headings' do From daad8f6c835a307ed9168b64f8512fd99ba38bfd Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 6 Feb 2025 15:49:10 +0000 Subject: [PATCH 4/5] Remove GroupedProviderCoursesComponent --- ...rouped_provider_courses_component.html.erb | 20 ------------- .../grouped_provider_courses_component.rb | 12 -------- .../content/providers.html.erb | 2 +- ...grouped_provider_courses_component_spec.rb | 28 ------------------- 4 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 app/components/candidate_interface/grouped_provider_courses_component.html.erb delete mode 100644 app/components/candidate_interface/grouped_provider_courses_component.rb delete mode 100644 spec/components/candidate_interface/grouped_provider_courses_component_spec.rb diff --git a/app/components/candidate_interface/grouped_provider_courses_component.html.erb b/app/components/candidate_interface/grouped_provider_courses_component.html.erb deleted file mode 100644 index 5cabc7117e4..00000000000 --- a/app/components/candidate_interface/grouped_provider_courses_component.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<% find_down = CycleTimetable.find_down? %> - -<% courses_grouped_by_provider_and_region.each do |region_code, courses_by_provider| %> -

<%= label_for(region_code) %>

- <%= govuk_accordion(html_attributes: { id: region_code }) do |accordion| %> - <% courses_by_provider.each_with_index do |provider, index| %> - <% accordion.with_section(heading_text: provider.provider_name) do %> -
    - <% provider.courses.sort_by(&:name).each do |course| %> - <% if find_down %> -
  • <%= course.name_and_code %>
    • - <% else %> -
  • <%= govuk_link_to course.name_and_code, course.find_url %>
    • - <% end %> - <% end %> -
- <% end %> - <% end %> - <% end %> -<% end %> diff --git a/app/components/candidate_interface/grouped_provider_courses_component.rb b/app/components/candidate_interface/grouped_provider_courses_component.rb deleted file mode 100644 index ecc5a421edd..00000000000 --- a/app/components/candidate_interface/grouped_provider_courses_component.rb +++ /dev/null @@ -1,12 +0,0 @@ -module CandidateInterface - class GroupedProviderCoursesComponent < ViewComponent::Base - include ViewHelper - - def label_for(region_code) - - end - - def courses_grouped_by_provider_and_region - end - end -end diff --git a/app/views/candidate_interface/content/providers.html.erb b/app/views/candidate_interface/content/providers.html.erb index 53f293357e6..1bb5168e89c 100644 --- a/app/views/candidate_interface/content/providers.html.erb +++ b/app/views/candidate_interface/content/providers.html.erb @@ -4,7 +4,7 @@
- <%= render CandidateInterface::GroupedProviderCoursesComponent.new %> +
<% end %> diff --git a/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb b/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb deleted file mode 100644 index a8c5e58c7aa..00000000000 --- a/spec/components/candidate_interface/grouped_provider_courses_component_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'rails_helper' - -RSpec.describe CandidateInterface::GroupedProviderCoursesComponent do - let(:course) { create(:course) } - - before do - end - - it 'renders all the region headings' do - travel_temporarily_to(CycleTimetable.find_opens + 1.hour) do - result = render_inline(described_class.new) - - expect(result.css('h2').text).to include('South East') - expect(result.css('h2').text).to include('North West') - expect(result.css('h2').text).to include('No region') - expect(result.css('a').to_html).to include("https://find-teacher-training-courses.service.gov.uk/course/#{course.provider.code}/#{course.code}") - end - end - - context 'when find is down' do - it 'does not include a link to find' do - travel_temporarily_to(CycleTimetable.find_closes.end_of_day + 1.hour) do - result = render_inline(described_class.new) - expect(result.css('a').to_html).not_to include("https://find-teacher-training-courses.service.gov.uk/course/#{course.provider.code}/#{course.code}") - end - end - end -end From 92b8a9eb2768121bb6a3653f470eb2d8612a554d Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Thu, 6 Feb 2025 15:56:18 +0000 Subject: [PATCH 5/5] Remove action, route and view --- .../candidate_interface/content_controller.rb | 2 -- .../candidate_interface/content/providers.html.erb | 10 ---------- config/routes/candidate.rb | 1 - 3 files changed, 13 deletions(-) delete mode 100644 app/views/candidate_interface/content/providers.html.erb diff --git a/app/controllers/candidate_interface/content_controller.rb b/app/controllers/candidate_interface/content_controller.rb index 03cf9370c63..d05480d3006 100644 --- a/app/controllers/candidate_interface/content_controller.rb +++ b/app/controllers/candidate_interface/content_controller.rb @@ -34,7 +34,5 @@ def guidance_for_using_ai def complaints render 'content/complaints' end - - def providers; end end end diff --git a/app/views/candidate_interface/content/providers.html.erb b/app/views/candidate_interface/content/providers.html.erb deleted file mode 100644 index 1bb5168e89c..00000000000 --- a/app/views/candidate_interface/content/providers.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% cache 'courses-grouped-by-region-and-provider', expires_in: 15.minutes do %> -

-

- -
-
- -
-
-<% end %> diff --git a/config/routes/candidate.rb b/config/routes/candidate.rb index 32afc4e603f..8f92887418f 100644 --- a/config/routes/candidate.rb +++ b/config/routes/candidate.rb @@ -24,7 +24,6 @@ get '/cookies', to: 'content#cookies_page', as: :cookies get '/make-a-complaint', to: 'content#complaints', as: :complaints get '/privacy-policy', to: 'content#privacy_policy', as: :privacy_policy - get '/providers', to: 'content#providers', as: :providers get '/terms-of-use', to: 'content#terms_candidate', as: :terms get '/guidance-for-using-ai', to: 'content#guidance_for_using_ai' post '/feedback-survey' => 'rejection_feedback_survey#new', as: :rejection_feedback_survey