metadata_presenter 3.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22dcad7276c3189e2ce7da59b29f395d86dbadce62490ae406eddd7097b4241
-  data.tar.gz: 32cc3570632ba9ed5a48bd529627f2248fea6517746f7f0686ba62706591982b
+  metadata.gz: de4803f047828b34c584bbe1a6e3634e55ab62fb7dc5cf84af0e74179fab2bfd
+  data.tar.gz: 48d367b837b22dae94e57158a1f23471ac5c8f51bac70ece003bcaa528eed909
 SHA512:
-  metadata.gz: e718b878af0b3159549da70fd8a922b7e6918be2b1d15075910d9a2181c216b59e68ed48892837957c1439d997066c8fe92f7daef8c1c3bfb0f53b00c6da4d99
-  data.tar.gz: 0cbeea9f608702360fb6281eea0ae483063b325a96a3a358f60f86e0b7cb78765254efc3b4df306744a5d09c4a7f1a1adf8ee7cb017ff90309456ceeb0d81393
+  metadata.gz: 45740afe9df6c30057f70e6c8c8cd24f913c90f6bb63c49a04c4104abbf65c3a87333f648cb8ff55be537ff754a5cb1e86745dd9762acb2df2201ba03bfeebda
+  data.tar.gz: dd590ea13e20ce649630a7640e5877d56dca8081e2b8c118c22da9e4f43e62afaa39b3ddbdf185cc1e6b4f244aaafb9b37b1ca4d6995f8bd90a3deb5b95d8a60

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -1,5 +1,7 @@
 module MetadataPresenter
   class PagesController < EngineController
+    before_action :set_caching_header
+
     def show
       @user_data = load_user_data # method signature
       @page ||= service.find_page_by_url(request.env['PATH_INFO'])
@@ -8,6 +10,7 @@ module MetadataPresenter
         load_autocomplete_items
 
         @page_answers = PageAnswers.new(@page, @user_data)
+
         render template: @page.template
       else
         not_found
@@ -26,5 +29,11 @@ module MetadataPresenter
     def answered_pages
       TraversedPages.new(service, load_user_data, @page).all
     end
+
+    private
+
+    def set_caching_header
+      response.headers['Cache-Control'] = 'no-store'
+    end
   end
 end

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -42,6 +42,7 @@ module MetadataPresenter
       @saved_form.secret_question = params['saved_form']['secret_question']
       @saved_form.populate_service_values(service)
       @saved_form.populate_session_values(session)
+      @saved_form.service_slug = service_slug
       if @saved_form.valid?
         # put in session until we have confirmed email address
         @saved_form.secret_question = @saved_form.secret_question_text
@@ -231,5 +232,11 @@ module MetadataPresenter
     def label_text(text)
       "<h2 class='govuk-heading-m'>#{text}</h2>"
     end
+
+    private
+
+    def service_slug
+      @service_slug ||= service_slug_config
+    end
   end
 end

data/app/controllers/metadata_presenter/session_controller.rb

@@ -1,5 +1,7 @@
 module MetadataPresenter
   class SessionController < EngineController
     def expired; end
+
+    def complete; end
   end
 end

data/app/models/metadata_presenter/saved_form.rb

@@ -21,7 +21,7 @@ module MetadataPresenter
                   :created_at,
                   :updated_at
 
-    validates :secret_question, :secret_answer, :service_slug, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
+    validates :secret_question, :secret_answer, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
 
     def initialize; end
 
@@ -38,7 +38,6 @@ module MetadataPresenter
     end
 
     def populate_service_values(service)
-      self.service_slug    = service.service_slug
       self.service_version = service.version_id
     end
 

data/app/models/metadata_presenter/service.rb

@@ -38,8 +38,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def service_slug
-    return service_slug_config if service_slug_config.present?
-
     service_name.gsub(/['’]/, '').parameterize
   end
 

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

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

data/config/locales/en.yml

@@ -32,6 +32,10 @@ en:
       title: Your form has been reset
       content: "To protect your personal information, we have reset the form and cleared your answers.\r\n\r\nThis is because you were inactive for 30 minutes."
       restart_link: Start again
+    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."
+      restart_link: Start again
     confirmation:
       reference_number: 'Your reference number is:'
       payment_enabled: You still need to pay

data/config/routes.rb

@@ -9,6 +9,7 @@ MetadataPresenter::Engine.routes.draw do
   get '/reserved/file/:component_id', to: 'file#destroy', as: :remove_file
 
   get 'session/expired', to: 'session#expired'
+  get 'session/complete', to: 'session#complete'
 
   get 'save', to: 'save_and_return#show'
   post 'saved_forms', to: 'save_and_return#create'

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.2
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -414,6 +414,7 @@ files:
 - app/views/metadata_presenter/save_and_return/show.html.erb
 - 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/expired.html.erb
 - config/initializers/default_metadata.rb
 - config/initializers/default_text.rb