govuk_publishing_components 62.2.1 → 63.0.0

data/config/locales/id.yml

@@ -163,7 +163,7 @@ id:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginasi
       previous:

data/config/locales/is.yml

@@ -163,7 +163,7 @@ is:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Síðuuppsetning
       previous:

data/config/locales/it.yml

@@ -163,7 +163,7 @@ it:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Impaginazione
       previous:

data/config/locales/ja.yml

@@ -159,7 +159,7 @@ ja:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: ページ付け
       previous:

data/config/locales/ka.yml

@@ -166,7 +166,7 @@ ka:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: პაგინაცია
       previous:

data/config/locales/kk.yml

@@ -163,7 +163,7 @@ kk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Беттеу
       previous:

data/config/locales/ko.yml

@@ -158,7 +158,7 @@ ko:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination:
       previous:

data/config/locales/ku.yml

@@ -162,7 +162,7 @@ ku:
       label: ووشەی نهێنی
       password_hidden_announcement: وشەی نهێنی تۆ شاراوەتەوە
       password_shown_announcement: وشەی نهێنی تۆ دیارە
-    previous_and_next_navigation:
+    pagination:
       next: داهاتوو
       pagination: لاپەڕەسازی
       previous: پێشووتر

data/config/locales/ky.yml

@@ -159,7 +159,7 @@ ky:
       label: Сырсөз
       password_hidden_announcement: Сырсөзүңүз жашырылган
       password_shown_announcement: Сырсөзүңүз көрсөтүлгөн
-    previous_and_next_navigation:
+    pagination:
       next: Кийинки
       pagination: Барактоо
       previous: Мурунку

data/config/locales/lt.yml

@@ -168,7 +168,7 @@ lt:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Suskirstymas puslapiais
       previous:

data/config/locales/lv.yml

@@ -167,7 +167,7 @@ lv:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Numerācija
       previous:

data/config/locales/ms.yml

@@ -162,7 +162,7 @@ ms:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Penomboran
       previous:

data/config/locales/mt.yml

@@ -165,7 +165,7 @@ mt:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paġinazzjoni
       previous:

data/config/locales/ne.yml

@@ -159,7 +159,7 @@ ne:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination:
       previous:

data/config/locales/nl.yml

@@ -163,7 +163,7 @@ nl:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginering
       previous:

data/config/locales/no.yml

@@ -163,7 +163,7 @@
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginering
       previous:

data/config/locales/pa-pk.yml

@@ -159,7 +159,7 @@ pa-pk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: ورقہ بندی
       previous:

data/config/locales/pa.yml

@@ -163,7 +163,7 @@ pa:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: ਪੰਨਾ
       previous:

data/config/locales/pl.yml

@@ -167,7 +167,7 @@ pl:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Numeracja stron
       previous:

data/config/locales/ps.yml

@@ -160,7 +160,7 @@ ps:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: مخینه
       previous:

data/config/locales/pt.yml

@@ -163,7 +163,7 @@ pt:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginação
       previous:

data/config/locales/ro.yml

@@ -164,7 +164,7 @@ ro:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginație
       previous:

data/config/locales/ru.yml

@@ -167,7 +167,7 @@ ru:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Разбивка
       previous:

data/config/locales/si.yml

@@ -163,7 +163,7 @@ si:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: පිටු අංකය
       previous:

data/config/locales/sk.yml

@@ -168,7 +168,7 @@ sk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Stránkovanie
       previous:

data/config/locales/sl.yml

@@ -170,7 +170,7 @@ sl:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Oštevilčenje
       previous:

data/config/locales/so.yml

@@ -163,7 +163,7 @@ so:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Lambar siinta boga
       previous:

data/config/locales/sq.yml

@@ -163,7 +163,7 @@ sq:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Numërtimi
       previous:

data/config/locales/sr.yml

@@ -164,7 +164,7 @@ sr:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Broj stranice
       previous:

data/config/locales/sv.yml

@@ -163,7 +163,7 @@ sv:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Paginering
       previous:

data/config/locales/sw.yml

@@ -163,7 +163,7 @@ sw:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Nambari za kurasa
       previous:

data/config/locales/ta.yml

@@ -164,7 +164,7 @@ ta:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: பக்கமிடுதல்
       previous:

data/config/locales/th.yml

@@ -161,7 +161,7 @@ th:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: การแบ่งหน้า
       previous:

data/config/locales/ti.yml

@@ -162,7 +162,7 @@ ti:
       label: መሕለፊ ቓል/ፓስዎርድ
       password_hidden_announcement: መሕለፊ ቓል/ፓስዎርድካ ተሓቢኡ ኣሎ
       password_shown_announcement: መሕለፊ ቓል/ፓስዎርድካ ይርአ ኣሎ
