metadata_presenter 2.16.14 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 731bc206c6ebcab227b6701942b8a55a15c78c6e48209357955e86b8ed7bd56a
-  data.tar.gz: ed47c6089c0a157972195556f1308451405b4a6e1785895366737003977289a2
+  metadata.gz: 69339189940b628d7be7e2a6515c4382cc44d5726d3ecac9adb86b975cd1d5d8
+  data.tar.gz: 1d5724fabda8bf28f79d6d31b28f348d9c144f63f49b3ac945e9f4f7a372bd61
 SHA512:
-  metadata.gz: f4b212304f483990f280b4d1ec5c1731a3e32c6653ece1309c546d902a6b8284f792f2c0fc2616ae22c4f7b8791362089409981e36e1595c6d89c9616143a302
-  data.tar.gz: ac9a1b36d98b1fa162ed67a4cdcbbe4633c5edd1ff925b2e106a2c9c72f542ba7335800ddbaa4a56bebc3d651c934242d8dc43af2787d98c981da2aa899f560e
+  metadata.gz: 768d25f256f70733fb563fc75604e90690c36e78d7a8191b8d468c1b678e17d7e158e88bcfda50f028c40e21aeb6de3ca509650e21f1323965a3a01923460eff
+  data.tar.gz: 026c6ba54417b041a173a8523b11baadb3e15a18eaaab57ace3db3376bf47c6b46059ea6706900940deaeaf4edb61f9959ee6d7b9c2b098a61697739845dfda8

data/app/models/metadata_presenter/service.rb

@@ -34,7 +34,7 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def start_page
-    pages.first
+    pages.find { |page| page.type == 'page.start' }
   end
 
   def service_slug

data/app/models/metadata_presenter/traversed_pages.rb

@@ -6,41 +6,42 @@ module MetadataPresenter
       @service = service
       @user_data = user_data
       @pages = [service.start_page]
-      @current_page = current_page || service.pages[-1]
+      @current_page = current_page
     end
 
     delegate :last, to: :all
 
     def all
-      page_uuid = service.start_page.uuid
+      next_object = service.start_page
 
       service.flow.size.times do
-        break if page_uuid == current_page.uuid
-
-        flow_object = service.flow_object(page_uuid)
-
-        if flow_object.branch?
-          page = EvaluateConditionals.new(
-            service: service,
-            flow: flow_object,
-            user_data: user_data
-          ).page
-          page_uuid = page.uuid
-        else
-          page_uuid = flow_object.default_next
-          page = service.find_page_by_uuid(page_uuid)
-        end
-
-        @pages.push(page) if page && page.uuid != current_page.uuid
+        break if next_object.blank? || next_object.uuid == current_page&.uuid
+
+        flow_object = service.flow_object(next_object.uuid)
+        next_object = flow_object.branch? ? evaluated_page(flow_object) : next_flow_object(flow_object.default_next)
+        @pages.push(next_object) if page_in_flow?(next_object)
       end
 
       @pages
     end
 
-    def latest_pages
-      index = service.pages.index(current_page).to_i - 1
+    private
+
+    def evaluated_page(flow_object)
+      EvaluateConditionals.new(
+        service: service,
+        flow: flow_object,
+        user_data: user_data
+      ).page
+    end
+
+    def next_flow_object(uuid)
+      obj = service.flow_object(uuid)
+      obj.branch? ? obj : service.find_page_by_uuid(uuid)
+    end
 
-      service.pages[0..index]
+    def page_in_flow?(obj)
+      obj.is_a?(MetadataPresenter::Page) && obj.uuid != current_page&.uuid
     end
   end
 end

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.16.14'.freeze
+  VERSION = '2.17.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.16.14
+  version: 2.17.0
 platform: ruby
 authors:
 - MoJ Forms