metadata_presenter 3.3.15 → 3.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697e6b4f94a8e43973cc082259567e2967f2b4686e840174cfda308b378f5302
-  data.tar.gz: e47e94bf27c2b86cc9e4677ed0dec9c0385c3adc9c92e0594938d3a8ae1de20a
+  metadata.gz: ca82207cf77d8ca4d171b2abb5d4c9623ea0cde4d6c78b5a521c0886ab36d49f
+  data.tar.gz: 962aabed91477ca0b20823dcf8bb30aca79d3f8533be1238777c4d4d612e6960
 SHA512:
-  metadata.gz: 9a1f301247aa0891098f7d4cbab3a8a6de98b0bcf02187a4d51e214318f933acff699e910122690118dd1768fc7e6d1cbfd7e02732e8c53b4d338cf2445c205a
-  data.tar.gz: 9801b62cd16f191fd5b239c4fd39ba1ce60bd8007c255cb309e1037840d35a4876feb2a0ebb2255d172ea37037811d066c3d40b03a02e9a89e2a4f1660880151
+  metadata.gz: 728585280c3b94c3aa412f4ea3124b3be98c40519ded253e3de074253b89101214241206686a17e28cec7f5c43b48a20336abfc0d242b043c04ef857dd9dca40
+  data.tar.gz: 67481bd5e0ce725ce35e00edfe5dd04099bfd7a28c825a334ca7126121f190a04f9d151f09c700e4dc7492c8100b676f5ba12410294ce709d68c6e668d6bd3bb

data/app/helpers/metadata_presenter/application_helper.rb

@@ -2,6 +2,8 @@ require 'govspeak'
 
 module MetadataPresenter
   module ApplicationHelper
+    OLD_BODY_DEFAULT_CONTENT = 'Body section'.freeze
+
     def main_title(component:, tag: :h1, classes: 'govuk-heading-xl')
       content_tag(tag, class: classes) do
         component.humanised_title
@@ -21,6 +23,15 @@ module MetadataPresenter
       MetadataPresenter::DefaultText[property]
     end
 
+    # we used to have some placeholder text in the body key, which was always replaced
+    # we since exposed the body key in an optional content area for certain pages, so forms created before that
+    # need to have their old default content ignored
+    def page_body_content
+      if @page.body
+        @page.body == OLD_BODY_DEFAULT_CONTENT ? '' : @page.body
+      end
+    end
+
     def default_title(component_type)
       MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('label') ||
         MetadataPresenter::DefaultMetadata["component.#{component_type}"]&.[]('legend')

data/app/models/metadata_presenter/address_fieldset.rb

@@ -27,7 +27,11 @@ module MetadataPresenter
     end
 
     def to_a
-      instance_values.values_at(*FIELDS).compact_blank
+      as_json.values.compact_blank
+    end
+
+    def as_json
+      super(only: FIELDS)
     end
 
     def conform(address_field)

data/app/views/metadata_presenter/attribute/_body.html.erb

@@ -3,8 +3,8 @@
                           class="fb-editable"
                           type="content"
                           default-content="<%= default_text('body') %>"
-                          content="<%= @page.body %>"
+                          content="<%= page_body_content %>"
                           data-fb-content-id="<%= "page[body]" %>">
-    <%= to_html(@page.body) %>
+    <%= to_html(page_body_content) %>
   </editable-content>
 <%- end %>

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.3.15'.freeze
+  VERSION = '3.3.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.3.15
+  version: 3.3.17
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder