Merge pull request #4517 from alphagov/presenters

Replace HomepagePresenter with a model
alphagov · Dec 19, 2024 · 670f441 · 670f441
2 parents eae338e + 9c8da0d
commit 670f441
Show file tree

Hide file tree

Showing 78 changed files with 81 additions and 216 deletions.
diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb
@@ -18,10 +18,6 @@ def search_component
   end
   helper_method :search_component
 
-  def publication_class
-    HomepagePresenter
-  end
-
   def show_search_autocomplete?
     true unless ENV["GOVUK_DISABLE_SEARCH_AUTOCOMPLETE"]
   end

diff --git a/app/models/content_item.rb b/app/models/content_item.rb
@@ -3,9 +3,9 @@
 class ContentItem
   include Withdrawable
 
-  attr_reader :attachments, :content_store_response, :content_store_hash, :body, :image,
-              :description, :document_type, :schema_name, :title, :base_path, :locale,
-              :public_updated_at
+  attr_reader :attachments, :base_path, :body, :content_store_hash,
+              :content_store_response, :description, :document_type, :image,
+              :links, :locale, :public_updated_at, :schema_name, :title
 
   # SCAFFOLDING: remove the override_content_store_hash parameter when full landing page
   # content items including block details are available from content-store
@@ -22,6 +22,7 @@ def initialize(content_store_response, override_content_store_hash: nil)
     @base_path = content_store_hash["base_path"]
     @locale = content_store_hash["locale"]
     @public_updated_at = content_store_hash["public_updated_at"]
+    @links = content_store_hash["links"]
 
     @attachments = get_attachments(content_store_hash.dig("details", "attachments"))
 

diff --git a/app/models/homepage.rb b/app/models/homepage.rb
@@ -0,0 +1,11 @@
+class Homepage < ContentItem
+  def popular_links
+    @popular_links ||= popular_links_data&.collect(&:with_indifferent_access)
+  end
+
+private
+
+  def popular_links_data
+    @popular_links_data ||= links.dig("popular_links", 0, "details", "link_items")
+  end
+end
diff --git a/app/presenters/homepage_presenter.rb b/app/presenters/homepage_presenter.rb
diff --git a/app/views/homepage/_popular_links.html.erb b/app/views/homepage/_popular_links.html.erb
@@ -1,7 +1,6 @@
 <%
   add_view_stylesheet("popular_links")
 %>
-
 <section class="homepage-section homepage-section__popular-links">
   <div class="govuk-width-container">
     <div class="govuk-grid-row">
@@ -12,7 +11,7 @@
           text: t("homepage.index.popular_links_heading"),
         } %>
         <ul class="homepage-most-viewed-list" data-module="ga4-link-tracker">
-          <% publication.popular_links.each_with_index do | item, index | %>
+          <% content_item.popular_links.each_with_index do | item, index | %>
             <li class="homepage-most-viewed-list__item">
               <%= render "govuk_publishing_components/components/action_link", {
                 text: item[:title],
@@ -25,7 +24,7 @@
                     'index_section': locals[:index_section],
                     'index_link': index + 1,
                     'index_section_count': locals[:index_section_count],
-                    'index_total': t("homepage.index.popular_links").length,
+                    'index_total': content_item.popular_links.length,
                     'section': "#{t("homepage.index.popular_links_heading", locale: :en)}"
                   }
                 }

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
@@ -865,7 +865,6 @@ ar:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/az.yml b/config/locales/az.yml
@@ -569,7 +569,6 @@ az:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/be.yml b/config/locales/be.yml
@@ -717,7 +717,6 @@ be:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -569,7 +569,6 @@ bg:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
@@ -569,7 +569,6 @@ bn:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -643,7 +643,6 @@ cs:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -870,7 +870,6 @@ cy:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -569,7 +569,6 @@ da:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -569,7 +569,6 @@ de:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/dr.yml b/config/locales/dr.yml
@@ -569,7 +569,6 @@ dr:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/el.yml b/config/locales/el.yml
@@ -569,7 +569,6 @@ el:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -660,19 +660,6 @@ en:
       other_agencies: Other agencies and public bodies
       other_agencies_count: 400+
       popular: Popular on GOV.UK
-      popular_links:
-      - title: 'HMRC account: sign in or set up'
-        url: "/log-in-register-hmrc-online-services"
-      - title: 'Universal Credit account: sign in'
-        url: "/sign-in-universal-credit"
-      - title: 'Personal tax account: sign in or set up'
-        url: "/personal-tax-account"
-      - title: 'Self Assessment tax return: sign in'
-        url: "/log-in-file-self-assessment-tax-return"
-      - title: 'Childcare account: sign in'
-        url: "/sign-in-childcare-account"
-      - title: Check your State Pension forecast
-        url: "/check-state-pension"
       popular_links_heading: Popular on GOV.UK
       promotion_slots:
       - text: Search and apply for jobs in England, Scotland and Wales.

diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml
@@ -569,7 +569,6 @@ es-419:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -569,7 +569,6 @@ es:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/et.yml b/config/locales/et.yml
@@ -569,7 +569,6 @@ et:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -569,7 +569,6 @@ fa:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -569,7 +569,6 @@ fi:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -569,7 +569,6 @@ fr:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
@@ -717,7 +717,6 @@ gd:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/gu.yml b/config/locales/gu.yml
@@ -569,7 +569,6 @@ gu:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -569,7 +569,6 @@ he:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
@@ -569,7 +569,6 @@ hi:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
@@ -643,7 +643,6 @@ hr:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
@@ -569,7 +569,6 @@ hu:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/hy.yml b/config/locales/hy.yml
@@ -569,7 +569,6 @@ hy:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/id.yml b/config/locales/id.yml
@@ -495,7 +495,6 @@ id:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/is.yml b/config/locales/is.yml
@@ -569,7 +569,6 @@ is:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -569,7 +569,6 @@ it:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -495,7 +495,6 @@ ja:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/ka.yml b/config/locales/ka.yml
@@ -569,7 +569,6 @@ ka:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/kk.yml b/config/locales/kk.yml
@@ -569,7 +569,6 @@ kk:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
@@ -495,7 +495,6 @@ ko:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
@@ -643,7 +643,6 @@ lt:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
@@ -569,7 +569,6 @@ lv:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/ms.yml b/config/locales/ms.yml
@@ -495,7 +495,6 @@ ms:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company:

diff --git a/config/locales/mt.yml b/config/locales/mt.yml
@@ -717,7 +717,6 @@ mt:
       other_agencies:
       other_agencies_count:
       popular:
-      popular_links:
       popular_links_heading:
       promotion_slots:
       running_limited_company: