govuk_publishing_components 9.26.0 → 9.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bc4ea81c6afca132f69c421bad8aba0f4ccf9702ae9e067123a924fc46c2f59
-  data.tar.gz: dc45f0ac53c4b2d333a344485e689242728dbd837708c5fa26a6abecd3f9319b
+  metadata.gz: 5eb88659bbccc009aa73c9269e763c77991316574a3dcd97f19fce6bf628cfc7
+  data.tar.gz: da410f0890205197ce0b74334f4f42c120e844ec1742bd26595ca492ce40ca94
 SHA512:
-  metadata.gz: 6c82bf497d2fecd01310d5116781130462be995d696041fae6623226368f230b10de534ec0945e15ed2d3a3856cb3414d74ef2d2da99c6ac0422702b766c112b
-  data.tar.gz: eab2eb21fadcfe73cd29cff6e3601b7c156188daa16b1fea3294245ff7710fe7c7ec5df9427ac91d7b8c8bb091a8d24ecb057ce89deb6bba88e4f76a4eae036f
+  metadata.gz: 466e5fb908c79e4f2ed4ee376e1f4ed07ac645c9f34e4036bb96d88c94e8affff78d69649ac89b46888dccca87f8ae23882bea91184f231342f174fe16e5185a
+  data.tar.gz: ab9e76586ba05a5916e09e18a13d71a86d88ac07343c500c93e27cbe903904b6c231b84323461b1e16994f4e2c6709c5c773fc971c0d3e39a3d5a4c0a1956e3f

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

@@ -11,12 +11,12 @@ body: |
   - Mainstream, which uses related links in the [related navigation component][related_navigation]
   - Related navigation, which uses legacy taxonomies in the [related navigation component][related_navigation]
 
-  It must always used [together with the contextual breadcrumbs][contextual_breadcrumbs].
+  It must always be used [with the contextual breadcrumbs component][contextual_breadcrumbs].
 
   [preview]: https://govuk-publishing-components.herokuapp.com/contextual-navigation
   [step-by-step]: /component-guide/step_by_step_nav
   [related_navigation]: /component-guide/related_navigation
-  [taxonomy-sidebar]: https://govuk-publishing-components.herokuapp.com/component-guide/taxonomy_sidebar
+  [taxonomy-sidebar]: https://govuk-publishing-components.herokuapp.com/component-guide/taxonomy_navigation
   [contextual_breadcrumbs]: /component-guide/contextual_breadcrumbs
 accessibility_criteria: |
   Components called by this component must be accessible

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

@@ -54,3 +54,17 @@ examples:
         base_path: "/foo"
         details: {}
       schema: :organisation
+  organisation_schema_with_related_orgs:
+    data:
+      content_item:
+        title: "Magical Artefacts Agency"
+        base_path: "/foo"
+        details: {}
+        links:
+          ordered_parent_organisations:
+            - title: "Ministry of Magic"
+              base_path: "/ministry-of-magic"
+          ordered_child_organisations:
+            - title: "Dodgy Wands Commission"
+              base_path: "/dodgy-wands-commission"
+      schema: :organisation

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

@@ -92,7 +92,7 @@ examples:
           path: "/world/argentina/news"
   no_children:
     description: |
-      The child links are usually pulled from rummager. If rummager doesn’t respond we fallback to a sidebar with a taxon link but without any child content links.
+      Shows a sidebar with a taxon link but without any child content links.
     data:
       items:
         - title: "School curriculum"

data/lib/govuk_publishing_components.rb

@@ -11,7 +11,6 @@ require "govuk_publishing_components/presenters/content_breadcrumbs_based_on_tax
 require "govuk_publishing_components/presenters/services"
 require "govuk_publishing_components/presenters/meta_tags"
 require "govuk_publishing_components/presenters/taxonomy_navigation"
-require "govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links"
 require "govuk_publishing_components/presenters/curated_taxonomy_sidebar_links"
 require "govuk_publishing_components/presenters/content_item"
 require "govuk_publishing_components/presenters/translation_nav_helper"

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -18,6 +18,39 @@ module GovukPublishingComponents
           },
           "name" => page.title,
           "description" => page.body
+        }.merge(parent_organisations).merge(sub_organisations)
+      end
+
+    private
+
+      def parent_organisations
+        related_organisations("ordered_parent_organisations", "parentOrganization")
+      end
+
+      def sub_organisations
+        related_organisations("ordered_child_organisations", "subOrganization")
+      end
+
+      def related_organisations(link_type, schema_name)
+        organisations = page.content_item.dig("links", link_type)
+
+        return {} unless organisations.present?
+
+        related_orgs = organisations.map do |org|
+          page = Page.new(content_item: org)
+          linked_org(page.canonical_url)
+        end
+
+        {
+          schema_name => related_orgs
+        }
+      end
+
+      def linked_org(url)
+        {
+          "@context" => "http://schema.org",
+          "@type" => "GovernmentOrganization",
+          "sameAs" => url
         }
       end
     end

data/lib/govuk_publishing_components/presenters/taxonomy_navigation.rb

@@ -29,22 +29,8 @@ module GovukPublishingComponents
         end
       end
 
-      def there_are_related_item_overrides?
-        # TODO: We should check for any external links when we have "new"
-        # external links being curated in Content Tagger
-        @content_item.curated_taxonomy_sidebar_links.any?
-      end
-
       def related_items
-        related_items_factory.new(@content_item).related_items
-      end
-
-      def related_items_factory
-        if there_are_related_item_overrides?
-          CuratedTaxonomySidebarLinks
-        else
-          RummagerTaxonomySidebarLinks
-        end
+        CuratedTaxonomySidebarLinks.new(@content_item).related_items
       end
 
       def collections

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '9.26.0'.freeze
+  VERSION = '9.26.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 9.26.0
+  version: 9.26.1
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -598,7 +598,6 @@ files:
 - lib/govuk_publishing_components/presenters/organisation_logo_helper.rb
 - lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb
 - lib/govuk_publishing_components/presenters/related_navigation_helper.rb
-- lib/govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links.rb
 - lib/govuk_publishing_components/presenters/schema_org.rb
 - lib/govuk_publishing_components/presenters/services.rb
 - lib/govuk_publishing_components/presenters/step_by_step_nav_helper.rb

data/lib/govuk_publishing_components/presenters/rummager_taxonomy_sidebar_links.rb

@@ -1,62 +0,0 @@
-require 'govuk_app_config'
-
-module GovukPublishingComponents
-  module Presenters
-    # @private
-    class RummagerTaxonomySidebarLinks
-      def initialize(content_item)
-        @content_item = content_item
-      end
-
-      def related_items
-        parent_taxons = @content_item.parent_taxons
-        used_related_links = Set.new
-
-        parent_taxons.each_with_index.map do |parent_taxon, index|
-          related_content = index < 2 ? content_related_to(parent_taxon, used_related_links) : []
-
-          used_related_links.merge(
-            related_content.map { |content| content[:link] }
-          )
-
-          {
-            title: parent_taxon.title,
-            url: parent_taxon.base_path,
-            description: parent_taxon.description,
-            related_content: related_content,
-          }
-        end
-      end
-
-    private
-
-      # This method will fetch content related to content_item, and tagged to taxon. This is a
-      # temporary method that uses search to achieve this. This behaviour is to be moved into
-      # the content store
-      def content_related_to(taxon, used_related_links)
-        GovukStatsd.time(:taxonomy_sidebar_search_time) do
-          begin
-            results = Services.rummager.search(
-              similar_to: @content_item.base_path,
-              start: 0,
-              count: 3,
-              filter_taxons: [taxon.content_id],
-              filter_navigation_document_supertype: 'guidance',
-              reject_link: used_related_links.to_a,
-              fields: %w[title link],
-            )['results']
-
-            GovukStatsd.increment(:taxonomy_sidebar_searches)
-
-            results
-              .map { |result| { title: result['title'], link: result['link'], } }
-              .sort_by { |result| result[:title] }
-          rescue StandardError => e
-            GovukError.notify(e)
-            []
-          end
-        end
-      end
-    end
-  end
-end