govuk_navigation_helpers 7.2.0 → 7.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c4644606497db5d6ae79f9f8a67b856e8d3f87
-  data.tar.gz: 1e5487023976443194ceb13ad150448298a1e5a1
+  metadata.gz: bd5ef3d4af8ffb2176daca33c354ac2d962bae58
+  data.tar.gz: 4a1d6327ee72a8f91795c76a473df9320bb05f0c
 SHA512:
-  metadata.gz: 3c594e80668e35db4d3182528653309090007e4cee7c1c98cf2a9fbcfe1a4aa72ef8702a97c8d5a5db209b61a72bb444d1f1e98297f80ef15a62e711f342d0a7
-  data.tar.gz: 2129c71dcb21c224effd2be1ffabaa1728ce3f9a0635cbfa3bcf38a077f17a87981dbf727a6d2ee99162f7ea1a651caee75761df565f745e753b8c3dff8e33bb
+  metadata.gz: ed4664e5fd7885e675555108d62003a499a7e1e9da22ce6703dde2e27720c83b7f1b458204b8395b05124f4a083663cfbe7e1deebff2237bd3d81b8f78202eef
+  data.tar.gz: e09067d9582334c4550a398b9deffed871675cac61e5206910d1c7c929711e2e9cfd59a005d5061557dc9bc8c25b0d5834859e5f39154ba948cec65cc2130ae6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 7.3.0
+
+* Update related navigation sidebar helper to return topical events and worldwide organisations.
+
 ## 7.2.0
 
 * Update related navigation sidebar helper to also return world location data

data/lib/govuk_navigation_helpers/content_item.rb

@@ -105,10 +105,18 @@ module GovukNavigationHelpers
       filter_link_type(content_store_response.dig("links", "topics").to_a, "topic")
     end
 
+    def related_topical_events
+      filter_link_type(content_store_response.dig("links", "topical_events").to_a, "topical_event")
+    end
+
     def related_world_locations
       content_store_response.dig("links", "world_locations").to_a
     end
 
+    def related_worldwide_organisations
+      filter_link_type(content_store_response.dig("links", "worldwide_organisations").to_a, "worldwide_organisation")
+    end
+
     def external_links
       content_store_response.dig("details", "external_related_links").to_a
     end

data/lib/govuk_navigation_helpers/related_navigation_sidebar.rb

@@ -12,9 +12,11 @@ module GovukNavigationHelpers
         related_items: related_items,
         collections: related_collections,
         topics: related_topics,
+        topical_events: related_topical_events,
         policies: related_policies,
         publishers: related_organisations,
         world_locations: related_world_locations,
+        worldwide_organisations: related_worldwide_organisations,
         other: [related_external_links, related_contacts]
       }
     end
@@ -50,6 +52,10 @@ module GovukNavigationHelpers
       build_links_for_sidebar(locations)
     end
 
+    def related_worldwide_organisations
+      build_links_for_sidebar(@content_item.related_worldwide_organisations)
+    end
+
     def related_collections
       build_links_for_sidebar(@content_item.related_collections)
     end
@@ -62,6 +68,10 @@ module GovukNavigationHelpers
       build_links_for_sidebar(@content_item.related_topics)
     end
 
+    def related_topical_events
+      build_links_for_sidebar(@content_item.related_topical_events)
+    end
+
     def related_contacts
       return [] unless @content_item.related_other_contacts.any?
       [

data/lib/govuk_navigation_helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukNavigationHelpers
-  VERSION = "7.2.0".freeze
+  VERSION = "7.3.0".freeze
 end

data/spec/{navigation_sidebar_spec.rb → related_navigation_sidebar_spec.rb}

@@ -27,9 +27,11 @@ RSpec.describe GovukNavigationHelpers::RelatedNavigationSidebar do
         related_items: [],
         collections: [],
         topics: [],
+        topical_events: [],
         policies: [],
         publishers: [],
         world_locations: [],
+        worldwide_organisations: [],
         other: [[], []]
       }
 
@@ -75,6 +77,15 @@ RSpec.describe GovukNavigationHelpers::RelatedNavigationSidebar do
               "document_type" => "topic"
             }
           ],
+          "topical_events" => [
+            {
+              "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+              "locale" => "en",
+              "base_path" => "/related-topical-event",
+              "title" => "related topical event",
+              "document_type" => "topical_event"
+            }
+          ],
           "organisations" => [
             {
               "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
@@ -107,15 +118,55 @@ RSpec.describe GovukNavigationHelpers::RelatedNavigationSidebar do
         related_items: [{ path: "/related-item", text: "related item" }],
         collections: [{ path: "/related-collection", text: "related collection" }],
         topics: [{ path: "/related-topic", text: "related topic" }],
+        topical_events: [{ path: "/related-topical-event", text: "related topical event" }],
         policies: [{ path: "/related-policy", text: "related policy" }],
         publishers: [{ path: "/related-organisation", text: "related organisation" }],
         world_locations: [{ path: "/world/world-location/news", text: "World Location" }],
+        worldwide_organisations: [],
         other: [[], []]
       }
 
       expect(payload).to eql(expected)
     end
 
+    it "returns worldwide organisations" do
+      payload = payload_for("world_location_news_article",
+        "details" => {
+          "body" => "body",
+          "government" => {
+            "title" => "government",
+            "slug" => "government",
+            "current" => true
+          },
+          "political" => true,
+          "first_public_at" => "2016-01-01T19:00:00Z",
+        },
+        "links" => {
+          "worldwide_organisations" => [
+            {
+              "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+              "title" => "related worldwide organisation",
+              "base_path" => "/related-worldwide-organisation",
+              "document_type" => "worldwide_organisation",
+              "locale" => "en"
+            }
+          ],
+        }
+      )
+      expected = {
+        related_items: [],
+        collections: [],
+        topics: [],
+        topical_events: [],
+        policies: [],
+        publishers: [],
+        world_locations: [],
+        worldwide_organisations: [{ path: "/related-worldwide-organisation", text: "related worldwide organisation" }],
+        other: [[], []]
+      }
+      expect(payload).to eql(expected)
+    end
+
     it "returns an Elsewhere on the web section for external related links" do
       payload = payload_for("placeholder",
         "details" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -184,8 +184,8 @@ files:
 - lib/govuk_navigation_helpers/version.rb
 - spec/breadcrumbs_spec.rb
 - spec/content_item_spec.rb
-- spec/navigation_sidebar_spec.rb
 - spec/related_items_spec.rb
+- spec/related_navigation_sidebar_spec.rb
 - spec/spec_helper.rb
 - spec/taxon_breadcrumbs_spec.rb
 - spec/taxonomy_sidebar_spec.rb
@@ -216,8 +216,8 @@ summary: Gem to transform items from the content-store into payloads for GOV.UK
 test_files:
 - spec/breadcrumbs_spec.rb
 - spec/content_item_spec.rb
-- spec/navigation_sidebar_spec.rb
 - spec/related_items_spec.rb
+- spec/related_navigation_sidebar_spec.rb
 - spec/spec_helper.rb
 - spec/taxon_breadcrumbs_spec.rb
 - spec/taxonomy_sidebar_spec.rb