metadata_presenter 3.3.38 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19848b9e010ecd993a80ed52de026f9754e52ef4f0a8d4f6bea3b44b7fa54292
-  data.tar.gz: b9bcfdc873fb29a68360e6d1918eff76a13af6a494b3b75310d7580509cf16e1
+  metadata.gz: 4e2b26988c2db9d9912370ef81de43ab4161c83e27378c8bc7451803d472b900
+  data.tar.gz: 5ea49fef01667460e186e15562a48bdc29c4c5ab799e35b68d61db9011990379
 SHA512:
-  metadata.gz: c6d36ac7d63e62243ff0bbb816011f23742f33da78f72111683cd65e9918f31ba2a22416c0f357932c5e7bb203d2f04da753413d57fecf6c3e7b4dfa2ce5cac9
-  data.tar.gz: dcf3d6ff9c217e499804adb049b3ca41c31b00bb70ebd8a7a5d73a1125ab218565cc01d12d19c9f1cd0e84879370d316a27b0e0cd461657d6481ae0bae3dc838
+  metadata.gz: 88c4922178a4ab1c53fb857b1e5e6a834bd9ef68d317b6a480b3d67bb04f9f4ff11b31b655923dd92adea0eea07bde4849e5d55b48b5f5d0f78fafa1e433a6be
+  data.tar.gz: c967548435963e1f2ecd65ed6076a101786de93ec1cd9e32014febd8c0bcc8b41e3d1a7efbb739acfed2e8905121e1e0f8c46cfea41223ed72fd2f12175f9326

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -54,6 +54,14 @@ module MetadataPresenter
       end
     end
 
+    def destroy_session
+      # :nocov:
+      if defined? super
+        super
+        # :nocov:
+      end
+    end
+
     def back_link
       if response.status == 404 && @page
         @back_link = File.join(request.script_name, @page.url)

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -71,10 +71,7 @@ module MetadataPresenter
     end
 
     def save_progress
-      session['saved_form']['user_id'] = nil
-      session['saved_form']['user_token'] = nil
-      session['user_id'] = nil
-      session['user_token'] = nil
+      destroy_session
     end
 
     def secret_questions

data/app/controllers/metadata_presenter/session_controller.rb

@@ -5,5 +5,7 @@ module MetadataPresenter
     def expired; end
 
     def complete; end
+
+    def destroyed; end
   end
 end

data/app/views/metadata_presenter/session/destroyed.html.erb

@@ -0,0 +1,8 @@
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l"><%= t('presenter.session_destroyed.title') %></h1>
+    <div class="maintenance-content">
+      <%= to_html t('presenter.session_destroyed.content') %>
+    </div>
+  </div>
+</div>

data/config/locales/cy.yml

@@ -67,6 +67,9 @@ cy:
     session_complete:
       title: Wedi cyflwyno
       content: "Mae’r ffurflen hon eisoes wedi’i chyflwyno.\r\n\r\nI ddiogelu eich gwybodaeth bersonol, rydym wedi ailosod y ffurflen ac wedi clirio’ch atebion."
+    session_destroyed:
+      title: Mae'r ffurflen hon wedi'i chadw ar gyfer diweddarach
+      content: "I barhau i weithio ar eich ffurflen, defnyddiwch y ddolen untro yr ydym wedi'i hanfon i’r cyfeiriad e-bost a ddarparwyd gennych.\r\n\r\nOs nad ydych wedi cael yr e-bost ar ôl ychydig funudau, edrychwch yn eich ffolder sbam."
     confirmation:
       reference_number: 'Eich cyfeirnod yw:'
       payment_enabled: Rydych dal angen talu

data/config/locales/en.yml

@@ -58,6 +58,9 @@ en:
     session_complete:
       title: Submission complete
       content: "This form has already been submitted.\r\n\r\nTo protect your personal information, we have reset the form and cleared your answers."
+    session_destroyed:
+      title: This form has been saved for later
+      content: "To continue working on your form, use the one-off link that we have sent to the email address you provided.\r\n\r\nIf you haven't received the email after a few minutes, check your spam folder."
     confirmation:
       reference_number: 'Your reference number is:'
       payment_enabled: You still need to pay

data/config/routes.rb

@@ -14,6 +14,7 @@ MetadataPresenter::Engine.routes.draw do
 
   get 'session/expired', to: 'session#expired'
   get 'session/complete', to: 'session#complete'
+  get 'session/destroyed', to: 'session#destroyed'
 
   # save form journey
   get 'save', to: 'save_and_return#show'

data/default_metadata/string/error.accept.json

@@ -2,6 +2,6 @@
   "_id": "error.accept",
   "_type": "string.error",
   "description": "File uploaded is wrong type",
-  "value:en": "\"%{control}\" was not uploaded successfully as it is the wrong type",
+  "value:en": "\"%{control}\" cannot be uploaded. Files must be one of the following file types: portable document format (.pdf), comma-separated values (.csv), images (.jpg, .jpeg, .png), Microsoft Excel (.xls, xlsx), Microsoft Word (.doc, .docx), Open Office (.odt, .ods), plain text (.txt), rich text (.rtf).",
   "value:cy": "Ni gafodd y \"%{control}\" ei lwytho’n llwyddiannus ac mae o’r math anghywir"
 }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.38'.freeze
+  VERSION = '3.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.38
+  version: 3.4.1
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -464,6 +464,7 @@ files:
 - app/views/metadata_presenter/session/_timeout_fallback.html.erb
 - app/views/metadata_presenter/session/_timeout_warning_modal.html.erb
 - app/views/metadata_presenter/session/complete.html.erb
+- app/views/metadata_presenter/session/destroyed.html.erb
 - app/views/metadata_presenter/session/expired.html.erb
 - app/views/metadata_presenter/shared/_start_again_button.html.erb
 - config/initializers/default_metadata.rb