metadata_presenter 0.18.4 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eedfdb8be0287c9afecc889ed795de1cbe54803a3f10ee3534c7b94656a724e
-  data.tar.gz: 6c16e4986b0ddbbb964e2e66d89350359e8cde221b1bf934ac58d81b621a11a3
+  metadata.gz: 823bc281b38f93b1e5e8e2adcbed277bc4aca13e36ee803a3e699c10aaacac41
+  data.tar.gz: f6ceffa8d3efea9201c00db0dc81240a717e5bcd47cc7f1b943b9b33a529fece
 SHA512:
-  metadata.gz: c927b311be5d096e19b5ca2edd50c33afb899f44942cd3a11ea3d396ba504df656165bb808d02c43b10c679e71a86ec24e5718cd98bf86c254393728ccee7691
-  data.tar.gz: a6a0690aae68acd1799acdbfb97f03b37dcf68feabc847d8ed8ee549bd2ac71c0043b49bacb3e05ce24aa3c1737fbd94c8a239b7dda68b4197f4247c65bedc6c
+  metadata.gz: ac34de25f5db0f90894a6d0af674de69136fc332ea512dd4c7b3afe9561c29d15be274d6025a2cbd27f438b2f76a83544cd51194880ede76bb5dc9d3912bcdf7
+  data.tar.gz: 3a0ba09f181fcd7549ddef81a3b2f581db6c74d619f7b27c5a3d7810bf26264ed093d9d849486d1de4cfe414b36c65f97491e63224fa486c3b44da0a229fdcdc

data/app/helpers/metadata_presenter/application_helper.rb

@@ -21,5 +21,9 @@ module MetadataPresenter
       (Kramdown::Document.new(text).to_html).html_safe
     end
     alias to_markdown m
+
+    def default_text(property)
+      MetadataPresenter::DefaultText[property]
+    end
   end
 end

data/app/helpers/metadata_presenter/default_text.rb

@@ -0,0 +1,7 @@
+module MetadataPresenter
+  class DefaultText
+    def self.[](property)
+      Rails.application.config.default_text[property.to_s]
+    end
+  end
+end

data/app/models/metadata_presenter/component.rb

@@ -9,11 +9,7 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
 
   def items
     metadata.items.map do |item|
-      OpenStruct.new(
-        id: item['label'],
-        name: item['label'],
-        description: item['hint']
-      )
+      MetadataPresenter::Item.new(item, editor: editor?)
     end
   end
 end

data/app/models/metadata_presenter/item.rb

@@ -0,0 +1,9 @@
+class MetadataPresenter::Item < MetadataPresenter::Metadata
+  def name
+    label
+  end
+
+  def description
+    hint
+  end
+end

data/app/models/metadata_presenter/metadata.rb

@@ -4,8 +4,9 @@ class MetadataPresenter::Metadata
 
   attr_reader :metadata
 
-  def initialize(metadata)
+  def initialize(metadata, editor: false)
     @metadata = OpenStruct.new(metadata)
+    @editor = editor
   end
 
   def to_json
@@ -25,6 +26,11 @@ class MetadataPresenter::Metadata
   end
 
   def method_missing(method_name, *args, &block)
-    metadata.send(method_name, *args, &block)
+    value = metadata.send(method_name, *args, &block)
+    value.blank? && editor? ? MetadataPresenter::DefaultText[method_name] : value
+  end
+
+  def editor?
+    @editor.present?
   end
 end

data/app/models/metadata_presenter/page.rb

@@ -16,7 +16,7 @@ module MetadataPresenter
 
     def components
       metadata.components&.map do |component|
-        MetadataPresenter::Component.new(component)
+        MetadataPresenter::Component.new(component, editor: editor?)
       end
     end
 

data/app/models/metadata_presenter/service.rb

@@ -1,6 +1,8 @@
 class MetadataPresenter::Service < MetadataPresenter::Metadata
   def pages
-    @_pages ||= metadata.pages.map { |page| MetadataPresenter::Page.new(page) }
+    @_pages ||= metadata.pages.map do |page|
+      MetadataPresenter::Page.new(page, editor: editor?)
+    end
   end
 
   def start_page

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

@@ -0,0 +1,8 @@
+<% if @page.body %>
+  <div class="fb-editable"
+        data-fb-content-id="page[body]"
+        data-fb-content-type="content"
+        data-fb-default-text="<%= default_text('body') %>">
+    <%= to_markdown(@page.body) %>
+  </div>
+<%- end %>

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