-    previous_and_next_navigation:
+    pagination:
       next: ዝቅጽል
       pagination: ገጻት ምግባር
       previous: ዝሓለፈ

data/config/locales/tk.yml

@@ -164,7 +164,7 @@ tk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Sahypa
       previous:

data/config/locales/tr.yml

@@ -164,7 +164,7 @@ tr:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Sayfa
       previous:

data/config/locales/uk.yml

@@ -170,7 +170,7 @@ uk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Поділ на сторінки
       previous:

data/config/locales/ur.yml

@@ -160,7 +160,7 @@ ur:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: صفحہ بندی
       previous:

data/config/locales/uz.yml

@@ -165,7 +165,7 @@ uz:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Саҳифаларнинг рақамланиши
       previous:

data/config/locales/vi.yml

@@ -162,7 +162,7 @@ vi:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: Phân trang
       previous:

data/config/locales/zh-hk.yml

@@ -161,7 +161,7 @@ zh-hk:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: 分頁
       previous:

data/config/locales/zh-tw.yml

@@ -161,7 +161,7 @@ zh-tw:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: 分頁
       previous:

data/config/locales/zh.yml

@@ -161,7 +161,7 @@ zh:
       label:
       password_hidden_announcement:
       password_shown_announcement:
-    previous_and_next_navigation:
+    pagination:
       next:
       pagination: 分页
       previous:

data/lib/govuk_publishing_components/presenters/component_wrapper_helper.rb

@@ -184,6 +184,9 @@ module GovukPublishingComponents
         return if lang.blank?
 
         langs = %w[ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh zh-Hans zh-Hant zh-hk zh-tw cv kw co cr hr cs da dv nl dz dr en eo et ee fo fj fi fr ff gl gd gv ka de el kl gn gu ht ha he hz hi ho hu is io ig id in ia ie iu ik ga it ja jv kl kn kr ks kk km ki rw rn ky kv kg ko ku kj lo la lv li ln lt lu lg lb gv mk mg ms ml mt mi mr mh mo mn na nv ng nd ne no nb nn ii oc oj cu or om os pi ps fa pl pt pa pa-pk qu rm ro ru se sm sg sa sr sh st tn sn ii sd si ss sk sl so nr es es-419 su sw ss sv tl ty tg ta tt te th bo ti to ts tr tk tw ug uk ur uz ve vi vo wa cy wo fy xh yi ji yo za zu]
+
+        lang = lang.to_s
+
         unless langs.include? lang
           raise(ArgumentError, "lang attribute (#{lang}) is not recognised")
         end

data/lib/govuk_publishing_components/presenters/image_card_helper.rb

@@ -4,14 +4,13 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :extra_details, :extra_details_no_indent, :heading_text, :metadata, :lang, :image_loading, :youtube_video_id, :image_src, :two_thirds, :large_font_size_mobile
+      attr_reader :href, :large, :extra_details, :extra_details_no_indent, :heading_text, :metadata, :lang, :image_loading, :image_src, :two_thirds, :large_font_size_mobile
 
       def initialize(local_assigns, brand_helper)
         @href = local_assigns[:href]
         @extra_details = local_assigns[:extra_details] || []
         @image_src = local_assigns[:image_src]
         @image_alt = local_assigns[:image_alt] || ""
-        @youtube_video_alt = local_assigns[:youtube_video_alt]
         @image_loading = local_assigns[:image_loading] || "auto"
         @srcset = local_assigns[:srcset] || nil
         @sizes = local_assigns[:sizes] || nil
@@ -25,24 +24,10 @@ module GovukPublishingComponents
         @extra_details_no_indent = local_assigns[:extra_details_no_indent]
         @metadata = local_assigns[:metadata]
         @lang = local_assigns[:lang]
-        @youtube_video_id = local_assigns[:youtube_video_id] || nil
 
         @brand_helper = brand_helper
       end
 
-      def href
-        return youtube_href if @youtube_video_id
-
-        @href
-      end
-
-      def large
-        # if youtube video, we don't want to use
-        # the small variant, large will be always
-        # true if a youtube_video_id is supplied
-        @youtube_video_id || @large
-      end
-
       def large_mobile_font_size?
         # allow the font-size to be 19px on mobile
         # for the two-thirds varation of the
@@ -51,8 +36,6 @@ module GovukPublishingComponents
       end
 
       def media
-        return youtube_link if @youtube_video_id
-
         image
       end
 
@@ -103,44 +86,6 @@ module GovukPublishingComponents
 
         content_tag(:div, @description, class: "gem-c-image-card__description") if @description
       end
