metadata_presenter 2.20.1 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 769f0ca19b127cb76ec2ed21f8c1e7230dd8ebf6bdddf3de4cd17f42968b761a
4
- data.tar.gz: e80ce6addde9988351b7c8b772f7b886e3ea271757fec89daca6829a1c6a2203
3
+ metadata.gz: 0a31f247a10c6d27dbc9aa98fcaeba77debba7299bdc07ae0a464d5ef2e0acb4
4
+ data.tar.gz: 03b6fdf906a24439d474498e86d4c7e0e7978137551cbd7929fd61c06616a3d8
5
5
  SHA512:
6
- metadata.gz: 49e78672ebf5e5af2d393e74177785d0728fe4951ae4c6157bfbd051da84455a93078d2df7202235462505911dd4fd78ea35391a52dde28bb4b55f736eb90c85
7
- data.tar.gz: d47bd29255fbe43f930dbcae26dbc73ad5881c47f7069c798f609956e1c17ec20cbc77e0ea93785f39724ff9cfe5671366b429371dadb6a7c032755f47c24f8f
6
+ metadata.gz: fc2bc804e2e918de103b68dd0af02a6538f785f49bb4267a74cad8b88f3ed8f6d9d83476df0d2f247bbad44c8121fcbb4941397df1a5189a40e4348bf433b966
7
+ data.tar.gz: 559b1ddc0c79e391a0406dd7bba3cfc28758aa64fc7c20cc190790c141a9cb025400c83442cc95886509ca75741bf29a0b7121c79edf315d7cf9138a971ec034
@@ -1,5 +1,7 @@
1
1
  module MetadataPresenter
2
2
  class PagesController < EngineController
3
+ before_action :set_caching_header
4
+
3
5
  def show
4
6
  @user_data = load_user_data # method signature
5
7
  @page ||= service.find_page_by_url(request.env['PATH_INFO'])
@@ -8,6 +10,7 @@ module MetadataPresenter
8
10
  load_autocomplete_items
9
11
 
10
12
  @page_answers = PageAnswers.new(@page, @user_data)
13
+
11
14
  render template: @page.template
12
15
  else
13
16
  not_found
@@ -26,5 +29,11 @@ module MetadataPresenter
26
29
  def answered_pages
27
30
  TraversedPages.new(service, load_user_data, @page).all
28
31
  end
32
+
33
+ private
34
+
35
+ def set_caching_header
36
+ response.headers['Cache-Control'] = 'no-store'
37
+ end
29
38
  end
30
39
  end
@@ -1,5 +1,7 @@
1
1
  module MetadataPresenter
2
2
  class SessionController < EngineController
3
3
  def expired; end
4
+
5
+ def complete; end
4
6
  end
5
7
  end
@@ -91,7 +91,7 @@
91
91
  <% if editor_preview? || editable? %>
92
92
  <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', disabled: true %>
93
93
  <% else %>
94
- <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers'%>
94
+ <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', value: 'true' %>
95
95
  <% end %>
96
96
  <% end %>
97
97
  </div>
@@ -31,7 +31,7 @@
31
31
  <% if editor_preview? || editable? %>
32
32
  <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
33
33
  <% else %>
34
- <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later'%>
34
+ <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
35
35
  <% end %>
36
36
  <% end %> </div>
37
37
  <% end %>
@@ -23,7 +23,7 @@
23
23
  <% if editor_preview? || editable? %>
24
24
  <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
25
25
  <% else %>
26
- <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later'%>
26
+ <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later' , value: 'true' %>
27
27
  <% end %>
28
28
  <% end %> </div>
29
29
  <% end %>
@@ -27,7 +27,7 @@
27
27
  <% if editor_preview? || editable? %>
28
28
  <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', disabled: true %>
29
29
  <% else %>
30
- <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later'%>
30
+ <%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later', value: 'true' %>
31
31
  <% end %>
32
32
  <% end %>
33
33
  </div>
@@ -0,0 +1,9 @@
1
+ <div class="govuk-grid-row">
2
+ <div class="govuk-grid-column-two-thirds">
3
+ <h1 class="govuk-heading-l"><%= t('presenter.session_complete.title') %></h1>
4
+ <div class="maintenance-content">
5
+ <%= to_html t('presenter.session_complete.content') %>
6
+ <p><%= link_to t('presenter.session_complete.restart_link'), root_url %></p>
7
+ </div>
8
+ </div>
9
+ </div>
@@ -32,6 +32,10 @@ en:
32
32
  title: Your form has been reset
33
33
  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."
34
34
  restart_link: Start again
35
+ session_complete:
36
+ title: Submission complete
37
+ content: "This form has already been submitted.\r\n\r\nTo protect your personal information, we have reset the form and cleared your answers."
38
+ restart_link: Start again
35
39
  confirmation:
36
40
  reference_number: 'Your reference number is:'
37
41
  payment_enabled: You still need to pay
data/config/routes.rb CHANGED
@@ -9,6 +9,7 @@ MetadataPresenter::Engine.routes.draw do
9
9
  get '/reserved/file/:component_id', to: 'file#destroy', as: :remove_file
10
10
 
11
11
  get 'session/expired', to: 'session#expired'
12
+ get 'session/complete', to: 'session#complete'
12
13
 
13
14
  get 'save', to: 'save_and_return#show'
14
15
  post 'saved_forms', to: 'save_and_return#create'
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.20.1'.freeze
2
+ VERSION = '3.0.1'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.20.1
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-05-22 00:00:00.000000000 Z
11
+ date: 2023-05-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -58,20 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: 6.0.3.4
62
- - - "<"
63
- - !ruby/object:Gem::Version
64
- version: 6.2.0
61
+ version: 7.0.0
65
62
  type: :runtime
66
63
  prerelease: false
67
64
  version_requirements: !ruby/object:Gem::Requirement
68
65
  requirements:
69
66
  - - ">="
70
67
  - !ruby/object:Gem::Version
71
- version: 6.0.3.4
72
- - - "<"
73
- - !ruby/object:Gem::Version
74
- version: 6.2.0
68
+ version: 7.0.0
75
69
  - !ruby/object:Gem::Dependency
76
70
  name: sassc-rails
77
71
  requirement: !ruby/object:Gem::Requirement
@@ -86,6 +80,34 @@ dependencies:
86
80
  - - '='
87
81
  - !ruby/object:Gem::Version
88
82
  version: 2.1.2
83
+ - !ruby/object:Gem::Dependency
84
+ name: sprockets-rails
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: '0'
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ">="
95
+ - !ruby/object:Gem::Version
96
+ version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: sprockets
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :runtime
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
89
111
  - !ruby/object:Gem::Dependency
90
112
  name: better_errors
91
113
  requirement: !ruby/object:Gem::Requirement
@@ -392,6 +414,7 @@ files:
392
414
  - app/views/metadata_presenter/save_and_return/show.html.erb
393
415
  - app/views/metadata_presenter/session/_timeout_fallback.html.erb
394
416
  - app/views/metadata_presenter/session/_timeout_warning_modal.html.erb
417
+ - app/views/metadata_presenter/session/complete.html.erb
395
418
  - app/views/metadata_presenter/session/expired.html.erb
396
419
  - config/initializers/default_metadata.rb
397
420
  - config/initializers/default_text.rb