@@ -0,0 +1,8 @@
+<% if @page.lede %>
+  <div class="fb-editable govuk-body-l"
+        data-fb-content-id="page[lede]"
+        data-fb-content-type="element"
+        data-fb-default-text="<%= default_text('lede') %>">
+    <%= @page.lede %>
+  </div>
+<%- end %>

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

@@ -0,0 +1,8 @@
+<% if @page.section_heading %>
+  <p class="fb-editable govuk-caption-l fb-section_heading"
+      data-fb-content-type="element"
+      data-fb-content-id="page[section_heading]"
+      data-fb-default-text="<%= default_text('section_heading') %>">
+    <%= @page.section_heading %>
+  </p>
+<%- end %>

data/app/views/metadata_presenter/component/_checkboxes.html.erb

@@ -5,6 +5,9 @@
     :name,
     :description,
     legend: { text: input_title },
-    hint: { text: component.hint },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
     include_hidden: false
 %>

data/app/views/metadata_presenter/component/_content.html.erb

@@ -0,0 +1 @@
+<%= to_markdown(component.html) %>

data/app/views/metadata_presenter/component/_date.html.erb

@@ -1,5 +1,8 @@
 <%=
   f.govuk_date_field component.id.to_sym,
-    hint: { text: component.hint },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
     legend: { text: input_title }
 %>

data/app/views/metadata_presenter/component/_number.html.erb

@@ -1,7 +1,10 @@
 <%=
   f.govuk_text_field component.id.to_sym,
     label: { text: input_title },
-    hint: { text: component.hint },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
     name: "answers[#{component.name}]",
     width: component.width_class_input.to_i
 %>

data/app/views/metadata_presenter/component/_radios.html.erb

@@ -5,5 +5,8 @@
     :name,
     :description,
     legend: { text: input_title },
-    hint: { text: component.hint }
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    }
 %>

data/app/views/metadata_presenter/component/_text.html.erb

@@ -1,6 +1,9 @@
 <%=
   f.govuk_text_field component.id.to_sym,
     label: { text: input_title },
-    hint: { text: component.hint },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
     name: "answers[#{component.name}]"
 %>

data/app/views/metadata_presenter/component/_textarea.html.erb

@@ -1,7 +1,10 @@
 <%=
   f.govuk_text_area component.id.to_sym,
     label: { text: input_title },
-    hint: { text: component.hint },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
     name: "answers[#{component.name}]",
     max_chars: component.maxchars,
     max_words: component.maxwords,

data/app/views/metadata_presenter/page/checkanswers.html.erb

@@ -1,12 +1,7 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <% if @page.section_heading.present? %>
-      <p class="fb-section-heading fb-editable govuk-caption-l"
-         data-fb-content-type="element"
-         data-fb-content-id="page[section_heading]">
-        <%= @page.section_heading %>
-      </p>
-    <% end %>
+
+    <%= render partial: 'metadata_presenter/attribute/section_heading' %>
 
     <% if @page.heading.present? %>
       <h1 class="fb-editable govuk-heading-xl"
@@ -16,21 +11,9 @@
       </h1>
     <% end %>
 
-    <% if @page.lede.present? %>
-      <p class="fb-editable govuk-body-l"
-         data-fb-content-type="element"
-         data-fb-content-id="page[lede]">
-        <%= @page.lede %>
-      </p>
-    <% end %>
+    <%= render 'metadata_presenter/attribute/lede' %>
 
-    <% if @page.body.present? %>
-      <div class="fb-body fb-editable govuk-prose-scope"
-           data-fb-content-type="content"
-           data-fb-content-id="page[body]">
-        <%= @page.body %>
-      </div>
-    <% end %>
+    <%= render 'metadata_presenter/attribute/body' %>
 
     <%= form_for @page, url: reserved_submissions_path do |f| %>
       <div data-block-id="page.checkanswers.answers" data-block-type="answers">

data/app/views/metadata_presenter/page/confirmation.html.erb

@@ -5,23 +5,11 @@
     <%= @page.heading %>
   </h1>
 
-  <% if @page.lede %>
-    <p class="fb-editable govuk-panel__body"
-       data-fb-content-type="element"
-       data-fb-content-id="page[lede]">
-      <%= @page.lede %>
-    </p>
-  <% end %>
+  <%= render 'metadata_presenter/attribute/lede' %>
 </div>
 
