metadata_presenter 3.3.13 → 3.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92b7921e476909c4309519d2c7dd96f2e67abcd8ba72410323d0102bc0d135b1
-  data.tar.gz: 2202769033c4b5b8f346de287d83b2b4745a7b5b6b82b69cfb8878a01c739e72
+  metadata.gz: 697e6b4f94a8e43973cc082259567e2967f2b4686e840174cfda308b378f5302
+  data.tar.gz: e47e94bf27c2b86cc9e4677ed0dec9c0385c3adc9c92e0594938d3a8ae1de20a
 SHA512:
-  metadata.gz: e262046041825252e0b8848c98d6d46313863ad78ed85f541a4a89e04174d0d1921a88bfc0c2d678d29e4b4ce40b22ac7f0733f4e5cd3ae06c6a5e240ce6737a
-  data.tar.gz: ba19606fc7da52f38e7a816942e88bfc752013ded8e639a41b0c7362b11473ec81d6e9f7b256e8ef16d08e8e3e9495ea8d25abfd425a56a0fc8937f8d64c90c8
+  metadata.gz: 9a1f301247aa0891098f7d4cbab3a8a6de98b0bcf02187a4d51e214318f933acff699e910122690118dd1768fc7e6d1cbfd7e02732e8c53b4d338cf2445c205a
+  data.tar.gz: 9801b62cd16f191fd5b239c4fd39ba1ce60bd8007c255cb309e1037840d35a4876feb2a0ebb2255d172ea37037811d066c3d40b03a02e9a89e2a4f1660880151

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/models/metadata_presenter/component.rb

@@ -1,4 +1,6 @@
 class MetadataPresenter::Component < MetadataPresenter::Metadata
+  include Comparable
+
   VALIDATION_BUNDLES = {
     'date' => 'date',
     'number' => 'number',
@@ -11,6 +13,13 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
   # Threshold percentage at which the remaining count is shown
   VALIDATION_STRING_LENGTH_THRESHOLD = 75
 
+  def <=>(other)
+    return nil unless other.is_a?(MetadataPresenter::Component)
+    return 0 unless order
+
+    order <=> other.order
+  end
+
   # Overriding here because autocomplete component's items property is non interactable
   # in the Editor therefore it does not need to exist in the data-fb-content-data
   # attribute on the page. The data-fb-content-data attribute is what is used to

data/app/models/metadata_presenter/page.rb

@@ -181,12 +181,12 @@ module MetadataPresenter
     end
 
     def to_components(node_components, collection:)
-      Array(node_components).map do |component|
+      Array(node_components).map { |component|
         MetadataPresenter::Component.new(
           component.merge(collection:),
           editor: editor?
         )
-      end
+      }.sort
     end
 
     def supported_components(page_type)

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/fixtures/version.json

@@ -425,7 +425,8 @@
           "collection": "components",
           "validation": {
             "required": true
-          }
+          },
+          "order": 2
         },
         {
           "_id": "star-wars-knowledge_content_1",
@@ -433,7 +434,8 @@
           "_type": "content",
           "_uuid": "82444d3d-dab6-44c4-a147-e2650326c9eb",
           "content": "Stay on target",
-          "collection": "components"
+          "collection": "components",
+          "order": 1
         },
         {
           "_id": "star-wars-knowledge_radios_1",
@@ -493,7 +495,8 @@
           "collection": "components",
           "validation": {
             "required": true
-          }
+          },
+          "order": 0
         }
       ],
       "add_component": "radios",
@@ -528,7 +531,7 @@
       "heading": "Question",
       "components": [
         {
-          "_id":  "dog-picture_upload_1",
+          "_id": "dog-picture_upload_1",
           "name": "dog-picture_upload_1",
           "_type": "upload",
           "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad1",
@@ -594,7 +597,7 @@
       "heading": "Multiupload",
       "components": [
         {
-          "_id":  "dog-picture_upload_2",
+          "_id": "dog-picture_upload_2",
           "name": "dog-picture_upload_2",
           "_type": "multiupload",
           "_uuid": "f056a76e-ec3f-47ae-b625-1bba92220ad2",
@@ -668,10 +671,8 @@
           "name": "countries_autocomplete_1",
           "_type": "autocomplete",
           "_uuid": "4dc23b9c-9757-4526-813d-b43efbe07dad",
-          "items": [
-          ],
-          "errors": {
-          },
+          "items": [],
+          "errors": {},
           "legend": "Countries",
           "validation": {
             "required": true,

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.13'.freeze
+  VERSION = '3.3.15'.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.13
+  version: 3.3.15
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-02-14 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