From b40ea66ae25ce62e1b0f2aa1e23ae6a8cc550f10 Mon Sep 17 00:00:00 2001 From: Mateusz Grotek Date: Tue, 6 Aug 2024 09:07:24 +0100 Subject: [PATCH] Browse helper refactoring In preparation for popular links AB test --- app/helpers/browse_helper.rb | 43 ++++++++------- app/views/browse/show.html.erb | 10 ++-- app/views/shared/_browse_action_link.erb | 14 +---- config/locales/ar/browse.yml | 15 ++++-- config/locales/az/browse.yml | 15 ++++-- config/locales/be/browse.yml | 15 ++++-- config/locales/bg/browse.yml | 15 ++++-- config/locales/bn/browse.yml | 15 ++++-- config/locales/cs/browse.yml | 15 ++++-- config/locales/cy/browse.yml | 15 ++++-- config/locales/da/browse.yml | 15 ++++-- config/locales/de/browse.yml | 15 ++++-- config/locales/dr/browse.yml | 15 ++++-- config/locales/el/browse.yml | 15 ++++-- config/locales/en/browse.yml | 15 ++++-- config/locales/es-419/browse.yml | 15 ++++-- config/locales/es/browse.yml | 15 ++++-- config/locales/et/browse.yml | 15 ++++-- config/locales/fa/browse.yml | 15 ++++-- config/locales/fi/browse.yml | 15 ++++-- config/locales/fr/browse.yml | 15 ++++-- config/locales/gd/browse.yml | 15 ++++-- config/locales/gu/browse.yml | 15 ++++-- config/locales/he/browse.yml | 15 ++++-- config/locales/hi/browse.yml | 15 ++++-- config/locales/hr/browse.yml | 15 ++++-- config/locales/hu/browse.yml | 15 ++++-- config/locales/hy/browse.yml | 15 ++++-- config/locales/id/browse.yml | 15 ++++-- config/locales/is/browse.yml | 15 ++++-- config/locales/it/browse.yml | 15 ++++-- config/locales/ja/browse.yml | 15 ++++-- config/locales/ka/browse.yml | 15 ++++-- config/locales/kk/browse.yml | 15 ++++-- config/locales/ko/browse.yml | 15 ++++-- config/locales/lt/browse.yml | 15 ++++-- config/locales/lv/browse.yml | 15 ++++-- config/locales/ms/browse.yml | 15 ++++-- config/locales/mt/browse.yml | 15 ++++-- config/locales/ne/browse.yml | 15 ++++-- config/locales/nl/browse.yml | 15 ++++-- config/locales/no/browse.yml | 15 ++++-- config/locales/pa-pk/browse.yml | 15 ++++-- config/locales/pa/browse.yml | 15 ++++-- config/locales/pl/browse.yml | 15 ++++-- config/locales/ps/browse.yml | 15 ++++-- config/locales/pt/browse.yml | 15 ++++-- config/locales/ro/browse.yml | 15 ++++-- config/locales/ru/browse.yml | 15 ++++-- config/locales/si/browse.yml | 15 ++++-- config/locales/sk/browse.yml | 15 ++++-- config/locales/sl/browse.yml | 15 ++++-- config/locales/so/browse.yml | 15 ++++-- config/locales/sq/browse.yml | 15 ++++-- config/locales/sr/browse.yml | 15 ++++-- config/locales/sv/browse.yml | 15 ++++-- config/locales/sw/browse.yml | 15 ++++-- config/locales/ta/browse.yml | 15 ++++-- config/locales/th/browse.yml | 15 ++++-- config/locales/tk/browse.yml | 15 ++++-- config/locales/tr/browse.yml | 15 ++++-- config/locales/uk/browse.yml | 15 ++++-- config/locales/ur/browse.yml | 15 ++++-- config/locales/uz/browse.yml | 15 ++++-- config/locales/vi/browse.yml | 15 ++++-- config/locales/yi/browse.yml | 15 ++++-- config/locales/zh-hk/browse.yml | 15 ++++-- config/locales/zh-tw/browse.yml | 15 ++++-- config/locales/zh/browse.yml | 15 ++++-- spec/helpers/browse_helper_spec.rb | 68 ++++++++++++++++++++---- 70 files changed, 811 insertions(+), 314 deletions(-) diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 52c23b366..02328a263 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,28 +1,27 @@ module BrowseHelper - ACTION_LINK_DATA = { - benefits: [ - { lang: "browse.check_benefits_and_financial_support", href: "/check-benefits-financial-support" }, - ], - business: [ - { lang: "browse.hmrc_online_services", href: "/log-in-register-hmrc-online-services" }, - { lang: "browse.self_assessment_tax_returns", href: "/self-assessment-tax-returns" }, - { lang: "browse.pay_employers_paye", href: "/pay-paye-tax" }, - ], - }.freeze - - def display_action_links_for_slug?(slug) - ACTION_LINK_DATA.key?(slug.to_sym) + def display_popular_links_for_slug?(slug) + I18n.exists?(slug.to_s, scope: "browse.popular_links") end - def action_link_data(slug) - links = ACTION_LINK_DATA[slug.to_sym] - return [] unless links - - links.each_with_index do |link, index| - link[:text] = I18n.t(link[:lang]) - link[:ga4_text] = I18n.t(link[:lang], locale: :en) - link[:index_link] = index + 1 - link[:index_total] = links.length + def popular_links_for_slug(slug) + links = I18n.t(slug.to_s, scope: "browse.popular_links") + count = links.length + links.map.with_index(1) do |link, index| + { + text: link[:title], + href: link[:url], + data_attributes: { + module: "ga4-link-tracker", + ga4_track_links_only: "", + ga4_link: { + event_name: "navigation", + type: "action", + index_link: index, + index_total: count, + text: link[:title], + }, + }, + } end end end diff --git a/app/views/browse/show.html.erb b/app/views/browse/show.html.erb index 807d3a545..787441e74 100644 --- a/app/views/browse/show.html.erb +++ b/app/views/browse/show.html.erb @@ -34,7 +34,7 @@ } %> <% end %> -<% if display_action_links_for_slug?(page.slug) %> +<% if display_popular_links_for_slug?(page.slug) %>
@@ -45,9 +45,9 @@ font_size: "m" } %>
    - <% action_link_data(page.slug).each do |link| %> + <% popular_links_for_slug(page.slug).each do |link| %>
  • - <%= render "shared/browse_action_link", locals: link %> + <%= render partial: "shared/browse_action_link", locals: {link:} %>
    • <% end %>
@@ -60,7 +60,7 @@ <% total_links = page.second_level_browse_pages.count.to_s %> <%= render "shared/browse_cards_container" do %> <%= render "govuk_publishing_components/components/cards", { - heading: display_action_links_for_slug?(page.slug) ? t("browse.topics") : nil, + heading: display_popular_links_for_slug?(page.slug) ? t("browse.topics") : nil, items: page.second_level_browse_pages.map.with_index do |second_level_browse_page, index| { link: { @@ -78,6 +78,6 @@ description: second_level_browse_page.description, } end, - sub_heading_level: display_action_links_for_slug?(page.slug) ? 3 : 2, + sub_heading_level: display_popular_links_for_slug?(page.slug) ? 3 : 2, } %> <% end %> diff --git a/app/views/shared/_browse_action_link.erb b/app/views/shared/_browse_action_link.erb index 25386d6c0..cd76966c2 100644 --- a/app/views/shared/_browse_action_link.erb +++ b/app/views/shared/_browse_action_link.erb @@ -1,17 +1,5 @@ <%= render "govuk_publishing_components/components/action_link", { - text: locals[:text], - href: locals[:href], dark_large_icon: true, margin_bottom: 3, - data_attributes: { - module: "ga4-link-tracker", - ga4_track_links_only: "", - ga4_link: { - event_name: "navigation", - type: "action", - index_link: locals[:index_link], - index_total: locals[:index_total], - text: locals[:ga4_text] - } - } + **link, } %> diff --git a/config/locales/ar/browse.yml b/config/locales/ar/browse.yml index b447659bb..fddcc6877 100644 --- a/config/locales/ar/browse.yml +++ b/config/locales/ar/browse.yml @@ -1,12 +1,19 @@ --- ar: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: جميع الفئات - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/az/browse.yml b/config/locales/az/browse.yml index d9bb3ce90..02d83f9b3 100644 --- a/config/locales/az/browse.yml +++ b/config/locales/az/browse.yml @@ -1,12 +1,19 @@ --- az: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Bütün kateqoriyalar - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/be/browse.yml b/config/locales/be/browse.yml index 53d2c532d..dcde389f1 100644 --- a/config/locales/be/browse.yml +++ b/config/locales/be/browse.yml @@ -1,12 +1,19 @@ --- be: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Усе катэгорыі - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/bg/browse.yml b/config/locales/bg/browse.yml index 5616b8b69..212731c10 100644 --- a/config/locales/bg/browse.yml +++ b/config/locales/bg/browse.yml @@ -1,12 +1,19 @@ --- bg: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Всички категории - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/bn/browse.yml b/config/locales/bn/browse.yml index 918510533..6dc77c994 100644 --- a/config/locales/bn/browse.yml +++ b/config/locales/bn/browse.yml @@ -1,12 +1,19 @@ --- bn: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: সকল শ্রেণিবিভাগ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/cs/browse.yml b/config/locales/cs/browse.yml index fe426ee27..414c90791 100644 --- a/config/locales/cs/browse.yml +++ b/config/locales/cs/browse.yml @@ -1,12 +1,19 @@ --- cs: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Všechny kategorie - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/cy/browse.yml b/config/locales/cy/browse.yml index 8f5ebae23..c4f724cc5 100644 --- a/config/locales/cy/browse.yml +++ b/config/locales/cy/browse.yml @@ -1,12 +1,19 @@ --- cy: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Pob categori - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/da/browse.yml b/config/locales/da/browse.yml index 91ee6ac0b..1d30a9095 100644 --- a/config/locales/da/browse.yml +++ b/config/locales/da/browse.yml @@ -1,12 +1,19 @@ --- da: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Alle kategorier - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/de/browse.yml b/config/locales/de/browse.yml index d2464ec63..1a56e63ca 100644 --- a/config/locales/de/browse.yml +++ b/config/locales/de/browse.yml @@ -1,12 +1,19 @@ --- de: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Alle Kategorien - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/dr/browse.yml b/config/locales/dr/browse.yml index 7e1d36b1a..3f52c7058 100644 --- a/config/locales/dr/browse.yml +++ b/config/locales/dr/browse.yml @@ -1,12 +1,19 @@ --- dr: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: تمام کتگوری ها - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/el/browse.yml b/config/locales/el/browse.yml index 14d8f9d1f..34853fc13 100644 --- a/config/locales/el/browse.yml +++ b/config/locales/el/browse.yml @@ -1,12 +1,19 @@ --- el: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Όλες οι κατηγορίες - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/en/browse.yml b/config/locales/en/browse.yml index b484cfa02..0d38279cc 100644 --- a/config/locales/en/browse.yml +++ b/config/locales/en/browse.yml @@ -4,9 +4,16 @@ en: all_categories: All categories popular_tasks: Popular tasks topics: Topics - check_benefits_and_financial_support: Check benefits and financial support you can get - hmrc_online_services: "HMRC online services: sign in or set up an account" - self_assessment_tax_returns: Self Assessment tax returns - pay_employers_paye: "Pay employers' PAYE" description: Find the government services, forms and accounts you need to use title: Services and information + popular_links: + benefits: + - title: Check benefits and financial support you can get + url: /check-benefits-financial-support + business: + - title: "HMRC online services: sign in or set up an account" + url: /log-in-register-hmrc-online-services + - title: Self Assessment tax returns + url: /self-assessment-tax-returns + - title: "Pay employers' PAYE" + url: /pay-paye-tax diff --git a/config/locales/es-419/browse.yml b/config/locales/es-419/browse.yml index b8d6b3987..3ff47e552 100644 --- a/config/locales/es-419/browse.yml +++ b/config/locales/es-419/browse.yml @@ -1,12 +1,19 @@ --- es-419: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Todas las categorías - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/es/browse.yml b/config/locales/es/browse.yml index db4f1764a..bc44dfb1e 100644 --- a/config/locales/es/browse.yml +++ b/config/locales/es/browse.yml @@ -1,12 +1,19 @@ --- es: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Todas las categorías - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/et/browse.yml b/config/locales/et/browse.yml index 18993351d..880a4025b 100644 --- a/config/locales/et/browse.yml +++ b/config/locales/et/browse.yml @@ -1,12 +1,19 @@ --- et: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Kõik kategooriad - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/fa/browse.yml b/config/locales/fa/browse.yml index 6e5235404..dcf7aba77 100644 --- a/config/locales/fa/browse.yml +++ b/config/locales/fa/browse.yml @@ -1,12 +1,19 @@ --- fa: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: تمام دسته‌بندی‌ها - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/fi/browse.yml b/config/locales/fi/browse.yml index 642853c2f..3b814e3e9 100644 --- a/config/locales/fi/browse.yml +++ b/config/locales/fi/browse.yml @@ -1,12 +1,19 @@ --- fi: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Kaikki kategoriat - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/fr/browse.yml b/config/locales/fr/browse.yml index 14d860a1a..3caed1e46 100644 --- a/config/locales/fr/browse.yml +++ b/config/locales/fr/browse.yml @@ -1,12 +1,19 @@ --- fr: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Toutes catégories - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/gd/browse.yml b/config/locales/gd/browse.yml index 4039235a6..335a997a4 100644 --- a/config/locales/gd/browse.yml +++ b/config/locales/gd/browse.yml @@ -1,12 +1,19 @@ --- gd: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Gach cineál táirgí - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/gu/browse.yml b/config/locales/gu/browse.yml index ddd421988..e650e723a 100644 --- a/config/locales/gu/browse.yml +++ b/config/locales/gu/browse.yml @@ -1,12 +1,19 @@ --- gu: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: તમામ શ્રેણીઓ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/he/browse.yml b/config/locales/he/browse.yml index ec0340a4c..f7728928e 100644 --- a/config/locales/he/browse.yml +++ b/config/locales/he/browse.yml @@ -1,12 +1,19 @@ --- he: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: כל הקטגוריות - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/hi/browse.yml b/config/locales/hi/browse.yml index 72396dd98..8eab76c1c 100644 --- a/config/locales/hi/browse.yml +++ b/config/locales/hi/browse.yml @@ -1,12 +1,19 @@ --- hi: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: सभी वर्ग - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/hr/browse.yml b/config/locales/hr/browse.yml index 1f722acdc..e7ae309ba 100644 --- a/config/locales/hr/browse.yml +++ b/config/locales/hr/browse.yml @@ -1,12 +1,19 @@ --- hr: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Sve kategorije - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/hu/browse.yml b/config/locales/hu/browse.yml index db6ab3831..e56eb1b7d 100644 --- a/config/locales/hu/browse.yml +++ b/config/locales/hu/browse.yml @@ -1,12 +1,19 @@ --- hu: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Minden kategória - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/hy/browse.yml b/config/locales/hy/browse.yml index 92f3f5178..8f8906ff8 100644 --- a/config/locales/hy/browse.yml +++ b/config/locales/hy/browse.yml @@ -1,12 +1,19 @@ --- hy: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Բոլոր կատեգորիաները - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/id/browse.yml b/config/locales/id/browse.yml index 1a059488f..e0eeefce5 100644 --- a/config/locales/id/browse.yml +++ b/config/locales/id/browse.yml @@ -1,12 +1,19 @@ --- id: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Semua kategori - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/is/browse.yml b/config/locales/is/browse.yml index 49d3accd4..e5bc63ca8 100644 --- a/config/locales/is/browse.yml +++ b/config/locales/is/browse.yml @@ -1,12 +1,19 @@ --- is: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Allir flokkar - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/it/browse.yml b/config/locales/it/browse.yml index 5acf7f4a0..453abfa02 100644 --- a/config/locales/it/browse.yml +++ b/config/locales/it/browse.yml @@ -1,12 +1,19 @@ --- it: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Tutte le categorie - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ja/browse.yml b/config/locales/ja/browse.yml index e0f6a2951..641d0ff12 100644 --- a/config/locales/ja/browse.yml +++ b/config/locales/ja/browse.yml @@ -1,12 +1,19 @@ --- ja: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: すべてのカテゴリ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ka/browse.yml b/config/locales/ka/browse.yml index d39b35ccf..edf51300b 100644 --- a/config/locales/ka/browse.yml +++ b/config/locales/ka/browse.yml @@ -1,12 +1,19 @@ --- ka: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: ყველა კატეგორია - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/kk/browse.yml b/config/locales/kk/browse.yml index 3c85c5125..d9dbd2304 100644 --- a/config/locales/kk/browse.yml +++ b/config/locales/kk/browse.yml @@ -1,12 +1,19 @@ --- kk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Барлық санаттар - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ko/browse.yml b/config/locales/ko/browse.yml index aad08e1e4..ac060846c 100644 --- a/config/locales/ko/browse.yml +++ b/config/locales/ko/browse.yml @@ -1,12 +1,19 @@ --- ko: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: 모든 범주 - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/lt/browse.yml b/config/locales/lt/browse.yml index 759c60af7..c2fdd4b71 100644 --- a/config/locales/lt/browse.yml +++ b/config/locales/lt/browse.yml @@ -1,12 +1,19 @@ --- lt: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Visos kategorijos - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/lv/browse.yml b/config/locales/lv/browse.yml index 8f52ca8c0..547ddb967 100644 --- a/config/locales/lv/browse.yml +++ b/config/locales/lv/browse.yml @@ -1,12 +1,19 @@ --- lv: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Visas kategorijas - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ms/browse.yml b/config/locales/ms/browse.yml index 2df46b0e0..8bf56e6bc 100644 --- a/config/locales/ms/browse.yml +++ b/config/locales/ms/browse.yml @@ -1,12 +1,19 @@ --- ms: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Semua kategori - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/mt/browse.yml b/config/locales/mt/browse.yml index 6ab26e725..242531d77 100644 --- a/config/locales/mt/browse.yml +++ b/config/locales/mt/browse.yml @@ -1,12 +1,19 @@ --- mt: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Kategoriji kollha - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ne/browse.yml b/config/locales/ne/browse.yml index a4cd12147..e082ac6c0 100644 --- a/config/locales/ne/browse.yml +++ b/config/locales/ne/browse.yml @@ -1,12 +1,19 @@ --- ne: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/nl/browse.yml b/config/locales/nl/browse.yml index 93768c8a6..95091513b 100644 --- a/config/locales/nl/browse.yml +++ b/config/locales/nl/browse.yml @@ -1,12 +1,19 @@ --- nl: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Alle categorieën - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/no/browse.yml b/config/locales/no/browse.yml index ccf9db1c2..ca8235a58 100644 --- a/config/locales/no/browse.yml +++ b/config/locales/no/browse.yml @@ -1,12 +1,19 @@ --- 'no': browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Alle kategorier - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/pa-pk/browse.yml b/config/locales/pa-pk/browse.yml index 88a7c1b8c..5c8fbb391 100644 --- a/config/locales/pa-pk/browse.yml +++ b/config/locales/pa-pk/browse.yml @@ -1,12 +1,19 @@ --- pa-pk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: سارے گروہ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/pa/browse.yml b/config/locales/pa/browse.yml index f7f33f6f1..c5324babf 100644 --- a/config/locales/pa/browse.yml +++ b/config/locales/pa/browse.yml @@ -1,12 +1,19 @@ --- pa: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: ਸਾਰੀਆਂ ਸ਼੍ਰੇਣੀਆਂ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/pl/browse.yml b/config/locales/pl/browse.yml index 49da49d72..e711c0e28 100644 --- a/config/locales/pl/browse.yml +++ b/config/locales/pl/browse.yml @@ -1,12 +1,19 @@ --- pl: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Wszystkie kategorie - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ps/browse.yml b/config/locales/ps/browse.yml index c79ac583a..e353e937b 100644 --- a/config/locales/ps/browse.yml +++ b/config/locales/ps/browse.yml @@ -1,12 +1,19 @@ --- ps: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: ټولې کټګورۍ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/pt/browse.yml b/config/locales/pt/browse.yml index 200e649da..e03f0d6cf 100644 --- a/config/locales/pt/browse.yml +++ b/config/locales/pt/browse.yml @@ -1,12 +1,19 @@ --- pt: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Todas as categorias - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ro/browse.yml b/config/locales/ro/browse.yml index a431aa5f1..abc80d2ec 100644 --- a/config/locales/ro/browse.yml +++ b/config/locales/ro/browse.yml @@ -1,12 +1,19 @@ --- ro: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Toate categoriile - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ru/browse.yml b/config/locales/ru/browse.yml index 76c8b9c8a..f0121dcc4 100644 --- a/config/locales/ru/browse.yml +++ b/config/locales/ru/browse.yml @@ -1,12 +1,19 @@ --- ru: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Все категории - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/si/browse.yml b/config/locales/si/browse.yml index b03b637aa..b11c9ecd9 100644 --- a/config/locales/si/browse.yml +++ b/config/locales/si/browse.yml @@ -1,12 +1,19 @@ --- si: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: සියලු ප්රවර්ග - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sk/browse.yml b/config/locales/sk/browse.yml index bcad13d26..7ba6c2a39 100644 --- a/config/locales/sk/browse.yml +++ b/config/locales/sk/browse.yml @@ -1,12 +1,19 @@ --- sk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Všetky kategórie - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sl/browse.yml b/config/locales/sl/browse.yml index 996bdcc8e..5000ddd59 100644 --- a/config/locales/sl/browse.yml +++ b/config/locales/sl/browse.yml @@ -1,12 +1,19 @@ --- sl: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Vse kategorije - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/so/browse.yml b/config/locales/so/browse.yml index a182e6859..c6a32015a 100644 --- a/config/locales/so/browse.yml +++ b/config/locales/so/browse.yml @@ -1,12 +1,19 @@ --- so: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Dhamaan qeybaha - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sq/browse.yml b/config/locales/sq/browse.yml index 0a7fee53d..0680bf009 100644 --- a/config/locales/sq/browse.yml +++ b/config/locales/sq/browse.yml @@ -1,12 +1,19 @@ --- sq: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Të gjitha kategoritë - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sr/browse.yml b/config/locales/sr/browse.yml index 4097d999d..9f35a416b 100644 --- a/config/locales/sr/browse.yml +++ b/config/locales/sr/browse.yml @@ -1,12 +1,19 @@ --- sr: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Sve kategorije - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sv/browse.yml b/config/locales/sv/browse.yml index d87990ac9..8a15e40c0 100644 --- a/config/locales/sv/browse.yml +++ b/config/locales/sv/browse.yml @@ -1,12 +1,19 @@ --- sv: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Alla kategorier - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/sw/browse.yml b/config/locales/sw/browse.yml index 58da6a5e1..a2ef92da2 100644 --- a/config/locales/sw/browse.yml +++ b/config/locales/sw/browse.yml @@ -1,12 +1,19 @@ --- sw: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Aina zote - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ta/browse.yml b/config/locales/ta/browse.yml index c90d128b1..81a680d47 100644 --- a/config/locales/ta/browse.yml +++ b/config/locales/ta/browse.yml @@ -1,12 +1,19 @@ --- ta: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: அனைத்து வகையினங்கள் - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/th/browse.yml b/config/locales/th/browse.yml index 06b141a0e..0e21b9e11 100644 --- a/config/locales/th/browse.yml +++ b/config/locales/th/browse.yml @@ -1,12 +1,19 @@ --- th: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: ทุกหมวดหมู่ - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/tk/browse.yml b/config/locales/tk/browse.yml index e279c17d0..b75ca0cbf 100644 --- a/config/locales/tk/browse.yml +++ b/config/locales/tk/browse.yml @@ -1,12 +1,19 @@ --- tk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Ähli toparlar - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/tr/browse.yml b/config/locales/tr/browse.yml index 3f890fd29..8317cae35 100644 --- a/config/locales/tr/browse.yml +++ b/config/locales/tr/browse.yml @@ -1,12 +1,19 @@ --- tr: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Tüm kategoriler - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/uk/browse.yml b/config/locales/uk/browse.yml index 4b2ed108b..204d5a44b 100644 --- a/config/locales/uk/browse.yml +++ b/config/locales/uk/browse.yml @@ -1,12 +1,19 @@ --- uk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Всі категорії - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/ur/browse.yml b/config/locales/ur/browse.yml index 94a94bcf6..baf36c1a0 100644 --- a/config/locales/ur/browse.yml +++ b/config/locales/ur/browse.yml @@ -1,12 +1,19 @@ --- ur: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: تمام زمرہ جات - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/uz/browse.yml b/config/locales/uz/browse.yml index c90d545e1..7ed820d12 100644 --- a/config/locales/uz/browse.yml +++ b/config/locales/uz/browse.yml @@ -1,12 +1,19 @@ --- uz: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Барча тоифалар - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/vi/browse.yml b/config/locales/vi/browse.yml index 697dd3ce5..e54497b21 100644 --- a/config/locales/vi/browse.yml +++ b/config/locales/vi/browse.yml @@ -1,12 +1,19 @@ --- vi: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: Tất cả danh mục - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/yi/browse.yml b/config/locales/yi/browse.yml index 35233372a..7bd3df007 100644 --- a/config/locales/yi/browse.yml +++ b/config/locales/yi/browse.yml @@ -1,12 +1,19 @@ --- yi: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/zh-hk/browse.yml b/config/locales/zh-hk/browse.yml index fb6581d93..2c15c0360 100644 --- a/config/locales/zh-hk/browse.yml +++ b/config/locales/zh-hk/browse.yml @@ -1,12 +1,19 @@ --- zh-hk: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: 所有種類 - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/zh-tw/browse.yml b/config/locales/zh-tw/browse.yml index f56684ddc..e61398a5a 100644 --- a/config/locales/zh-tw/browse.yml +++ b/config/locales/zh-tw/browse.yml @@ -1,12 +1,19 @@ --- zh-tw: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: 所有類別 - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/config/locales/zh/browse.yml b/config/locales/zh/browse.yml index 5780eb8b7..cb243ba7d 100644 --- a/config/locales/zh/browse.yml +++ b/config/locales/zh/browse.yml @@ -1,12 +1,19 @@ --- zh: browse: + popular_links: + benefits: + - title: + url: + business: + - title: + url: + - title: + url: + - title: + url: all_categories: 全部分类 - check_benefits_and_financial_support: description: - hmrc_online_services: - pay_employers_paye: popular_tasks: - self_assessment_tax_returns: title: topics: diff --git a/spec/helpers/browse_helper_spec.rb b/spec/helpers/browse_helper_spec.rb index b3f6e0c4e..296331614 100644 --- a/spec/helpers/browse_helper_spec.rb +++ b/spec/helpers/browse_helper_spec.rb @@ -1,16 +1,64 @@ RSpec.describe BrowseHelper do - describe "action links on browse pages" do - it "returns expected data for a browse page with action links" do - expected = [ - { text: t("browse.hmrc_online_services"), ga4_text: t("browse.hmrc_online_services", locale: :en), lang: "browse.hmrc_online_services", href: "/log-in-register-hmrc-online-services", index_link: 1, index_total: 3 }, - { text: t("browse.self_assessment_tax_returns"), ga4_text: t("browse.self_assessment_tax_returns", locale: :en), lang: "browse.self_assessment_tax_returns", href: "/self-assessment-tax-returns", index_link: 2, index_total: 3 }, - { text: t("browse.pay_employers_paye"), ga4_text: t("browse.pay_employers_paye", locale: :en), lang: "browse.pay_employers_paye", href: "/pay-paye-tax", index_link: 3, index_total: 3 }, - ] - expect(helper.action_link_data("business")).to eq(expected) + describe "#display_popular_links_for_slug?" do + it "returns true for existing slug" do + expect(helper.display_popular_links_for_slug?("business")).to be(true) end - it "returns nothing where there are no action links" do - expect(helper.action_link_data("not-a-page")).to eq([]) + it "returns false for nonexisting slug" do + expect(helper.display_popular_links_for_slug?("random12345")).to be(false) + end + end + + describe "#popular_links_for_slug" do + it "returns popular links data" do + expected_links = [ + { + text: "HMRC online services: sign in or set up an account", + href: "/log-in-register-hmrc-online-services", + data_attributes: { + module: "ga4-link-tracker", + ga4_track_links_only: "", + ga4_link: { + event_name: "navigation", + type: "action", + index_link: 1, + index_total: 3, + text: "HMRC online services: sign in or set up an account", + }, + }, + }, + { + text: "Self Assessment tax returns", + href: "/self-assessment-tax-returns", + data_attributes: { + module: "ga4-link-tracker", + ga4_track_links_only: "", + ga4_link: { + event_name: "navigation", + type: "action", + index_link: 2, + index_total: 3, + text: "Self Assessment tax returns", + }, + }, + }, + { + text: "Pay employers' PAYE", + href: "/pay-paye-tax", + data_attributes: { + module: "ga4-link-tracker", + ga4_track_links_only: "", + ga4_link: { + event_name: "navigation", + type: "action", + index_link: 3, + index_total: 3, + text: "Pay employers' PAYE", + }, + }, + }, + ] + expect(helper.popular_links_for_slug("business")).to eq(expected_links) end end end