-<% if @page.body %>
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-      <div class="fb-editable fb-body govuk-prose-scope"
-           data-fb-content-type="content"
-           data-fb-content-id="page[body]">
-        <%= @page.body %>
-      </div>
-    </div>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <%= render 'metadata_presenter/attribute/body' %>
   </div>
-<% end %>
+</div>

data/app/views/metadata_presenter/page/content.html.erb

@@ -1,13 +1,8 @@
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <% if @page.section_heading -%>
-        <p class="fb-editable govuk-caption-l fb-section_heading"
-           data-fb-content-type="element"
-           data-fb-content-id="page[section_heading]">
-          <%= @page.section_heading %>
-        </p>
-      <%- end %>
+
+      <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <% if @page.heading %>
         <h1 class="fb-editable govuk-heading-xl"
@@ -17,21 +12,9 @@
         </h1>
       <% end %>
 
-      <% if @page.lede %>
-        <div class="fb-editable govuk-body-l"
-             data-fb-content-id="page[lede]"
-             data-fb-content-type="element">
-          <%= @page.lede %>
-        </div>
-      <%- end %>
+      <%= render 'metadata_presenter/attribute/lede' %>
 
-      <% if @page.body %>
-        <div class="fb-editable"
-             data-fb-content-id="page[body]"
-             data-fb-content-type="content">
-          <%= to_markdown(@page.body) %>
-        </div>
-      <%- end %>
+      <%= render 'metadata_presenter/attribute/body' %>
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
         <%= f.govuk_error_summary %>

data/app/views/metadata_presenter/page/multiplequestions.html.erb

@@ -1,13 +1,8 @@
 <div class="fb-main-grid-wrapper" data-block-id="<%= @page.id %>" data-block-type="page" data-block-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <% if @page.section_heading %>
-        <p class="fb-editable govuk-caption-l fb-section_heading"
-           data-fb-content-type="element"
-           data-fb-content-id="page[section_heading]">
-          <%= @page.section_heading %>
-        </p>
-      <%- end %>
+
+      <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <h1 class="govuk-heading-xl"><%= @page.heading %></h1>
 

data/app/views/metadata_presenter/page/start.html.erb

@@ -1,13 +1,8 @@
 <div class="fb-main-grid-wrapper" data-fb-pagetype="<%= @page.type %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <% if @page.section_heading -%>
-        <p class="fb-editable govuk-caption-l fb-section_heading"
-           data-fb-content-type="element"
-           data-fb-content-id="page[section_heading]">
-          <%= @page.section_heading %>
-        </p>
-      <%- end %>
+
+    <%= render 'metadata_presenter/attribute/section_heading' %>
 
       <% if @page.heading %>
         <h1 class="fb-editable govuk-heading-xl"
@@ -17,21 +12,9 @@
         </h1>
       <% end %>
 
-      <% if @page.lede %>
-        <div class="fb-editable"
-             data-fb-content-id="page[lede]"
-             data-fb-content-type="element">
-          <%= @page.lede %>
-        </div>
-      <%- end %>
+      <%= render 'metadata_presenter/attribute/lede' %>
 
-      <% if @page.body %>
-        <div class="fb-editable"
-             data-fb-content-id="page[body]"
-             data-fb-content-type="content">
-          <%= to_markdown(@page.body) %>
-        </div>
-      <%- end %>
+      <%= render 'metadata_presenter/attribute/body' %>
 
       <%= form_tag(root_path, method: :post) do %>
         <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>

data/config/initializers/default_text.rb

@@ -0,0 +1,5 @@
+Rails.application.config.default_text = JSON.parse(
+  File.read(
+    MetadataPresenter::Engine.root.join('default_text', 'content.json')
+  )
+)

data/default_metadata/component/checkboxes.json

@@ -2,20 +2,20 @@
   "_id": "component.checkboxes",
   "_type": "checkboxes",
   "errors": {},
-  "hint": "[Optional hint text]",
+  "hint": "",
   "items": [
     {
       "_id": "component_checkbox_1",
       "_type": "checkbox",
       "label": "Option",
-      "hint": "[Optional hint text]",
+      "hint": "",
       "value": "value-1"
     },
     {
       "_id": "component_checkbox_2",
       "_type": "checkbox",
       "label": "Option",
-      "hint": "[Optional hint text]",
+      "hint": "",
       "value": "value-2"
     }
   ],

data/default_metadata/component/date.json

