metadata_presenter 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40b3177173dd2ca8ade1050a4179ac9deaf93fd3a9587563c5f09adc1f568d4a
-  data.tar.gz: 010ddf25ee998403e07c666b41555e0ef7d75346b933656b12595011e322594c
+  metadata.gz: e32a28102541813aa8d6576cafdaa6fb3b4897daee023f0e52d80b1c98c3266f
+  data.tar.gz: 2001211cd3395cff6b2dc4d4f806f7055267c0a448d4316a5da6998d1ebe5295
 SHA512:
-  metadata.gz: 9c682f16671c97ea078d9aba49d5fcdea1d320dad7092b08971499be32279ba23529c848cfb641732edc990effda1c67b6132a60bdba2b8969c6bdfb1559734f
-  data.tar.gz: 21307e02d6d4935273e403c0b1c5c71cf2dc40c2f0e1b82cb56b2cd2daaaf084ebbc196a200c78c319294ae02581094115c641896b51ee288dc3a0bb8880c003
+  metadata.gz: 40bbe63a448710146762e167f0abc415e39028d1e279bdf72aa989376abbae4881d56d2cfbcc065805541f6a340a39349a7d5ccb3efd9b6444b803ea5d21ebfc
+  data.tar.gz: 48902563f8e43de68352ce31c47d554493a4add994649c54d1933062a7cec78c7334c20debf05fea827f84dd825bf16bb1c1b34fa033733e877d964c94f3c2a2

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/expression.rb

@@ -7,11 +7,11 @@ module MetadataPresenter
     end
 
     def expression_page
-      service.find_page_by_uuid(page)
+      @expression_page ||= service.find_page_by_uuid(page)
     end
 
     def expression_component
-      expression_page.find_component_by_uuid(component)
+      @expression_component ||= expression_page.find_component_by_uuid(component)
     end
 
     def expression_field

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/views/metadata_presenter/page/checkanswers.html.erb

@@ -67,7 +67,7 @@
         <% end %>
 
         <% if @page.send_body.present? %>
-          <div class="fb-send-body fb-editable"
+          <div class="fb-send-body fb-editable govuk-body"
                data-fb-content-type="content"
                data-fb-content-id="page[send_body]">
             <%= @page.send_body %>

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]"
 }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.3.3'.freeze
+  VERSION = '2.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder