govuk_publishing_components 24.18.5 → 24.21.1

data/config/locales/tr.yml

@@ -79,6 +79,14 @@ tr:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/uk.yml

@@ -79,6 +79,14 @@ uk:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/ur.yml

@@ -79,6 +79,14 @@ ur:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/uz.yml

@@ -79,6 +79,14 @@ uz:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/vi.yml

@@ -79,6 +79,14 @@ vi:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/zh-hk.yml

@@ -79,6 +79,14 @@ zh-hk:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/zh-tw.yml

@@ -79,6 +79,14 @@ zh-tw:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/config/locales/zh.yml

@@ -79,6 +79,14 @@ zh:
       search_button:
       show_button:
       top_level:
+    layout_super_navigation_header:
+      logo_link_title:
+      logo_text:
+      navigation_menu_heading:
+      search_text:
+      popular_links_heading:
+      popular_links:
+      navigation_links:
     metadata:
       from:
       history:

data/lib/govuk_publishing_components/app_helpers/environment.rb

@@ -1,19 +1,14 @@
 module GovukPublishingComponents
   module AppHelpers
     class Environment
-      GOVUK_ENVIRONMENTS = {
-        "production" => "production",
-        "staging" => "staging",
-        "integration-blue-aws" => "integration",
-      }.freeze
+      GOVUK_ENVIRONMENTS = %w[integration staging production].freeze
 
       # The "acceptance environment" we're in - not the same as Rails env.
-      #
-      # Can be "production", "staging", "integration", or "development"
+      # Can be "production", "staging", "integration", "development" or "example" (if running on Heroku)
       def self.current_acceptance_environment
         return "example" if ENV["HEROKU"]
 
-        GOVUK_ENVIRONMENTS.fetch(ENV["ERRBIT_ENVIRONMENT_NAME"], "development")
+        GOVUK_ENVIRONMENTS.include?(ENV["GOVUK_ENVIRONMENT_NAME"]) ? ENV["GOVUK_ENVIRONMENT_NAME"] : "development"
       end
     end
   end

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -4,15 +4,18 @@ module GovukPublishingComponents
       # keys are labels, values are the content_ids for the matching taxons
       # Where multiple matching taxons are present, the top most one is the highest priority
       #   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",
+      BREXIT_TAXONS = {
         brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
         brexit_individuals: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
         brexit_taxon: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
+      PRIORITY_TAXONS = {
+        education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
+        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
+        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
+      }.merge(BREXIT_TAXONS).freeze
+
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item, query_parameters = nil)
         new(content_item, query_parameters).breadcrumbs
@@ -25,16 +28,24 @@ module GovukPublishingComponents
         @query_parameters = query_parameters
       end
 
-      def taxon
-        @taxon ||= begin
+      def priority_taxon
+        @priority_taxon ||= begin
           default_taxon = priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
           preferred_taxon || default_taxon
         end
       end
 
+      def priority_brexit_taxon
+        if tagged_to_both_brexit_child_taxons?
+          priority_brexit_taxons.find { |t| t["content_id"] == BREXIT_TAXONS[:brexit_taxon] }
+        else
+          priority_brexit_taxons.min_by { |t| BREXIT_TAXONS.values.index(t["content_id"]) }
+        end
+      end
+
       def breadcrumbs
-        taxon && {
-          title: taxon["title"],
+        priority_taxon && {
+          title: priority_taxon["title"],
           path: breadcrumb_path,
           tracking_category: "breadcrumbClicked",
           tracking_action: tracking_action,
@@ -43,7 +54,9 @@ module GovukPublishingComponents
         }
       end
 
-      def brexit_audience
+      def brexit_audience(taxon)
+        return nil unless taxon
+
         {
           PRIORITY_TAXONS[:brexit_business] => "Brexitbusiness",
           PRIORITY_TAXONS[:brexit_individuals] => "Brexitcitizen",
@@ -70,6 +83,10 @@ module GovukPublishingComponents
         end
       end
 
+      def priority_brexit_taxons
+        priority_taxons.select { |t| priority_brexit_taxon?(t) }
+      end
+
       def taxon_tree(taxons)
         return [] if taxons.blank?
 
@@ -80,6 +97,10 @@ module GovukPublishingComponents
         PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
 
+      def priority_brexit_taxon?(taxon)
+        BREXIT_TAXONS.values.include?(taxon["content_id"])
+      end
+
       def brexit_child_taxon?(taxon)
         brexit_child_taxons.include?(taxon["content_id"])
       end
@@ -94,7 +115,7 @@ module GovukPublishingComponents
 
       def tracking_action
         action = %w[superBreadcrumb]
-        action << brexit_audience
+        action << brexit_audience(priority_taxon)
         action.compact.join(" ")
       end
 
@@ -104,7 +125,7 @@ module GovukPublishingComponents
       end
 
       def breadcrumb_path
-        taxon.dig("details", "url_override").present? ? taxon.dig("details", "url_override") : taxon["base_path"]
+        priority_taxon.dig("details", "url_override").present? ? priority_taxon.dig("details", "url_override") : priority_taxon["base_path"]
       end
     end
   end

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -123,21 +123,28 @@ module GovukPublishingComponents
         return meta_tags if taxons.blank?
         return meta_tags unless tagged_to_priority_taxon?
 
-        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
+        taxon =
+          tag_key == "govuk:brexit-audience" ? priority_brexit_taxon : priority_taxon
 
+        brexit_audience = priority_taxon_helper.brexit_audience(taxon)
+        meta_tags[tag_key] = brexit_audience if brexit_audience.present?
         meta_tags
       end
 
       def tagged_to_priority_taxon?
-        priority_taxon_helper.taxon.present?
+        priority_taxon_helper.priority_taxon.present?
       end
 
       def priority_taxon_helper
         @priority_taxon_helper ||= ContentBreadcrumbsBasedOnPriority.new(content_item.deep_stringify_keys, request.query_parameters)
       end
 
-      def brexit_audience
-        priority_taxon_helper.brexit_audience
+      def priority_taxon
+        priority_taxon_helper.priority_taxon
+      end
+
+      def priority_brexit_taxon
+        priority_taxon_helper.priority_brexit_taxon
       end
 
       def has_content_history?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.18.5".freeze
+  VERSION = "24.21.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.18.5
+  version: 24.21.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -475,6 +475,7 @@ files:
 - app/assets/javascripts/govuk_publishing_components/components/feedback.js
 - app/assets/javascripts/govuk_publishing_components/components/govspeak.js
 - app/assets/javascripts/govuk_publishing_components/components/layout-header.js
+- app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js
 - app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js
 - app/assets/javascripts/govuk_publishing_components/components/print-link.js
 - app/assets/javascripts/govuk_publishing_components/components/radio.js
@@ -546,12 +547,14 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_input.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_inset-text.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_intervention.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_label.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_layout-for-admin.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_layout-super-navigation-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_lead-paragraph.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_metadata.scss
 - app/assets/stylesheets/govuk_publishing_components/components/_modal-dialogue.scss
@@ -624,6 +627,7 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_layout-footer.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_layout-header.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_layout-super-navigation-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_metadata.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_search.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_share-links.scss
@@ -694,12 +698,14 @@ files:
 - app/views/govuk_publishing_components/components/_image_card.html.erb
 - app/views/govuk_publishing_components/components/_input.html.erb
 - app/views/govuk_publishing_components/components/_inset_text.html.erb
+- app/views/govuk_publishing_components/components/_intervention.html.erb
 - app/views/govuk_publishing_components/components/_inverse_header.html.erb
 - app/views/govuk_publishing_components/components/_label.html.erb
 - app/views/govuk_publishing_components/components/_layout_footer.html.erb
 - app/views/govuk_publishing_components/components/_layout_for_admin.html.erb
 - app/views/govuk_publishing_components/components/_layout_for_public.html.erb
 - app/views/govuk_publishing_components/components/_layout_header.html.erb
+- app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb
 - app/views/govuk_publishing_components/components/_lead_paragraph.html.erb
 - app/views/govuk_publishing_components/components/_list.html.erb
 - app/views/govuk_publishing_components/components/_machine_readable_metadata.html.erb
@@ -773,12 +779,14 @@ files:
 - app/views/govuk_publishing_components/components/docs/image_card.yml
 - app/views/govuk_publishing_components/components/docs/input.yml
 - app/views/govuk_publishing_components/components/docs/inset_text.yml
+- app/views/govuk_publishing_components/components/docs/intervention.yml
 - app/views/govuk_publishing_components/components/docs/inverse_header.yml
 - app/views/govuk_publishing_components/components/docs/label.yml
 - app/views/govuk_publishing_components/components/docs/layout_footer.yml
 - app/views/govuk_publishing_components/components/docs/layout_for_admin.yml
 - app/views/govuk_publishing_components/components/docs/layout_for_public.yml
 - app/views/govuk_publishing_components/components/docs/layout_header.yml
+- app/views/govuk_publishing_components/components/docs/layout_super_navigation_header.yml
 - app/views/govuk_publishing_components/components/docs/lead_paragraph.yml
 - app/views/govuk_publishing_components/components/docs/list.yml
 - app/views/govuk_publishing_components/components/docs/machine_readable_metadata.yml