@@ -2,7 +2,7 @@
   "_id": "component.date",
   "_type": "date",
   "errors": {},
-  "hint": "[Optional hint text]",
+  "hint": "",
   "legend": "Question",
   "name": "component-name",
   "date_type": "day-month-year",

data/default_metadata/component/number.json

@@ -2,7 +2,7 @@
   "_id": "component.number",
   "_type": "number",
   "errors": {},
-  "hint": "[Optional hint text]",
+  "hint": "",
   "label": "Question",
   "name": "component-name",
   "width_class_input": "10",

data/default_metadata/component/radios.json

@@ -2,20 +2,20 @@
   "_id": "component.radios",
   "_type": "radios",
   "errors": {},
-  "hint": "[Optional hint text]",
+  "hint": "",
   "items": [
     {
       "_id": "component_radio_1",
       "_type": "radio",
       "label": "Option",
-      "hint": "[Optional hint text]",
+      "hint": "",
       "value": "value-1"
     },
     {
       "_id": "component_radio_2",
       "_type": "radio",
       "label": "Option",
-      "hint": "[Optional hint text]",
+      "hint": "",
       "value": "value-2"
     }
   ],

data/default_metadata/component/text.json

@@ -3,7 +3,7 @@
   "_type": "text",
   "errors": {},
   "label": "Question",
-  "hint": "[Optional hint text]",
+  "hint": "",
   "name": "component-name",
   "validation": {
     "required": true

data/default_metadata/component/textarea.json

@@ -2,7 +2,7 @@
   "_id": "component.textarea",
   "_type": "textarea",
   "errors": {},
-  "hint": "[Optional hint text]",
+  "hint": "",
   "label": "Question",
   "name": "component-name",
   "rows": 5,

data/default_metadata/page/content.json

@@ -1,9 +1,9 @@
 {
   "_id": "page.content",
   "_type": "page.content",
-  "section_heading": "[Optional section heading]",
+  "section_heading": "",
   "heading": "Title",
-  "lede": "[Optional lede paragraph]",
+  "lede": "",
   "body": "[Optional content]",
   "components": [],
   "url": ""

data/default_metadata/page/multiplequestions.json

@@ -1,7 +1,7 @@
 {
   "_id": "page.multiplequestions",
   "_type": "page.multiplequestions",
-  "section_heading": "[Optional section heading]",
+  "section_heading": "",
   "heading": "Title",
   "components": [],
   "url": ""

data/default_metadata/page/singlequestion.json

@@ -2,7 +2,7 @@
   "_id": "page.singlequestion",
   "_type": "page.singlequestion",
   "heading": "Question",
-  "lede": "This is the lede",
+  "lede": "",
   "body": "Body section",
   "components": [],
   "url": ""

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.18.4'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.19.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,9 +231,11 @@ files:
 - app/controllers/metadata_presenter/service_controller.rb
 - app/controllers/metadata_presenter/submissions_controller.rb
 - app/helpers/metadata_presenter/application_helper.rb
+- app/helpers/metadata_presenter/default_text.rb
 - app/jobs/metadata_presenter/application_job.rb
 - app/models/metadata_presenter/component.rb
 - app/models/metadata_presenter/date_field.rb
+- app/models/metadata_presenter/item.rb
 - app/models/metadata_presenter/metadata.rb
 - app/models/metadata_presenter/next_page.rb
 - app/models/metadata_presenter/page.rb
@@ -250,7 +252,11 @@ files:
 - app/validators/metadata_presenter/validate_schema.rb
 - app/views/errors/404.html
 - app/views/layouts/metadata_presenter/application.html.erb
+- app/views/metadata_presenter/attribute/_body.html.erb
+- app/views/metadata_presenter/attribute/_lede.html.erb
+- app/views/metadata_presenter/attribute/_section_heading.html.erb
 - app/views/metadata_presenter/component/_checkboxes.html.erb
+- app/views/metadata_presenter/component/_content.html.erb
 - app/views/metadata_presenter/component/_date.html.erb
 - app/views/metadata_presenter/component/_number.html.erb
 - app/views/metadata_presenter/component/_radios.html.erb
@@ -266,6 +272,7 @@ files:
 - app/views/metadata_presenter/page/singlequestion.html.erb
 - app/views/metadata_presenter/page/start.html.erb
 - config/initializers/default_metadata.rb
+- config/initializers/default_text.rb
 - config/initializers/schemas.rb
 - config/routes.rb
 - default_metadata/component/checkboxes.json