metadata_presenter 2.3.5 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4a7ee0a63e0eb10aacb69c6ac94739447bd229e07951bccd4e09ddd957a2806
-  data.tar.gz: f305308dc5bbaf9b16fcc272df5804e7d505fa50e1dcebc59bfaa653172b10f0
+  metadata.gz: c3e99fe731812a98c2a9d2f6cefcade21ccd233f24118cd23440aa4d726b49c1
+  data.tar.gz: 98496d517a2cdbf8da121d9d15469c9f017065921ca81b8133d895cec9bc9cff
 SHA512:
-  metadata.gz: 185722bfd36b6ccccbaafee26fa0ce0763224f8178a57bda1f14a34f6eb34b6607a6a63540ef10744e80bf98dc9dddb5a3992e81e2d6647622d5382dded1ecd8
-  data.tar.gz: 9f42f91ad922fe126a02ecdb744bd32e9f086cfe559f590bf4247df1a4290aff007504a22530c60cffffd1e3f61f296dbfa1c0a6fab2dac3b5d0debf2499afbe
+  metadata.gz: f3735753a806e4b199b6420ed46469a06a856fa2140a3c893f91e187a8ae2a8068f5d54118ddefddabfd72db15ca04b9d532e9eb63019aa5d5611497ce322aee
+  data.tar.gz: 5322246015561fc511b8fb1dc2072fec440df0fce1ca34555a3893b6a43b281b59d896a0941e3d69ea0f0114ea90408fc702b2bcd7a8080ade9934dc09bdd3ad

data/app/controllers/metadata_presenter/answers_controller.rb

@@ -3,6 +3,7 @@ module MetadataPresenter
     before_action :check_page_exists
 
     def create
+      @previous_answers = reload_user_data.deep_dup
       @page_answers = PageAnswers.new(page, answers_params)
 
       upload_files if upload?
@@ -28,8 +29,9 @@ module MetadataPresenter
       next_page = NextPage.new(
         service: service,
         session: session,
-        user_data: load_user_data,
-        current_page_url: page_url
+        user_data: reload_user_data,
+        current_page_url: page_url,
+        previous_answers: @previous_answers
       ).find
 
       if next_page.present?

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -5,6 +5,14 @@ module MetadataPresenter
     helper MetadataPresenter::ApplicationHelper
     default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
 
+    def reload_user_data
+      if defined? super
+        super
+      else
+        load_user_data
+      end
+    end
+
     def back_link
       previous_page = PreviousPage.new(
         service: service,

data/app/models/metadata_presenter/flow.rb

@@ -16,6 +16,10 @@ module MetadataPresenter
       metadata['next']['default']
     end
 
+    def all_destination_uuids
+      conditionals.map(&:next).append(default_next)
+    end
+
     def conditionals
       Array(metadata['next']['conditionals']).map do |conditional_metadata|
         Conditional.new(conditional_metadata)

data/app/models/metadata_presenter/next_page.rb

@@ -1,7 +1,7 @@
 module MetadataPresenter
   class NextPage
     include ActiveModel::Model
-    attr_accessor :service, :session, :user_data, :current_page_url
+    attr_accessor :service, :session, :user_data, :current_page_url, :previous_answers
 
     def find
       return check_answers_page if return_to_check_your_answer?
@@ -11,17 +11,53 @@ module MetadataPresenter
       else
         service.find_page_by_uuid(current_page_flow.default_next)
       end
+    ensure
+      session[:return_to_check_your_answer] = nil
     end
 
     private
 
     def check_answers_page
-      session[:return_to_check_your_answer] = nil
       service.pages.find { |page| page.type == 'page.checkanswers' }
     end
 
     def return_to_check_your_answer?
-      session[:return_to_check_your_answer].present?
+      session[:return_to_check_your_answer].present? &&
+        components_not_used_for_branching_and_answers_unchanged?
+    end
+
+    def components_not_used_for_branching_and_answers_unchanged?
+      components_not_used_for_branching? && answers_unchanged?
+    end
+
+    def components_not_used_for_branching?
+      expressions.none? { |expression| component_ids.include?(expression) }
+    end
+
+    def answers_unchanged?
+      components = current_page_components.select do |component|
+        component.uuid.in?(expressions.map(&:component))
+      end
+
+      components.all? do |component|
+        user_data[component.id] == previous_answers[component.id]
+      end
+    end
+
+    def component_ids
+      current_page_components.map(&:id)
+    end
+
+    def current_page_components
+      current_page.components
+    end
+
+    def expressions
+      collection = service.branches.map do |branch|
+        branch.conditionals.map(&:expressions)
+      end
+
+      collection.flatten
     end
 
     def conditionals?

data/app/models/metadata_presenter/page.rb

@@ -13,6 +13,12 @@ module MetadataPresenter
       add_extra_component
     ].freeze
     QUESTION_PAGES = %w[page.singlequestion page.multiplequestions].freeze
+    USES_HEADING = %w[
+      page.content
+      page.checkanswers
+      page.confirmation
+      page.multiplequestions
+    ].freeze
 
     def editable_attributes
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
@@ -87,8 +93,7 @@ module MetadataPresenter
     private
 
     def heading?
-      Array(components).size != 1 ||
-        type.in?(['page.content', 'page.checkanswers', 'page.confirmation'])
+      type.in?(USES_HEADING) || Array(components).size != 1
     end
 
     def to_components(node_components, collection:)

data/app/views/metadata_presenter/page/start.html.erb

@@ -17,7 +17,8 @@
       <% if @page.before_you_start %>
         <div class="fb-editable"
              data-fb-content-id="page[before_you_start]"
-             data-fb-content-type="content">
+             data-fb-content-type="content"
+             data-fb-default-text="<%= default_text('before_you_start') %>">
           <%= to_html(@page.before_you_start) %>
         </div>
       <%- end %>

data/default_text/content.json

@@ -6,5 +6,6 @@
   "hint": "[Optional hint text]",
   "option": "Option",
   "option_hint": "[Optional hint text]",
-  "upload_hint": "Maximum file size is 7MB"
+  "upload_hint": "Maximum file size is 7MB",
+  "before_you_start": "[Optional content]"
 }