metadata_presenter 3.3.14 → 3.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce1f7719e73302d134f91f03ce4bfbd239e9303d1d2a08bc5594f9b9882585c
-  data.tar.gz: 5c15e0714aaa369a8898ba00d27f0199972bed43dfc6bffb99e6c0e8be35d0e9
+  metadata.gz: 6a56bfee298fe7e9138b1d60ee8c29af5685240ae893a665e6b920ca3ccdf9af
+  data.tar.gz: 62db49deaa88439f4c8e8efe962c6bf544de01b194351374444a487ec6580462
 SHA512:
-  metadata.gz: cfb93f873bdd5cd77e49819a924178b45c2a30e35c8dd6aab829011c058a49ca6a79aa3d94917f136e68c3274fa722b6c9864ee8f5ae759a957f40ac4c6dee95
-  data.tar.gz: 6c68732e6f9cbcac962ce1ef24847d317a041a3b0b48ebacc7589ddd4bfc419770d0fc049dd61427446f82e08d7baa29741538908538f54503afd9a2d21ec7ca
+  metadata.gz: 29bd9a966ac9a90033e9c75d33a508e59608bad99aba8966f1be17f20aa8f8cfcf38c68cc6d5ae5a5022a06a4c4fabfb57bf5cf614cb849e629ce2e588b60bee
+  data.tar.gz: 5da8149a431708bdff1b03317d9903b51815a1d1e505ce473a58d26b9c1f332b61d7e69005d11e21e7913fdf7cf2ccad409aeeb911b98691e8c1f4121ae4a31a

data/app/controllers/metadata_presenter/concerns/save_and_return.rb

@@ -0,0 +1,31 @@
+module MetadataPresenter
+  module Concerns
+    module SaveAndReturn
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :page_slug, :label_text
+      end
+
+      def page_slug
+        if params && params[:page_slug].present?
+          return params[:page_slug]
+        end
+        if session['returning_slug'].present?
+          return session['returning_slug']
+        end
+        if session['saved_form'].present?
+          return session['saved_form']['page_slug']
+        end
+
+        if params['saved_form'].present?
+          params['saved_form']['page_slug']
+        end
+      end
+
+      def label_text(text)
+        "<h2 class='govuk-heading-m'>#{text}</h2>"
+      end
+    end
+  end
+end

data/app/controllers/metadata_presenter/resume_controller.rb

@@ -0,0 +1,119 @@
+module MetadataPresenter
+  class ResumeController < EngineController
+    include Concerns::SaveAndReturn
+
+    helper_method :get_service_name, :get_uuid, :pages_presenters
+
+    def return
+      response = get_saved_progress(get_uuid)
+
+      if response.status == 404
+        redirect_to '/record_error' and return
+      end
+
+      if response.status == 400
+        redirect_to '/record_failure' and return
+      end
+
+      if response.status == 422
+        redirect_to '/already_used' and return
+      end
+
+      @saved_form = SavedForm.new.from_json(response.body.to_json)
+      @resume_form = ResumeForm.new(@saved_form.secret_question)
+    end
+
+    # rubocop:disable Style/RescueStandardError
+    def submit_secret_answer
+      response = get_saved_progress(get_uuid)
+
+      if response.status != 200
+        if response.status == 400
+          redirect_to '/record_failure' and return
+        end
+
+        redirect_to '/record_error' and return
+      end
+
+      @saved_form = SavedForm.new.from_json(response.body.to_json)
+      @resume_form = ResumeForm.new(@saved_form.secret_question)
+      @resume_form.secret_answer = resume_form_params[:secret_answer]
+      @resume_form.recorded_answer = @saved_form.secret_answer
+      @resume_form.attempts_remaining = 2 - @saved_form.attempts.to_i
+
+      if @resume_form.valid?
+        # redirect back to right place in form
+        session[:user_id] = @saved_form.user_id
+        session[:user_token] = @saved_form.user_token
+        session[:returning_slug] = @saved_form.page_slug
+
+        invalidate_record(@saved_form.id)
+
+        if @saved_form.service_version == service.version_id
+          redirect_to '/resume_progress' and return
+        else
+          redirect_to '/resume_from_start' and return
+        end
+      else
+        if @resume_form.attempts_remaining <= 0
+          begin
+            increment_record_counter(@saved_form.id)
+          rescue => e
+            Rails.logger.info(e)
+            redirect_to '/record_failure' and return
+          end
+          redirect_to '/record_failure' and return
+        end
+
+        increment_record_counter(@saved_form.id)
+
+        render :return, params: { uuid: @saved_form.id }
+      end
+    end
+    # rubocop:enable Style/RescueStandardError
+
+    def resume_progress
+      @user_data = load_user_data
+
+      @page ||= service.checkanswers_page
+
+      if @page
+        @page_answers = PageAnswers.new(@page, @answered_pages)
+      else
+        not_found
+      end
+    end
+
+    def answered_pages
+      TraversedPages.new(service, @user_data, @page).all
+    end
+
+    def pages_presenters
+      PageAnswersPresenter.map(
+        view: view_context,
+        pages: answered_pages,
+        answers: @user_data
+      )
+    end
+
+    private
+
+    def resume_form_params
+      params.require(:resume_form).permit(
+        :secret_answer, :uuid
+      )
+    end
+
+    def get_uuid
+      if params[:uuid].present?
+        return params[:uuid]
+      end
+
+      resume_form_params[:uuid].presence
+    end
+
+    def get_service_name
+      service.service_name
+    end
+  end
+end

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -1,27 +1,13 @@
 module MetadataPresenter
   class SaveAndReturnController < EngineController
-    helper_method :secret_questions, :page_slug, :confirmed_email, :get_service_name, :get_uuid, :label_text
+    include Concerns::SaveAndReturn
+
+    helper_method :secret_questions, :confirmed_email
 
     def show
       @saved_form = SavedForm.new
     end
 
-    def page_slug
-      if params && params[:page_slug].present?
-        return params[:page_slug]
-      end
-      if session['returning_slug'].present?
-        return session['returning_slug']
-      end
-      if session['saved_form'].present?
-        return session['saved_form']['page_slug']
-      end
-
-      if params['saved_form'].present?
-        params['saved_form']['page_slug']
-      end
-    end
-
     def confirmed_email
       email = session['saved_form']['email']
       session['saved_form']['email'] = nil
@@ -77,96 +63,6 @@ module MetadataPresenter
       end
     end
 
-    def return
-      response = get_saved_progress(get_uuid)
-
-      if response.status == 404
-        redirect_to '/record_error' and return
-      end
-
-      if response.status == 400
-        redirect_to '/record_failure' and return
-      end
-
-      if response.status == 422
-        redirect_to '/already_used' and return
-      end
-
-      @saved_form = SavedForm.new.from_json(response.body.to_json)
-      @resume_form = ResumeForm.new(@saved_form.secret_question)
-    end
-
-    def get_uuid
-      if params[:uuid].present?
-        return params[:uuid]
-      end
-
-      params[:resume_form][:uuid].presence
-    end
-
-    # rubocop:disable Style/RescueStandardError
-    def submit_secret_answer
-      response = get_saved_progress(get_uuid)
-
-      if response.status != 200
-        if response.status == 400
-          redirect_to '/record_failure' and return
-        end
-
-        redirect_to '/record_error' and return
-      end
-
-      @saved_form = SavedForm.new.from_json(response.body.to_json)
-      @resume_form = ResumeForm.new(@saved_form.secret_question)
-      @resume_form.secret_answer = resume_form_params[:resume_form][:secret_answer]
-      @resume_form.recorded_answer = @saved_form.secret_answer
-      @resume_form.attempts_remaining = 2 - @saved_form.attempts.to_i
-
-      if @resume_form.valid?
-        # redirect back to right place in form
-        session[:user_id] = @saved_form.user_id
-        session[:user_token] = @saved_form.user_token
-        session[:returning_slug] = @saved_form.page_slug
-
-        invalidate_record(@saved_form.id)
-
-        if @saved_form.service_version == service.version_id
-          redirect_to '/resume_progress' and return
-        else
-          redirect_to '/resume_from_start' and return
-        end
-      else
-        if @resume_form.attempts_remaining <= 0
-          begin
-            increment_record_counter(@saved_form.id)
-          rescue => e
-            Rails.logger.info(e)
-            redirect_to '/record_failure' and return
-          end
-          redirect_to '/record_failure' and return
-        end
-
-        increment_record_counter(@saved_form.id)
-
-        render :return, params: { uuid: @saved_form.id }
-      end
-    end
-    # rubocop:enable Style/RescueStandardError
-
-    def resume_progress
-      @user_data = load_user_data
-
-      @page ||= service.checkanswers_page
-
-      if @page
-        @page_answers = PageAnswers.new(@page, @answered_pages)
-
-        render template: 'metadata_presenter/save_and_return/resume_progress'
-      else
-        not_found
-      end
-    end
-
     def save_progress
       session['saved_form']['user_id'] = nil
       session['saved_form']['user_token'] = nil
@@ -174,19 +70,6 @@ module MetadataPresenter
       session['user_token'] = nil
     end
 
-    def answered_pages
-      TraversedPages.new(service, @user_data, @page).all
-    end
-
-    def pages_presenters
-      PageAnswersPresenter.map(
-        view: view_context,
-        pages: answered_pages,
-        answers: @user_data
-      )
-    end
-    helper_method :pages_presenters
-
     def secret_questions
       [
         OpenStruct.new(id: 1, name: I18n.t('presenter.save_and_return.secret_questions.one')),
@@ -201,6 +84,8 @@ module MetadataPresenter
       secret_questions.select { |s| s.id.to_s == question.to_s }.first.name
     end
 
+    private
+
     def saved_form_params
       params.permit(
         :email,
@@ -218,23 +103,6 @@ module MetadataPresenter
       )
     end
 
-    def resume_form_params
-      params.permit(
-        { resume_form: %i[secret_answer uuid] },
-        :authenticity_token
-      )
-    end
-
-    def get_service_name
-      service.service_name
-    end
-
-    def label_text(text)
-      "<h2 class='govuk-heading-m'>#{text}</h2>"
-    end
-
-    private
-
     def service_slug
       @service_slug ||= service_slug_config
     end

data/app/helpers/metadata_presenter/application_helper.rb

@@ -2,6 +2,8 @@ require 'govspeak'
 
 module MetadataPresenter
   module ApplicationHelper
+    OLD_BODY_DEFAULT_CONTENT = 'Body section'.freeze
+
     def main_title(component:, tag: :h1, classes: 'govuk-heading-xl')
       content_tag(tag, class: classes) do
         component.humanised_title
@@ -21,6 +23,15 @@ module MetadataPresenter
       MetadataPresenter::DefaultText[property]
     end
 
+    # we used to have some placeholder text in the body key, which was always replaced
+    # we since exposed the body key in an optional content area for certain pages, so forms created before that
+    # need to have their old default content ignored
+    def page_body_content
+      if @page.body
+        @page.body == OLD_BODY_DEFAULT_CONTENT ? '' : @page.body
+      end
+    end
+
     def default_title(component_type)
       MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('label') ||
         MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('legend')

data/app/views/metadata_presenter/attribute/_body.html.erb

@@ -3,8 +3,8 @@
                           class="fb-editable"
                           type="content"
                           default-content="<%= default_text('body') %>"
-                          content="<%= @page.body %>"
+                          content="<%= page_body_content %>"
                           data-fb-content-id="<%= "page[body]" %>">
-    <%= to_html(@page.body) %>
+    <%= to_html(page_body_content) %>
   </editable-content>
 <%- end %>

data/app/views/metadata_presenter/component/_multiupload.html.erb

@@ -1,4 +1,5 @@
 <legend class="govuk-heading-xl"><%= input_title %></legend>
+<%= render 'metadata_presenter/attribute/body' %>
 
 <% if answered?(component.id) && @page_answers.send(component.id)[component.id].compact.count.positive? %>
   <label id="uploaded-file-summary-list-label"><p class="govuk-heading-s"><%= uploads_count %></p></label>
@@ -15,6 +16,8 @@
       </div>
     <% end %>
   </dl>
+<% else %>
+  <label id="uploaded-file-summary-list-label"><p class="govuk-heading-s"><%= t('presenter.questions.multiupload.upload_file') %></p></label>
 <% end %>
 
 <% if uploads_remaining.positive? || editable? %>

data/app/views/metadata_presenter/{save_and_return → resume}/return.html.erb

@@ -1,10 +1,13 @@
 <div class="fb-main-grid-wrapper">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-    <h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.resume.heading', service_name: get_service_name) %></h1>
-    <p><%= t('presenter.save_and_return.resume.content') %></p>
+
     <%= form_for @resume_form do |f| %>
       <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
+
+      <h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.resume.heading', service_name: get_service_name) %></h1>
+      <p><%= t('presenter.save_and_return.resume.content') %></p>
+
       <%= f.hidden_field(:uuid, value: get_uuid) %>
       <div class="govuk-form-group">
       <%=

data/config/locales/cy.yml

@@ -66,13 +66,14 @@ cy:
       upload:
         remove_file: (cy) Remove file
       multiupload:
+        upload_file: '(cy) Upload a file'
         remove_file: '(cy) Delete'
         add_another: '(cy) Add another file'
         single_upload: '(cy) Maximum file size 7MB'
         answered_singular: '(cy) You can add 1 more file (maximum 7MB per file)'
         answered_plural: '(cy) You can add %{num} more files (maximum 7MB per file)'
-        answered_count_singular: '(cy) You have added 1 file'
-        answered_count_plural: '(cy) You have added %{num} files'
+        answered_count_singular: '(cy) You have uploaded 1 file'
+        answered_count_plural: '(cy) You have uploaded %{num} files'
         singular: '(cy) You can add 1 more file (maximum 7MB)'
         plural: '(cy) You can add up to %{num} files (maximum 7MB per file)'
         none: "(cy) You can't add any more files. Remove a file if you need to add a different one."

data/config/locales/en.yml

@@ -57,13 +57,14 @@ en:
       upload:
         remove_file: Remove file
       multiupload:
+        upload_file: 'Upload a file'
         remove_file: 'Delete'
         add_another: 'Add another file'
         single_upload: 'Maximum file size 7MB'
         answered_singular: 'You can add 1 more file (maximum 7MB per file)'
         answered_plural: 'You can add %{num} more files (maximum 7MB per file)'
-        answered_count_singular: 'You have added 1 file'
-        answered_count_plural: 'You have added %{num} files'
+        answered_count_singular: 'You have uploaded 1 file'
+        answered_count_plural: 'You have uploaded %{num} files'
         singular: 'You can add 1 more file (maximum 7MB)'
         plural: 'You can add up to %{num} files (maximum 7MB per file)'
         none: "You can't add any more files. Remove a file if you need to add a different one."

data/config/routes.rb

@@ -12,19 +12,22 @@ MetadataPresenter::Engine.routes.draw do
   get 'session/expired', to: 'session#expired'
   get 'session/complete', to: 'session#complete'
 
+  # save form journey
   get 'save', to: 'save_and_return#show'
   post 'saved_forms', to: 'save_and_return#create'
   get 'save/email_confirmation', to: 'save_and_return#email_confirmation'
   post 'email_confirmations', to: 'save_and_return#confirm_email'
   get 'save/progress_saved', to: 'save_and_return#save_progress'
-  get '/return/:uuid', to: 'save_and_return#return'
-  post 'resume_forms', to: 'save_and_return#submit_secret_answer'
-  get 'record_error', to: 'save_and_return#record_error'
-  get 'record_failure', to: 'save_and_return#record_failure'
-  get 'expired', to: 'save_and_return#record_link_expired'
-  get 'already_used', to: 'save_and_return#record_link_used'
-  get 'resume_from_start', to: 'save_and_return#resume_from_start'
-  get 'resume_progress', to: 'save_and_return#resume_progress'
+
+  # resume form journey
+  get '/return/:uuid', to: 'resume#return'
+  post 'resume_forms', to: 'resume#submit_secret_answer'
+  get 'resume_from_start', to: 'resume#resume_from_start'
+  get 'resume_progress', to: 'resume#resume_progress'
+  get 'record_error', to: 'resume#record_error'
+  get 'record_failure', to: 'resume#record_failure'
+  get 'expired', to: 'resume#record_link_expired'
+  get 'already_used', to: 'resume#record_link_used'
 
   post '/', to: 'answers#create'
   match '*path', to: 'answers#create', via: :post

data/default_metadata/page/singlequestion.json

@@ -4,7 +4,7 @@
   "section_heading": "",
   "heading": "",
   "lede": "",
-  "body": "Body section",
+  "body": "",
   "components": [],
   "url": ""
 }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.14'.freeze
+  VERSION = '3.3.16'.freeze
 end

data/schemas/page/singlequestion.json

@@ -12,7 +12,7 @@
       "maxItems": 1,
       "accepts": [
         "control"
-      ]
+       ]
     }
   },
   "allOf": [
@@ -26,7 +26,6 @@
   ],
   "surplus_properties": [
     "heading",
-    "lede",
-    "body"
+    "lede"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.14
+  version: 3.3.16
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -331,9 +331,11 @@ files:
 - app/assets/stylesheets/metadata_presenter/application.css
 - app/controllers/metadata_presenter/answers_controller.rb
 - app/controllers/metadata_presenter/change_answer_controller.rb
+- app/controllers/metadata_presenter/concerns/save_and_return.rb
 - app/controllers/metadata_presenter/engine_controller.rb
 - app/controllers/metadata_presenter/file_controller.rb
 - app/controllers/metadata_presenter/pages_controller.rb
+- app/controllers/metadata_presenter/resume_controller.rb
 - app/controllers/metadata_presenter/save_and_return_controller.rb
 - app/controllers/metadata_presenter/service_controller.rb
 - app/controllers/metadata_presenter/session_controller.rb
@@ -457,14 +459,14 @@ files:
 - app/views/metadata_presenter/page/singlequestion.html.erb
 - app/views/metadata_presenter/page/standalone.html.erb
 - app/views/metadata_presenter/page/start.html.erb
+- app/views/metadata_presenter/resume/record_error.html.erb
+- app/views/metadata_presenter/resume/record_failure.html.erb
+- app/views/metadata_presenter/resume/record_link_expired.html.erb
+- app/views/metadata_presenter/resume/record_link_used.html.erb
+- app/views/metadata_presenter/resume/resume_from_start.html.erb
+- app/views/metadata_presenter/resume/resume_progress.html.erb
+- app/views/metadata_presenter/resume/return.html.erb
 - app/views/metadata_presenter/save_and_return/email_confirmation.html.erb
-- app/views/metadata_presenter/save_and_return/record_error.html.erb
-- app/views/metadata_presenter/save_and_return/record_failure.html.erb
-- app/views/metadata_presenter/save_and_return/record_link_expired.html.erb
-- app/views/metadata_presenter/save_and_return/record_link_used.html.erb
-- app/views/metadata_presenter/save_and_return/resume_from_start.html.erb
-- app/views/metadata_presenter/save_and_return/resume_progress.html.erb
-- app/views/metadata_presenter/save_and_return/return.html.erb
 - app/views/metadata_presenter/save_and_return/save_progress.html.erb
 - app/views/metadata_presenter/save_and_return/show.html.erb
 - app/views/metadata_presenter/session/_timeout_fallback.html.erb