metadata_presenter 3.3.17 → 3.3.18

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: ca82207cf77d8ca4d171b2abb5d4c9623ea0cde4d6c78b5a521c0886ab36d49f
4
- data.tar.gz: 962aabed91477ca0b20823dcf8bb30aca79d3f8533be1238777c4d4d612e6960
3
+ metadata.gz: 7a3dd13a1370777030a8fdcffa24ccf26707af3e6f060a9513246adf5831d101
4
+ data.tar.gz: e5a5ffa279478e575359bcf3f410c05a5bbbfa0bdec6f5386b7d622813fa420b
5
5
  SHA512:
6
- metadata.gz: 728585280c3b94c3aa412f4ea3124b3be98c40519ded253e3de074253b89101214241206686a17e28cec7f5c43b48a20336abfc0d242b043c04ef857dd9dca40
7
- data.tar.gz: 67481bd5e0ce725ce35e00edfe5dd04099bfd7a28c825a334ca7126121f190a04f9d151f09c700e4dc7492c8100b676f5ba12410294ce709d68c6e668d6bd3bb
6
+ metadata.gz: b7226999e494eed4ec82d4f88fd86aed859d923f0020534bfa2d1574da9062c44e21a102fd82969a6b970994af173841403cdc919ae7ffdf5afb806c6fb028b1
7
+ data.tar.gz: f406a7850796cffeb128831ee02d8eace50c685f912b4aa55a1b0cd8103deb669b529973c3ccedc3bc1d027027b84cd35dcc2fd7fd34677e14323abcfd17ee30
@@ -15,7 +15,7 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
15
15
 
16
16
  def <=>(other)
17
17
  return nil unless other.is_a?(MetadataPresenter::Component)
18
- return 0 unless order
18
+ return 0 unless order && other.order
19
19
 
20
20
  order <=> other.order
21
21
  end
@@ -5,6 +5,8 @@
5
5
  default-content="<%= default_text('body') %>"
6
6
  content="<%= page_body_content %>"
7
7
  data-fb-content-id="<%= "page[body]" %>">
8
- <%= to_html(page_body_content) %>
8
+ <div class="html">
9
+ <%= to_html(page_body_content) %>
10
+ </div>
9
11
  </editable-content>
10
12
  <%- end %>
@@ -3,6 +3,8 @@
3
3
  data-fb-content-id="page[lede]"
4
4
  data-fb-content-type="element"
5
5
  data-fb-default-text="<%= default_text('lede') %>">
6
- <%= @page.lede %>
6
+ <div class="html">
7
+ <%= @page.lede %>
8
+ </div>
7
9
  </div>
8
10
  <%- end %>
@@ -1,28 +1,42 @@
1
1
  <% components.each_with_index do |component, index| %>
2
-
3
2
  <% if component.type == 'content' %>
4
3
  <% next unless (editable? || @page.show_conditional_component?(component.uuid) || single_page_preview?) %>
5
-
6
- <editable-content id="<%= component.id %>"
7
- class="fb-editable govuk-!-margin-top-8"
8
- type="<%= component.type %>"
9
- default-content="<%= default_text('content') %>"
10
- content="<%= component.content %>"
11
- data-fb-content-id="<%= "page[#{component.collection}[#{index}]]" %>"
12
- data-config="<%= component.to_json %>"
13
- data-conditional-api-path="<%= editable? ? URI.decode_www_form_component(api_service_edit_conditional_content_path(service.service_id, component.uuid)) : '' %>">
14
- <%= to_html(component.content) %>
15
- </editable-content>
16
- <% end %>
17
-
18
- <% unless component.type == 'content' %>
4
+ <editable-content id="<%= component.id %>"
5
+ class="fb-editable govuk-!-margin-top-8"
6
+ type="<%= component.type %>"
7
+ default-content="<%= default_text('content') %>"
8
+ content="<%= component.content %>"
9
+ data-fb-content-id="<%= "page[#{component.collection}[#{index}]]" %>"
10
+ data-config="<%= component.to_json %>"
11
+ data-conditional-api-path="<%= editable? ? URI.decode_www_form_component(api_service_edit_conditional_content_path(service.service_id, component.uuid)) : '' %>"
12
+ data-controller="orderable-item component"
13
+ data-orderable-item-order-value="<%= component.order || index %>"
14
+ data-orderable-items-target="orderableItem"
15
+ data-action="orderable-item:move->orderable-items#reorder
16
+ orderable-item:move->component#focus
17
+ orderable-item:orderUpdated->component#update
18
+ questionRemove->component#destroy"
19
+ data-orderable-item-moving-class="moving">
20
+ <div class="html">
21
+ <%= to_html(component.content) %>
22
+ </div>
23
+ </editable-content>
24
+ <% else %>
19
25
  <div class="fb-editable govuk-!-margin-top-8"
20
26
  id="<%= component.id %>"
21
27
  data-fb-content-type="<%= component.type %>"
22
28
  data-fb-content-id="<%= "page[#{component.collection}[#{index}]]" %>"
23
29
  data-fb-content-data="<%= component.to_json %>"
24
30
  data-fb-default-value="<%= default_title(component.type) %>"
25
- data-fb-default-item-value="<%= default_item_title(component.type) %>">
31
+ data-fb-default-item-value="<%= default_item_title(component.type) %>"
32
+ data-controller="orderable-item component"
33
+ data-orderable-item-order-value="<%= component.order || index %>"
34
+ data-orderable-items-target="orderableItem"
35
+ data-action="orderable-item:move->orderable-items#reorder
36
+ orderable-item:move->component#focus
37
+ orderable-item:orderUpdated->component#update
38
+ questionRemove->component#destroy"
39
+ data-orderable-item-moving-class="moving">
26
40
 
27
41
  <%= render partial: component, locals: {
28
42
  f: f,
@@ -77,7 +77,9 @@
77
77
  default-content="<%= default_text('body') %>"
78
78
  content="<%= @page.send_body %>"
79
79
  data-fb-content-id="<%= "page[send_body]" %>">
80
- <%= to_html(@page.send_body) %>
80
+ <div class="html">
81
+ <%= to_html(@page.send_body) %>
82
+ </div>
81
83
  </editable-content>
82
84
  <% end %>
83
85
 
@@ -32,7 +32,9 @@
32
32
  data-fb-content-id="page[lede]"
33
33
  data-fb-content-type="element"
34
34
  data-fb-default-text="<%= default_text('lede') %>">
35
- <%= @page.lede %>
35
+ <div class="html">
36
+ <%= @page.lede %>
37
+ </div>
36
38
  </div>
37
39
  <%- end %>
38
40
  </div>
@@ -14,15 +14,17 @@
14
14
  <%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
15
15
  <%= f.govuk_error_summary(t('presenter.errors.summary_heading')) %>
16
16
 
17
- <%= render partial: 'metadata_presenter/component/components', locals: {
18
- f: f,
19
- components: @page.components,
20
- tag: :h2,
21
- classes: 'govuk-heading-m',
22
- input_components: @page.supported_input_components,
23
- content_components: @page.supported_content_components
24
- }
25
- %>
17
+ <div class="components" data-controller="orderable-items">
18
+ <%= render partial: 'metadata_presenter/component/components', locals: {
19
+ f: f,
20
+ components: @page.components,
21
+ tag: :h2,
22
+ classes: 'govuk-heading-m',
23
+ input_components: @page.supported_input_components,
24
+ content_components: @page.supported_content_components
25
+ }
26
+ %>
27
+ </div>
26
28
  <div class="govuk-button-group">
27
29
  <%= f.govuk_submit(t('presenter.actions.continue'), disabled: editable?) %>
28
30
 
@@ -22,7 +22,9 @@
22
22
  default-content="<%= default_text('before_you_start') %>"
23
23
  content="<%= @page.before_you_start %>"
24
24
  data-fb-content-id="<%= "page[before_you_start]" %>">
25
- <%= to_html(@page.before_you_start) %>
25
+ <div class="html">
26
+ <%= to_html(@page.before_you_start) %>
27
+ </div>
26
28
  </editable-content>
27
29
  <%- end %>
28
30
  </div>
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '3.3.17'.freeze
2
+ VERSION = '3.3.18'.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.3.17
4
+ version: 3.3.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-02-23 00:00:00.000000000 Z
11
+ date: 2024-02-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder