govuk_publishing_components 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d641536678da47028e081ee9005030f0005db516c354c754052222dacd2d48c
-  data.tar.gz: d89d55dd38eacae4f679cb151c686ef1835760553c09fd3d25b4dff1c2b15a18
+  metadata.gz: 8d843c3f7f78559a8e8bbe5a24f026a58131f4a1558a33b878266fe89ce5239d
+  data.tar.gz: 4baecf33e59f1b631786a43f1af3a9c83fd9d57fef96e1c2475ec5cc5829804c
 SHA512:
-  metadata.gz: 8db07aa8a90735a1303e997855f34e6b8cafc326bb0f663439b2b66a05622fd30386a836480c1dc04af7c2ffbb5e84b0840c65079ae1352bb20617bc94d53880
-  data.tar.gz: 6284f25ac80fc5cc06b2fe502b314065224c0287aa944c53dd9371c7a5b247ae9b0f77a38cb906661f0aa0b417d50347de049ee5347e52fd223bc750725a03cd
+  metadata.gz: 31dc8a84299695fe5d4c3f1cf6f9108f59b975060d628206a60fc8136d8073210df59a77c099afd51d3085162cbd195fccee50e90b371e9497e03f56d3142e9c
+  data.tar.gz: 4a58f9da9f33d430fadc0cd0fa0cc1245d7788ab363525985d8d689313cd0032cbd118623c973ef5a29b367e88e83f10d6e1ea566890a21d6fa7f27407a5308a

data/lib/govuk_publishing_components/components/related_navigation_helper.rb

@@ -24,7 +24,6 @@ class RelatedNavigationHelper
       { "topical_events" => related_topical_events },
       { "world_locations" => related_world_locations },
       { "statistical_data_sets" => related_statistical_data_sets },
-      { "worldwide_organisations" => related_worldwide_organisations },
     ]
 
     other = [related_external_links, related_contacts] || []
@@ -100,11 +99,6 @@ private
     build_links_for_sidebar(locations)
   end
 
-  def related_worldwide_organisations
-    organisations = filter_link_type("worldwide_organisations", "worldwide_organisation")
-    build_links_for_sidebar(organisations)
-  end
-
   def related_collections
     collections = filter_link_type("document_collections", "document_collection")
     build_links_for_sidebar(collections)
@@ -172,7 +166,7 @@ private
   end
 
   def grandparent
-    parent.dig("parent", 0)
+    parent.dig("links", "parent", 0)
   end
 
   # This method post-processes the topics collated by the helper.
@@ -214,12 +208,14 @@ private
 
   def parents_tagged_to_same_mainstream_browse_page
     return [] unless parent && grandparent
-
-    common_parent_content_ids = tagged_to_same_mainstream_browse_page.map(&:content_id)
+    common_parent_content_ids = tagged_to_same_mainstream_browse_page.map { |item| item["content_id"] }
 
     @parents_tagged_to_same_mainstream_browse_page ||= related_links.select do |related_item|
       next if common_parent_content_ids.include?(related_item["content_id"])
-      related_item.dig("links", "mainstream_browse_pages").map(&:parent).map(&:content_id).include?(grandparent["content_id"])
+      mainstream_browse_pages = related_item.dig("links", "mainstream_browse_pages")
+      parents = mainstream_browse_pages.map { |page| page["links"]["parent"][0] }
+      content_ids = parents.map { |parent| parent["content_id"] }
+      content_ids.include?(grandparent["content_id"])
     end
   end
 

data/lib/govuk_publishing_components/step_nav.rb

@@ -13,7 +13,11 @@ module GovukPublishingComponents
     end
 
     def content
-      @content ||= content_item.dig(:details, :step_by_step_nav)
+      content_item.dig(:details, :step_by_step_nav)
+    end
+
+    def steps
+      content_item.dig(:details, :step_by_step_nav, :steps)
     end
 
   private

data/lib/govuk_publishing_components/step_nav_helper.rb

@@ -12,9 +12,12 @@ module GovukPublishingComponents
     end
 
     def show_sidebar?
+      show_header? && first_step_nav.steps.present?
+    end
+
+    def show_header?
       step_navs.count == 1
     end
-    alias_method :show_header?, :show_sidebar?
 
     def show_related_links?
       step_navs.any? && step_navs.count < 5

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '5.4.0'.freeze
+  VERSION = '5.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails