metadata_presenter 3.0.6 → 3.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b647fe9684b07cc48050562adc69ef72e388983775fb63f2cc77ed5ef572e011
4
- data.tar.gz: '087dcb89a74b967bcfc16829e38de2277532073ec89ce7c6a5c7b4c913bc9e9f'
3
+ metadata.gz: af42807af0ac2b52ab40d11ea1b03317cd15d31d6c91445e406bde92f53a8642
4
+ data.tar.gz: 68f4c9ffda9100950999f0c1ab5885082f9e74f237636a1a4a1364a72b6dbe5c
5
5
  SHA512:
6
- metadata.gz: 9e526eade4ee1ae0e0a28ae9925b4f7e0dcdc3654146bae438cd2cf84e2870b7b10af4a8b7c565a33b4aac329565b68e425b4c432ff7e50466868cc987c92c4b
7
- data.tar.gz: ebe2ef0538e36d34bfd5f50eea4f1c0cdfb0f155033171ee67bd5b46cdac459b288e11781a4fcbd0ddb168c724470b0d6c7b94fd36e8337a21976d067373b3e3
6
+ metadata.gz: b0ab87b1481df79a1e74c268446c5f0077d9c8a68803863bad5585aac36ec1ee4a2a1e3e63d5aab6faf5786737b36f83fe18677b1df65c5c1cb6cbd44a52592e
7
+ data.tar.gz: b0f714ea5732ce9d37aa3fc18a41b88c02e4be202ff809a8aaf103de315c083202c29f44d926b0222c3bbb81924aff8061fef9c37846ea044181e1fb89c47d94
@@ -20,5 +20,20 @@ module MetadataPresenter
20
20
  def default_text(property)
21
21
  MetadataPresenter::DefaultText[property]
22
22
  end
23
+
24
+ def default_title(component_type)
25
+ MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('label') ||
26
+ MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('legend')
27
+ end
28
+
29
+ def default_item_title(component_type)
30
+ return unless %w[checkboxes radios].include?(component_type)
31
+
32
+ MetadataPresenter::DefaultMetadata["component.#{component_type}"]['items']&.first&.[]('label')
33
+ end
34
+
35
+ def default_page_title(type)
36
+ MetadataPresenter::DefaultMetadata[type.to_s]&.[]('heading')
37
+ end
23
38
  end
24
39
  end
@@ -0,0 +1,7 @@
1
+ module MetadataPresenter
2
+ class DefaultMetadata
3
+ def self.[](key)
4
+ Rails.application.config.default_metadata[key].deep_dup
5
+ end
6
+ end
7
+ end
@@ -1,6 +1,6 @@
1
1
 
2
- <div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
3
- <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-accepted" role="alert" style="display: none;">
2
+ <div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>" data-module="cookie-banner">
3
+ <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-accepted" role="alert" data-cookie-banner-element="message-accepted" hidden>
4
4
  <div class="govuk-grid-row">
5
5
  <div class="govuk-grid-column-two-thirds">
6
6
  <div class="govuk-cookie-banner__content">
@@ -10,15 +10,10 @@
10
10
  </div>
11
11
  </div>
12
12
  </div>
13
-
14
- <div class="govuk-button-group">
15
- <button class="govuk-button" data-module="govuk-button" onclick="analytics.hideCookieBanner()">
16
- <%= t('presenter.analytics.hide') %>
17
- </button>
18
- </div>
13
+ <%= render partial: 'metadata_presenter/analytics/hide_cookie_banner' %>
19
14
  </div>
20
15
 
21
- <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-rejected" role="alert" style="display: none;">
16
+ <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message-rejected" role="alert" data-cookie-banner-element="message-rejected" hidden>
22
17
  <div class="govuk-grid-row">
23
18
  <div class="govuk-grid-column-two-thirds">
24
19
  <div class="govuk-cookie-banner__content">
@@ -28,11 +23,6 @@
28
23
  </div>
29
24
  </div>
30
25
  </div>
31
-
32
- <div class="govuk-button-group">
33
- <button class="govuk-button" data-module="govuk-button" onclick="analytics.hideCookieBanner()">
34
- <%= t('presenter.analytics.hide') %>
35
- </button>
36
- </div>
26
+ <%= render partial: 'metadata_presenter/analytics/hide_cookie_banner' %>
37
27
  </div>
38
28
  </div>
@@ -1,5 +1,5 @@
1
- <div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>">
2
- <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message">
1
+ <div class="govuk-cookie-banner" id="govuk-cookie-banner" data-nosnippet role="region" aria-label="<%= t('presenter.analytics.heading', service_name: service.service_name) %>" data-module="cookie-banner">
2
+ <div class="govuk-cookie-banner__message govuk-width-container" id="govuk-cookie-banner-message" data-cookie-banner-element="message">
3
3
 
4
4
  <div class="govuk-grid-row">
5
5
  <div class="govuk-grid-column-two-thirds">
@@ -14,11 +14,11 @@
14
14
  </div>
15
15
  </div>
16
16
 
17
- <div class="govuk-button-group">
18
- <button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.accept("<%= analytics_cookie_name %>")'>
17
+ <div class="govuk-button-group" >
18
+ <button id="cookies-accept" type="button" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="accept-button" data-cookie-name="<%= analytics_cookie_name %>">
19
19
  <%= t('presenter.analytics.accept') %>
20
20
  </button>
21
- <button type="button" class="govuk-button" data-module="govuk-button" onclick='analytics.reject("<%= analytics_cookie_name %>")'>
21
+ <button id="cookies-reject" type="button" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="reject-button" data-cookie-name="<%= analytics_cookie_name %>">
22
22
  <%= t('presenter.analytics.reject') %>
23
23
  </button>
