govuk_publishing_components 28.9.0 → 28.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd778ec8393d73593a0efed8121a361f120adcfcfb3afaa2636e988098ffc748
-  data.tar.gz: 6464e9b000c6042e360af3f3dbd64eb867cb4c64e0823e13388e375c9958df9c
+  metadata.gz: 6c3bd6215882051b9c863a3b252cdb8163820babf43ddbc6a8fa833c0da5f5b1
+  data.tar.gz: 552d3420a3ccf2264bfd6a9a8304c6d24d8eb2a24306daab0b1b2d3998df7309
 SHA512:
-  metadata.gz: fc2047a42108470a5c65cb207e721096e85c9d7ca06664102a4815b6bf2cf81e15be44827bda61760a9edbac45b08775004d7bf782ba2d1a4411ac58316525af
-  data.tar.gz: 15b4a62e81f1e8a62756b7f780635ee33edf8d1db5b6cf21fc6902cae9fa7ca7c85d191585b2bc59f7c6e1284ecdccfa4390b4e683516962c9072e6c6c71b9ff
+  metadata.gz: 2979878f87bb5ad5dd9daf50a81aa7fe4baeab0569d2b4d686281fd1f87aa3bea056c247784449b12a557fde3e2cf03eea7568445d4522601111a2a1b9528566
+  data.tar.gz: 24ee9afa94eee26d28896e9dc4d4dff843020ad9f1756b449404a35ae71ff2a881c666933e4e10b2a8c0ca32faa14dfddc2880605f672c5c60526e4df03e4588

data/app/assets/stylesheets/govuk_publishing_components/components/_contextual-sidebar.scss

@@ -1,5 +1,3 @@
-$transition-campaign-red: #ff003b;
-
 .gem-c-contextual-sidebar__related-links {
   border-top: 2px solid $govuk-brand-colour;
 }
@@ -26,7 +24,3 @@ $transition-campaign-red: #ff003b;
   padding: 0 govuk-spacing(3) govuk-spacing(3);
   text-decoration: none;
 }
-
-.gem-c-contextual-sidebar__cta--brexit {
-  border-top: 2px solid $transition-campaign-red;
-}

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

@@ -27,8 +27,4 @@
   <% if navigation.show_ukraine_cta? %>
     <%= render 'govuk_publishing_components/components/contextual_sidebar/ukraine_cta', content_item: content_item %>
   <% end %>
-
-  <% if navigation.show_brexit_cta? %>
-    <%= render 'govuk_publishing_components/components/contextual_sidebar/brexit_cta', content_item: content_item %>
-  <% end %>
 </div>

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

@@ -86,33 +86,6 @@ examples:
                       - text: The Highway Code
                         href: "/guidance/the-highway-code"
                     optional: false
-  with_brexit_cta:
-    description: For documents tagged with certain taxons defined in `brexit_cta_taxon_allow_list` we show a custom Brexit call to action element.
-    data:
-      content_item:
-        title: "Transport news story"
-        content_id: "3c402d90-fe77-49b9-a8aa-1800d4fc2b3d"
-        locale: "en"
-        links:
-          ordered_related_items:
-          - title: Find an apprenticeship
-            base_path: /apply-apprenticeship
-          - title: Training and study at work
-            base_path: /training-study-work-your-rights
-          - title: Careers helpline for teenagers
-            base_path: /careers-helpline-for-teenagers
-          document_collections:
-          - title: Recruit an apprentice (formerly apprenticeship vacancies)
-            base_path: /government/collections/apprenticeship-vacancies
-            document_type: document_collection
-          - title: The future of jobs and skills
-            base_path: /government/collections/the-future-of-jobs-and-skills
-            document_type: document_collection
-          taxons:
-            - content_id: "2f8b848d-23c8-4f42-a41a-df1f81c64d0f"
-              title: "Exporting"
-              phase: "live"
-
   with_ukraine_cta:
     description: For documents tagged to the Ukraine topical event we show a custom 'Ukraine Invasion' call to action element.
     data:

data/config/locales/en.yml

@@ -177,10 +177,10 @@ en:
       navigation_search_heading: Search and popular pages
       navigation_search_subheading: Search
       popular_links:
+      - label: 'Invasion of Ukraine'
+        href: "/government/topical-events/russian-invasion-of-ukraine-uk-government-response"
       - label: 'Coronavirus (COVID-19)'
         href: "/coronavirus"
-      - label: 'Brexit: check what you need to do'
-        href: "/brexit"
       - label: Find a job
         href: "/find-a-job"
       - label: 'Personal tax account: sign in'

data/lib/govuk_publishing_components/presenters/contextual_navigation.rb

@@ -108,51 +108,6 @@ module GovukPublishingComponents
         false
       end
 
-      def brexit_cta_taxon_allow_list
-        # Overseas businesses: exporting to the UK
-        # Exporting goods and services
-        # Exporting
-        # Manufacturing, wholesaling, importing and exporting medicines
-        # Importing goods and services
-        # Importing
-        # Manufacturing, wholesaling, importing and exporting medicines
-        %w[
-          2f8b848d-23c8-4f42-a41a-df1f81c64d0f
-          8af13fba-d969-4d87-a02e-2e71783d47be
-          efa9782b-a3d0-4ca0-9c92-3b89748175b7
-          f441e630-2bba-4bbd-8c1b-22ae61cc00c2
-          4788b4b8-2642-47ca-bfc2-bd7e8705a1da
-          d74faafc-781d-4087-8e0c-be4216180059
-          f441e630-2bba-4bbd-8c1b-22ae61cc00c2
-        ]
-      end
-
-      def brexit_cta_taxon_allow_list?
-        taxons = content_item.dig("links", "taxons").to_a
-        taxons.each do |taxon|
-          if brexit_cta_taxon_allow_list.include?(taxon["content_id"]) || parent_taxon_include?(taxon, brexit_cta_taxon_allow_list)
-            return true
-          end
-        end
-        false
-      end
-
-      def parent_taxon_include?(taxon, taxon_list)
-        if taxon.present?
-          if taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| taxon_list.include?(taxon_item["content_id"]) }
-            return true
-          end
-
-          taxon.dig("links", "parent_taxons").to_a.any? { |taxon_item| parent_taxon_include?(taxon_item, taxon_list) }
-        else
-          false
-        end
-      end
-
-      def show_brexit_cta?
-        brexit_cta_taxon_allow_list?
-      end
-
       def content_tagged_to_current_step_by_step?
         # TODO: remove indirection here
         step_nav_helper.show_header?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "28.9.0".freeze
+  VERSION = "28.9.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 28.9.0
+  version: 28.9.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -728,7 +728,6 @@ files:
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_document.html.erb
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_generic.html.erb
 - app/views/govuk_publishing_components/components/attachment/_thumbnail_spreadsheet.html.erb
-- app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb
 - app/views/govuk_publishing_components/components/contextual_sidebar/_ukraine_cta.html.erb
 - app/views/govuk_publishing_components/components/docs/accordion.yml
 - app/views/govuk_publishing_components/components/docs/action_link.yml

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb

@@ -1,27 +0,0 @@
-<% shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns) %>
-<%
-  title = t("components.related_navigation.transition.title")
-  link_text = t("components.related_navigation.transition.link_text")
-  link_path = t("components.related_navigation.transition.link_path")
-  lang = shared_helper.t_locale("components.related_navigation.transition.title")
-%>
-
-<% data_attributes = {
-  "module": "gem-track-click",
-  "track-category": "relatedLinkClicked",
-  "track-action": "1.0 Transition",
-  "track-label": link_path,
-  "track-dimension": link_text,
-  "track-dimension-index": "29",
-} %>
-
-<%= tag.div class: "gem-c-contextual-sidebar__cta gem-c-contextual-sidebar__cta--brexit" do %>
-  <%= tag.h2 title, class: "gem-c-contextual-sidebar__heading govuk-heading-s" %>
-  <%= tag.p class: "gem-c-contextual-sidebar__text govuk-body" do %>
-    <%= link_to link_text,
-      link_path,
-      class: "govuk-link",
-      data: data_attributes,
-      lang: lang %>
-  <% end %>
-<% end %>