govuk_publishing_components 21.55.3 → 21.57.0

data/app/views/govuk_publishing_components/components/_summary_list.html.erb

@@ -1,23 +1,42 @@
 <%
+  local_assigns[:heading_level] ||= 3
+  heading_size = 'm' unless ['s', 'm', 'l', 'xl'].include?(heading_size)
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
   id ||= nil
   title ||= nil
   borderless ||= false
   edit ||= {}
+  delete ||= {}
   items ||= []
   block ||= yield
 %>
 <% if title || items.any? %>
   <%= tag.div class: "gem-c-summary-list #{"govuk-summary-list--no-border" if borderless}", id: id do %>
     <% if title %>
-      <%= tag.h3 title, class: "govuk-heading-m" %>
-      <% if edit.any? %>
-        <%= tag.ul class: "govuk-summary-list__actions-list" do %>
-          <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
-            <%= link_to edit.fetch(:href),
-                      class: "govuk-link gem-c-summary-list__edit-section-link",
-                      title: "#{edit.fetch(:link_text, "Change")} #{title}",
-                      data: edit.fetch(:data_attributes, {}) do %>
-               <%= edit.fetch(:link_text, "Change") %> <%= tag.span title, class: "govuk-visually-hidden" %>
+      <%= content_tag(shared_helper.get_heading_level, title, class: "govuk-heading-#{heading_size} gem-c-summary-list__group-title") %>
+      <% if edit.any? || delete.any? %>
+        <%= tag.ul class: "govuk-summary-list__actions-list gem-c-summary-list__group-actions-list" do %>
+          <%- if edit.any? %>
+            <% edit_section_link_text = edit[:link_text] || t("components.summary_list.edit") %>
+            <%= tag.li class: "govuk-summary-list__actions-list-item" do -%>
+              <%= link_to edit.fetch(:href),
+                        class: "govuk-link",
+                        title: "#{edit_section_link_text} #{title}",
+                        data: edit.fetch(:data_attributes, {}) do %>
+                <%= edit_section_link_text %><%= tag.span " #{title}", class: "govuk-visually-hidden" -%>
+              <% end %>
+            <% end %>
+          <% end %>
+          <% if delete.any? %>
+            <% delete_section_link_text = delete[:link_text] || t("components.summary_list.delete") %>
+            <%= tag.li class: "govuk-summary-list__actions-list-item" do -%>
+              <%= link_to delete.fetch(:href),
+                        class: "govuk-link gem-link--destructive",
+                        title: "#{delete_section_link_text} #{title}",
+                        data: delete.fetch(:data_attributes, {}) do %>
+                <%= delete_section_link_text %><%= tag.span " #{title}", class: "govuk-visually-hidden" -%>
+              <% end %>
             <% end %>
           <% end %>
         <% end %>
@@ -37,22 +56,23 @@
                 <%= tag.ul class: "govuk-summary-list__actions-list" do %>
                   <% if item.fetch(:edit, {}).any? %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
-                      <% edit_link_text = item[:edit][:link_text] || "Change" %>
+                      <% edit_link_text = item[:edit][:link_text] || t("components.summary_list.edit") %>
                       <%= link_to item[:edit].fetch(:href),
                                   class: "govuk-link",
                                   title: "#{edit_link_text} #{item[:field]}",
                                   data: item[:edit].fetch(:data_attributes, {}) do %>
-                        <%= edit_link_text %><%= tag.span " #{item[:field]}", class: "govuk-visually-hidden" %><% end %>
+                        <%= edit_link_text %><%= tag.span " #{item[:field]}", class: "govuk-visually-hidden" -%>
+                      <% end %>
                     <% end %>
                   <% end %>
                   <% if item.fetch(:delete, {}).any? %>
                     <%= tag.li class: "govuk-summary-list__actions-list-item" do %>
-                      <% delete_link_text = item[:delete][:link_text] || "Delete" %>
+                      <% delete_link_text = item[:delete][:link_text] || t("components.summary_list.delete") %>
                       <%= link_to item[:delete].fetch(:href),
-                                  class: "govuk-link",
+                                  class: "govuk-link gem-link--destructive",
                                   title: "#{delete_link_text} #{item[:field]}",
                                   data: item[:delete].fetch(:data_attributes, {}) do %>
-                        <%= delete_link_text %><%= tag.span " #{item[:field]}", class: "govuk-visually-hidden" %>
+                        <%= delete_link_text %><%= tag.span " #{item[:field]}", class: "govuk-visually-hidden" -%>
                       <% end %>
                     <% end %>
                   <% end %>

data/app/views/govuk_publishing_components/components/docs/action_link.yml

@@ -75,6 +75,11 @@ examples:
       text: Getting financial help and keeping your business safe
       href: "/financial-help"
       simple: true
+  with_small_icon:
+    data:
+      text: Coronavirus (COVID-19)
+      href: "/my-test-page"
+      small_icon: true
   with_dark_icon:
     data:
       text: Coronavirus (COVID-19)

data/app/views/govuk_publishing_components/components/docs/input.yml

@@ -132,6 +132,14 @@ examples:
         text: "What is your name?"
       name: "name"
       heading_size: "l"
+  with_prefix:
+    description: To help users understand how the input should look like. Often used for units of measurement.
+    data:
+      label:
+        text: "Cost, in pounds"
+      name: "cost"
+      width: 10
+      prefix: "£"
   with_suffix:
     description: To help users understand how the input should look like. Often used for units of measurement.
     data:
@@ -145,7 +153,7 @@ examples:
     data:
       label:
         text: "Cost per item, in pounds"
-      name: "Cost-per-item"
+      name: "cost-per-item"
       width: 10
       prefix: "£"
       suffix: "per item"

data/app/views/govuk_publishing_components/components/docs/print_link.yml

@@ -0,0 +1,24 @@
+name: Print link
+description: A link with a print icon to help users print the current page
+body: |
+  This component renders two different outputs depending on whether a `href` is specified. By default, when no `href` is given, the component renders as a button and triggers a print action via JavaScript. In this case the component is hidden in environments where JavaScript is disabled and can be used as a progressive enhancement. When a `href` is specified the component renders as an anchor tag and navigates to that `href` without JavaScript, suitable for applications which have paths that trigger a print event on load.
+accessibility_criteria: |
+  - The print icon must be presentational and ignored by screen readers.
+shared_accessibility_criteria:
+  - link
+examples:
+  default:
+    description: This component calls `print()` via the browser's DOM API. By default it relies on JavaScript and is not shown in environments where JavaScript is disabled. The \"link\" here is actually a button tag because this is not a navigation event. 
+  with_different_text:
+    data:
+      text: "Print this manual"
+  with_different_href:
+    description: You can specify a alternative `href` URL that will override the default behaviour. When a `href` is specified the print link will render as an anchor tag and be displayed even when JavaScript is disabled.
+    data:
+      href: "/print"
+  with_data_attributes:
+    data:
+      data_attributes:
+        track-category: "printButton"
+        track-action: "clicked"
+        track-label: "Print this page"

data/app/views/govuk_publishing_components/components/docs/summary_list.yml

@@ -1,5 +1,6 @@
 name: Summary list
 description: Use the summary list to summarise information, for example, a user’s responses at the end of a form.
+body:  This component extends the [Summary list component in the Design System](https://design-system.service.gov.uk/components/summary-list/) allowing the rendering of multiple groups of lists, and actions at the group level.
 accessibility_criteria: |
   Action links in the component must:
 
@@ -41,6 +42,32 @@ examples:
         data_attributes:
           gtm: "edit-title-summary-body"
 
+  with_delete_on_section:
+    data:
+      <<: *default-example-data
+      delete:
+        href: "delete-title-summary-body"
+        data_attributes:
+          gtm: "delete-title-summary-body"
+
+  with_edit_and_delete_on_section:
+    data:
+      <<: *default-example-data
+      edit:
+        href: "edit-title-summary-body"
+        data_attributes:
+          gtm: "edit-title-summary-body"
+      delete:
+        href: "delete-title-summary-body"
+        data_attributes:
+          gtm: "delete-title-summary-body"
+
+  with_custom_section_heading:
+    data:
+      <<: *default-example-data
+      heading_level: 2
+      heading_size: l
+
   with_custom_link_on_section:
     description: |
       Take care that the provided `link_text` still makes sense to screen readers when combined with the title.

data/config/locales/en.yml

@@ -58,6 +58,8 @@ en:
       policies: "Policies"
       statistical_data_sets: "Statistical data sets"
       topical_events: "Topical events"
+    print_link:
+      text: "Print this page"
     skip_link:
       text: "Skip to main content"
     step_by_step_nav:
@@ -71,3 +73,6 @@ en:
       email_signup_link_text: "Get email alerts"
       feed_link_text: "Subscribe to feed"
       subscriptions: "Subscriptions"
+    summary_list:
+      edit: "Change"
+      delete: "Delete"

data/lib/govuk_publishing_components.rb

@@ -12,9 +12,10 @@ require "govuk_publishing_components/presenters/contextual_navigation"
 require "govuk_publishing_components/presenters/related_navigation_helper"
 require "govuk_publishing_components/presenters/step_by_step_nav_helper"
 require "govuk_publishing_components/presenters/page_with_step_by_step_navigation"
-require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_parent"
+require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority"
 require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons"
+require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_topic"
 require "govuk_publishing_components/presenters/checkboxes_helper"
 require "govuk_publishing_components/presenters/select"
 require "govuk_publishing_components/presenters/meta_tags"

data/lib/govuk_publishing_components/presenters/breadcrumb_selector.rb

@@ -1,10 +1,6 @@
 module GovukPublishingComponents
   module Presenters
     class BreadcrumbSelector
-      def self.call(*args)
-        new(*args).output
-      end
-
       attr_reader :content_item, :request, :prioritise_taxon_breadcrumbs
 
       def initialize(content_item, request, prioritise_taxon_breadcrumbs)
@@ -13,47 +9,28 @@ module GovukPublishingComponents
         @prioritise_taxon_breadcrumbs = prioritise_taxon_breadcrumbs
       end
 
-      def content_item_navigation
-        @content_item_navigation ||= ContextualNavigation.new(content_item, request)
+      def breadcrumbs
+        best_match_option[:breadcrumbs]
       end
 
-      def parent_item_navigation
-        @parent_item_navigation ||= ContextualNavigation.new(parent_item, request)
+      def step_by_step
+        best_match_option[:step_by_step]
       end
 
-      def parent_item
-        @parent_item ||= Services.content_store.content_item(content_item_navigation.parent_api_path)
-      rescue GdsApi::ContentStore::ItemNotFound
-        # Do nothing
-      end
+      def priority_breadcrumbs
+        return parent_item_navigation.priority_breadcrumbs if content_item_navigation.html_publication_with_parent?
 
-      def parent_item_options
-        @parent_item_options ||= options(parent_item_navigation)
+        content_item_navigation.priority_breadcrumbs
       end
 
-      def content_item_options
-        @content_item_options ||= options(content_item_navigation)
-      end
+    private
 
-      def parent_breadcrumbs
-        breadcrumbs = [parent_item_options[:breadcrumbs]].flatten # to ensure breadcrumbs always an array
-        breadcrumbs.last[:is_page_parent] = false
-        breadcrumbs << {
-          title: parent_item["title"],
-          url: parent_item["base_path"],
-          is_page_parent: true,
-        }
-      end
-
-      def output
+      def best_match_option
         return content_item_options unless content_item_navigation.html_publication_with_parent?
-        return parent_item_options if parent_item_navigation.priority_breadcrumbs
-
-        step_by_step_header = parent_item_options[:step_by_step]
 
         {
-          step_by_step: step_by_step_header,
-          breadcrumbs: step_by_step_header ? parent_breadcrumbs.first : parent_breadcrumbs,
+          step_by_step: parent_is_step_by_step?,
+          breadcrumbs: parent_is_step_by_step? ? parent_breadcrumbs.first : parent_breadcrumbs,
         }
       end
 
@@ -61,18 +38,13 @@ module GovukPublishingComponents
         if navigation.content_tagged_to_a_finder?
           {
             step_by_step: false,
-            breadcrumbs: navigation.breadcrumbs,
+            breadcrumbs: navigation.finder_breadcrumbs,
           }
         elsif navigation.content_tagged_to_current_step_by_step?
           {
             step_by_step: true,
             breadcrumbs: navigation.step_nav_helper.header,
           }
-        elsif navigation.priority_breadcrumbs
-          {
-            step_by_step: true,
-            breadcrumbs: navigation.priority_breadcrumbs,
-          }
         elsif navigation.content_is_tagged_to_a_live_taxon? && prioritise_taxon_breadcrumbs
           {
             step_by_step: false,
@@ -83,10 +55,10 @@ module GovukPublishingComponents
             step_by_step: false,
             breadcrumbs: navigation.breadcrumbs,
           }
-        elsif navigation.content_has_curated_related_items?
+        elsif navigation.content_has_a_topic?
           {
             step_by_step: false,
-            breadcrumbs: navigation.breadcrumbs,
+            breadcrumbs: navigation.topic_breadcrumbs,
           }
         elsif navigation.use_taxon_breadcrumbs?
           {
@@ -102,6 +74,42 @@ module GovukPublishingComponents
           {}
         end
       end
+
+      def content_item_navigation
+        @content_item_navigation ||= ContextualNavigation.new(content_item, request)
+      end
+
+      def parent_item_navigation
+        @parent_item_navigation ||= ContextualNavigation.new(parent_item, request)
+      end
+
+      def parent_item
+        @parent_item ||= Services.content_store.content_item(content_item_navigation.parent_api_path)
+      rescue GdsApi::ContentStore::ItemNotFound
+        # Do nothing
+      end
+
+      def parent_item_options
+        @parent_item_options ||= options(parent_item_navigation)
+      end
+
+      def content_item_options
+        @content_item_options ||= options(content_item_navigation)
+      end
+
+      def parent_breadcrumbs
+        breadcrumbs = [parent_item_options[:breadcrumbs]].flatten # to ensure breadcrumbs always an array
+        breadcrumbs.last[:is_page_parent] = false
+        breadcrumbs << {
+          title: parent_item["title"],
+          url: parent_item["base_path"],
+          is_page_parent: true,
+        }
+      end
+
+      def parent_is_step_by_step?
+        parent_item_options[:step_by_step]
+      end
     end
   end
 end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_ancestors.rb

@@ -0,0 +1,41 @@
+module GovukPublishingComponents
+  module Presenters
+    # @private
+    class ContentBreadcrumbsBasedOnAncestors
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
+      def initialize(content_item)
+        @content_item = ContentItem.new(content_item)
+      end
+
+      def breadcrumbs
+        ordered_ancestors = all_ancestors.map do |ancestor|
+          { title: ancestor.title, url: ancestor.base_path }
+        end
+
+        ordered_ancestors << { title: "Home", url: "/" }
+        ordered_ancestors.reverse!
+        ordered_ancestors
+      end
+
+    private
+
+      attr_reader :content_item
+
+      def all_ancestors
+        ancestors = []
+
+        parent = content_item.parent
+        while parent
+          ancestors << parent
+
+          parent = parent.parent
+        end
+
+        ancestors
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -6,6 +6,7 @@ module GovukPublishingComponents
       #   and the bottom one the lowest priority
       PRIORITY_TAXONS = {
         education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
+        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
         business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
       }.freeze
 

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_taxons.rb

@@ -2,6 +2,10 @@ module GovukPublishingComponents
   module Presenters
     # @private
     class ContentBreadcrumbsBasedOnTaxons
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
       def initialize(content_item)
         @content_item = ContentItem.new(content_item)
       end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_topic.rb

@@ -0,0 +1,38 @@
+module GovukPublishingComponents
+  module Presenters
+    class ContentBreadcrumbsBasedOnTopic
+      def self.call(content_item)
+        new(content_item).breadcrumbs
+      end
+
+      attr_reader :content_item
+
+      def initialize(content_item)
+        @content_item = content_item
+      end
+
+      def breadcrumbs
+        breadcrumbs = [{ title: "Home", url: "/" }]
+        return breadcrumbs unless topics.present?
+
+        breadcrumbs << topic_breadcrumb
+        breadcrumbs
+      end
+
+      def topic_breadcrumb
+        {
+          title: first_topic["title"],
+          url: first_topic["base_path"],
+        }
+      end
+
+      def first_topic
+        topics.first
+      end
+
+      def topics
+        @topics ||= content_item.dig("links", "topics")
+      end
+    end
+  end
+end