24
24
  <a class="govuk-link" href="/cookies"><%= t('presenter.analytics.view_cookies') %></a>
@@ -0,0 +1,6 @@
1
+ <div class="govuk-button-group">
2
+ <button id="hide-cookie-banner" class="govuk-button" data-module="govuk-button" data-cookie-banner-element="hide-button">
3
+ <%= t('presenter.analytics.hide') %>
4
+ </button>
5
+ </div>
6
+
@@ -1,5 +1,7 @@
1
1
  <h1 class="fb-editable govuk-heading-xl"
2
2
  data-fb-content-id="page[heading]"
3
- data-fb-content-type="element">
3
+ data-fb-content-type="element"
4
+ data-fb-default-value="<%= default_page_title(@page.type) %>">
4
5
  <%= @page.heading %>
5
6
  </h1>
7
+
@@ -14,7 +14,9 @@
14
14
  id="<%= component.id %>"
15
15
  data-fb-content-type="<%= component.type %>"
16
16
  data-fb-content-id="<%= "page[#{component.collection}[#{index}]]" %>"
17
- data-fb-content-data="<%= component.to_json %>">
17
+ data-fb-content-data="<%= component.to_json %>"
18
+ data-fb-default-value="<%= default_title(component.type) %>"
19
+ data-fb-default-item-value="<%= default_item_title(component.type) %>">
18
20
 
19
21
  <%= render partial: component, locals: {
20
22
  f: f,
@@ -4,7 +4,8 @@
4
4
 
5
5
  <h1 class="fb-editable govuk-heading-xl"
6
6
  data-fb-content-type="element"
7
- data-fb-content-id="page[heading]">
7
+ data-fb-content-id="page[heading]"
8
+ data-fb-default-value="<%= default_page_title(@page.type) %>">
8
9
  <%= @page.heading %>
9
10
  </h1>
10
11
 
@@ -7,7 +7,8 @@
7
7
  <% end %>
8
8
  <h1 class="fb-editable govuk-panel__title"
9
9
  data-fb-content-type="element"
10
- data-fb-content-id="page[heading]">
10
+ data-fb-content-id="page[heading]"
11
+ data-fb-default-value="<%= default_page_title(@page.type) %>">
11
12
  <% if payment_link_enabled? && @page.heading == I18n.t('presenter.confirmation.application_complete') %>
12
13
  <p><%= I18n.t('presenter.confirmation.payment_enabled') %></p>
13
14
  <% else %>
@@ -6,7 +6,8 @@
6
6
 
7
7
  <h1 class="fb-editable govuk-heading-xl"
8
8
  data-fb-content-id="page[heading]"
9
- data-fb-content-type="element">
9
+ data-fb-content-type="element"
10
+ data-fb-default-value="<%= default_page_title(@page.type) %>">
10
11
  <%= @page.heading %>
11
12
  </h1>
12
13
 
@@ -6,7 +6,8 @@
6
6
 
7
7
  <h1 class="fb-editable govuk-heading-xl"
8
8
  data-fb-content-id="page[heading]"
9
- data-fb-content-type="element">
9
+ data-fb-content-type="element"
10
+ data-fb-default-value="<%= default_page_title(@page.type) %>">
10
11
  <%= @page.heading %>
11
12
  </h1>
12
13
 
@@ -11,7 +11,9 @@
11
11
  <div class="fb-editable"
12
12
  data-fb-content-type="<%= component._type %>"
13
13
  data-fb-content-id="<%= "page[components[#{index}]]" %>"
14
- data-fb-content-data="<%= component.to_json %>">
14
+ data-fb-content-data="<%= component.to_json %>"
15
+ data-fb-default-value="<%= default_title(component.type) %>"
16
+ data-fb-default-item-value="<%= default_item_title(component.type) %>">
15
17
  <%= render partial: component, locals: {
16
18
  component: component,
17
19
  f: f,
@@ -19,7 +19,8 @@
19
19
  <% if @page.heading %>
20
20
  <h1 class="fb-editable govuk-heading-xl"
21
21
  data-fb-content-id="page[heading]"
22
- data-fb-content-type="element">
22
+ data-fb-content-type="element"
23
+ data-fb-default-value="<%= t("presenter.footer.#{@page.id.gsub!('page.','')}.heading") %>">
23
24
  <%= @page.heading %>
24
25
  </h1>
25
26
  <% end %>
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.0.6'.freeze
2
+ VERSION = '3.0.8'.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: 3.0.6
4
+ version: 3.0.8
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-06-26 00:00:00.000000000 Z
11
+ date: 2023-06-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -312,6 +312,7 @@ files:
312
312
  - app/controllers/metadata_presenter/session_controller.rb
313
313
  - app/controllers/metadata_presenter/submissions_controller.rb
314
314
  - app/helpers/metadata_presenter/application_helper.rb
315
+ - app/helpers/metadata_presenter/default_metadata.rb
315
316
  - app/helpers/metadata_presenter/default_text.rb
316
317
  - app/jobs/metadata_presenter/application_job.rb
317
318
  - app/models/metadata_presenter/autocomplete_item.rb
@@ -386,6 +387,7 @@ files:
386
387
  - app/views/metadata_presenter/analytics/_global_analytics.html.erb
387
388
  - app/views/metadata_presenter/analytics/_google.html.erb
388
389
  - app/views/metadata_presenter/analytics/_gtm.html.erb
390
+ - app/views/metadata_presenter/analytics/_hide_cookie_banner.html.erb
389
391
  - app/views/metadata_presenter/analytics/_ua.html.erb
390
392
  - app/views/metadata_presenter/analytics/analytics.html.erb
391
393
  - app/views/metadata_presenter/attribute/_body.html.erb