Merge pull request #7990 from alphagov/remove-hasatw-page

Remove code for the help and services around the world page
alphagov · Aug 8, 2023 · 608fc9d · 608fc9d
2 parents f77a272 + 155c07a
commit 608fc9d
Show file tree

Hide file tree

Showing 87 changed files with 8,612 additions and 9,972 deletions.
diff --git a/README.md b/README.md
@@ -3,13 +3,7 @@
 Whitehall is deployed in two modes:
 
 - 'admin' for publishers to create and manage content (e.g. <http://whitehall-admin.dev.gov.uk/government/admin/news/new>)
-- 'frontend' for rendering content to the public that has yet to be migrated to using Publishing API (see live examples that follow)
-
-## Live examples (public facing frontend)
-
-### World Information
-
-- Help and services around the world: [https://www.gov.uk/world](https://www.gov.uk/world)
+- 'frontend' is a legacy mode that was used for rendering content to the public that had yet to be migrated to using Publishing API work to remove this is being carried out by the Publishing Platform team
 
 ## Running the Application
 

diff --git a/app/assets/javascripts/frontend/filter-list-items.js b/app/assets/javascripts/frontend/filter-list-items.js
diff --git a/app/assets/javascripts/frontend/on_ready.js b/app/assets/javascripts/frontend/on_ready.js
@@ -2,9 +2,7 @@
 jQuery(function ($) {
   $('.govspeak').enhanceYoutubeVideoLinks()
 
-  GOVUK.worldLocationFilter.init()
   GOVUK.hideDepartmentChildren.init()
-  GOVUK.filterListItems.init()
   GOVUK.showHide.init()
 })
 // These want images to be loaded before they run so the page height doesn't change.

diff --git a/app/assets/javascripts/frontend/world-location-filter.js b/app/assets/javascripts/frontend/world-location-filter.js
diff --git a/app/helpers/world_location_helper.rb b/app/helpers/world_location_helper.rb
diff --git a/app/models/world_location.rb b/app/models/world_location.rb
@@ -62,10 +62,6 @@ def to_s
     name
   end
 
-  def self.all_by_type
-    ordered_by_name.in_order_of(:world_location_type, %w[world_location international_delegation]).group_by(&:world_location_type)
-  end
-
   def self.countries
     where(world_location_type: "world_location").ordered_by_name
   end

diff --git a/app/presenters/publishing_api/world_index_presenter.rb b/app/presenters/publishing_api/world_index_presenter.rb
@@ -1,7 +1,5 @@
 module PublishingApi
   class WorldIndexPresenter
-    include WorldLocationHelper
-
     attr_accessor :update_type
 
     def initialize(update_type: nil)
@@ -46,6 +44,13 @@ def base_path
       "/world"
     end
 
+    def sort(locations)
+      locations
+        .map { |location| [ActiveSupport::Inflector.transliterate(location.name_without_prefix), location] }
+        .sort_by { |transliterated_name, _location| transliterated_name.downcase }
+        .map { |_transliterated_name, location| location }
+    end
+
   private
 
     def format_locations(locations)

diff --git a/app/views/world_locations/_legacy_list.html.erb b/app/views/world_locations/_legacy_list.html.erb
diff --git a/app/views/world_locations/_list.html.erb b/app/views/world_locations/_list.html.erb
diff --git a/app/views/world_locations/_world_location.html.erb b/app/views/world_locations/_world_location.html.erb
diff --git a/app/views/world_locations/index.html.erb b/app/views/world_locations/index.html.erb