-
-      def youtube_href
-        "https://www.youtube.com/watch?v=#{@youtube_video_id}"
-      end
-
-      def youtube_thumbnail_url
-        "https://img.youtube.com/vi/#{@youtube_video_id}/maxresdefault.jpg"
-      end
-
-      def youtube_thumbnail
-        thumbnail = content_tag(:div, class: "gem-c-image-card__youtube-thumbnail-image-container") do
-          image_tag(
-            youtube_thumbnail_url,
-            class: "gem-c-image-card__image gem-c-image-card__youtube-thumbnail-image",
-            alt: "",
-            loading: @image_loading,
-          )
-        end
-        thumbnail + content_tag(:figcaption, @youtube_video_alt, class: "gem-c-image-card__youtube-thumbnail-container-text govuk-link #{@brand_helper.color_class}")
-      end
-
-      def youtube_link
-        content_tag(
-          :figure,
-          class: "gem-c-image-card__image-wrapper gem-c-image-card__image-wrapper--youtube-embed",
-        ) do
-          content_tag(:div) do
-            link_to(
-              href,
-              {
-                class: "govuk-body govuk-link gem-c-image-card__youtube-thumbnail-container js-youtube-card-embed",
-              },
-            ) do
-              youtube_thumbnail
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/pagination_helper.rb

@@ -0,0 +1,106 @@
+module GovukPublishingComponents
+  module Presenters
+    class PaginationHelper
+      include ActionView::Helpers
+      include ActionView::Context
+
+      attr_reader :prev_link, :next_link, :page_links, :ga4_type
+
+      def initialize(local_assigns)
+        @arrow_links = {
+          next: local_assigns[:next_page] || nil,
+          prev: local_assigns[:previous_page] || nil,
+        }
+        @items = local_assigns[:items] || nil
+
+        @disable_ga4 = local_assigns[:disable_ga4] || nil
+        @ga4_type = has_pages? ? "pagination" : "previous and next"
+        @prev_link = arrow_link_helper(direction: "prev")
+        @next_link = arrow_link_helper(direction: "next")
+        @page_links = pages_link_helper
+      end
+
+      def ga4_link_event(text:, section:)
+        unless @disable_ga4
+          {
+            event_name: "navigation",
+            type: @ga4_type,
+            text:,
+            section:,
+          }.to_json
+        end
+      end
+
+      def has_links?
+        has_pages? || @prev_link || @next_link
+      end
+
+      def has_pages?
+        @items.present?
+      end
+
+      def pages_link_helper
+        return unless has_pages?
+
+        page_links = @items.each_with_index.map do |item, index|
+          { href: nil, ellipsis: nil, current: nil, number: nil, visually_hidden_text: nil, **item.symbolize_keys } => { href:, ellipsis:, current:, number:, visually_hidden_text: }
+
+          raise ArgumentError, "Number or ellipsis value required for item #{index}" if ellipsis.blank? && number.blank?
+
+          list_item_classes = %w[govuk-pagination__item]
+          list_item_classes << "govuk-pagination__item--ellipsis" if ellipsis
+          list_item_classes << "govuk-pagination__item--current" if current
+
+          item_aria_label = visually_hidden_text || "Page #{number}"
+
+          ga4_link = ga4_link_event(text: number, section: "Pagination list")
+
+          content_tag(:li, class: list_item_classes) do
+            if ellipsis
+              "&ctdot;".html_safe
+            else
+              content_tag(:a, number, class: "govuk-link govuk-pagination__link", href:, aria: { label: item_aria_label, current: current ? "page" : nil }, data: { ga4_link: })
+            end
+          end
+        end
+
+        content_tag(:ul, class: "govuk-pagination__list") do
+          page_links.collect { |page_link| concat(page_link) }
+        end
+      end
+
+      def arrow_link_helper(direction:)
+        arrow_link_options = @arrow_links[direction.to_sym]
+
+        return if arrow_link_options.blank?
+
+        { href: nil, label: nil, title: nil, icon: nil, **arrow_link_options.symbolize_keys } => { href:, label:, title:, icon: }
+
+        title ||= {
+          "prev": t("components.pagination.previous"),
+          "next": t("components.pagination.next"),
+        }[direction.to_sym]
+
+        section = {
+          prev: "Previous",
+          next: "Next",
+        }[direction.to_sym]
+
+        ga4_link = ga4_link_event(text: label || title, section:)
+
+        link_text_classes = %w[govuk-pagination__link-title]
+        link_text_classes << "govuk-pagination__link-title--decorated" if label.blank?
+
+        content_tag(:div, class: "govuk-pagination__#{direction}") do
+          content_tag(:a, href:, class: "govuk-link govuk-pagination__link", data: { ga4_link: }) do
+            concat icon if direction == "prev" || !has_pages? && direction == "next"
+            concat content_tag(:span, title, class: link_text_classes)
+            concat icon if has_pages? && direction == "next"
+            concat content_tag(:span, ":", class: "govuk-visually-hidden") if label.present?
+            concat content_tag(:span, label, class: "govuk-pagination__link-label") if label.present?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "62.2.1".freeze
+  VERSION = "63.0.0".freeze
 end