govuk_publishing_components 9.27.0 → 9.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e6c7609a6180903a56d25047915cb659b1a9e8c80be76d8deb94d89edeaa1d6
-  data.tar.gz: 1e41eeb83cfdffb791ef9ea2a88f58dd075be99de33635a726352a70f09196d4
+  metadata.gz: dd97893a0b544cc658d03a410175d5f5bef9173a23368563ad0b1bfc3a3f1e98
+  data.tar.gz: 380f25942322cee9c5efb96fa977faf46ae5597dddf5012333f99a294946df6a
 SHA512:
-  metadata.gz: '0530198829ee0f9d826b83b293fb088e11e9b1e3155642927d2bf3d4bcc3f80e1e2ffa86d5987bae0f63e4568bedfef01bef5f20a0d2bd49d889c4f5da85cac1'
-  data.tar.gz: 57e3bc14dd4358785679bb33bd8472978203092a6ecb7d558f0d3b8e77437f984e915694cd3cd37477dbd070876ca566b8beb14a7f19eff25611a4932fb5574d
+  metadata.gz: 97c7bf5aa73ddb895bd8cf6457d5f0f0d18f3ea7aa06f52a9e4d5a2aa51dd3472f8340fd4ebc263976d2d02aae75579d33968288970a167756f8401d1ba7a50b
+  data.tar.gz: 32476ad88ae096153c99d1fd6ecb9036d1c69e9bd24b6c888986aa0ff32183d4944ee9ac348ec8400946cb97ccfbcafb1b3e381386f2ce5a227a273658fdb932

data/lib/govuk_publishing_components/presenters/page_with_step_by_step_navigation.rb

@@ -15,6 +15,12 @@ module GovukPublishingComponents
         end
       end
 
+      def related_to_step_navs
+        @related_to_step_navs ||= parsed_related_to_step_navs.map do |step_nav|
+          StepByStepModel.new(step_nav)
+        end
+      end
+
       def show_sidebar?
         show_header? && current_step_nav.steps.present?
       end
@@ -24,11 +30,12 @@ module GovukPublishingComponents
       end
 
       def show_related_links?
-        step_navs.any? && (step_navs.count < 5 || active_step_by_step?)
+        return true if active_step_by_step?
+        step_navs.any? && step_navs.count < 5
       end
 
       def show_also_part_of_step_nav?
-        active_step_by_step? && also_part_of_step_nav.any?
+        active_step_by_step? && also_part_of_step_nav.any? && step_navs_combined_list.count < 5
       end
 
       def related_links
@@ -37,7 +44,8 @@ module GovukPublishingComponents
       end
 
       def also_part_of_step_nav
-        step_by_step_navs = step_navs.delete_if { |step_nav| step_nav.content_id == active_step_by_step.content_id }
+        step_navs_list = step_navs_combined_list
+        step_by_step_navs = step_navs_list.delete_if { |step_nav| step_nav.content_id == active_step_by_step.content_id }
         format_related_links(step_by_step_navs)
       end
 
@@ -67,7 +75,8 @@ module GovukPublishingComponents
       end
 
       def active_step_by_step
-        @active_step_navs ||= step_navs.select { |step_nav| step_nav.content_id == active_step_nav_content_id }
+        step_navs_list = step_navs_combined_list
+        @active_step_navs ||= step_navs_list.select { |step_nav| step_nav.content_id == active_step_nav_content_id }
         @active_step_navs.first
       end
 
@@ -88,10 +97,21 @@ module GovukPublishingComponents
         @steps ||= step_nav[:steps]
       end
 
+      def step_navs_combined_list
+        step_nav_list = []
+        step_nav_list += step_navs if step_navs.any?
+        step_nav_list += related_to_step_navs if related_to_step_navs.any?
+        step_nav_list
+      end
+
       def parsed_step_navs
         content_item.dig("links", "part_of_step_navs").to_a
       end
 
+      def parsed_related_to_step_navs
+        content_item.dig("links", "related_to_step_navs").to_a
+      end
+
       def configure_for_sidebar(step_nav_content)
         step_nav_content[:steps].each_with_index do |step, step_index|
           step[:contents].each do |content|

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '9.27.0'.freeze
+  VERSION = '9.28.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 9.27.0
+  version: 9.28.0
 platform: ruby
 authors:
 - GOV.UK Dev