metadata_presenter 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9104ffa15172aa0c05b93c6fcbcbed224882e509009f55c821e295d363744352
-  data.tar.gz: 8b2aafe365433397daf8d8c36a3b720326ec4fb2e88d1b371cd61bf2df2678e8
+  metadata.gz: ca4bd2a3c36d8d5c7c21cf4105aacb4b5cdd5e347a976c7a83d21dc473b35a86
+  data.tar.gz: eb4131ac71104e5c62772cf0a93176156eb946d7d968c1c1e36a92e9e2a5ad36
 SHA512:
-  metadata.gz: 84da29c93270a93857ac9c3e5c882ff64af15d5f5f58bfb75e770352e2cff2743a6d2818bbe9fb267ed470ea317bcb1c6ac828c9fc399f89c3e20f51394ab7d5
-  data.tar.gz: 230815be659879b0da6035edd3b5161f2cef2ba72bce958f4bfa0e83bf6888ec801a365fc5dee308f76d8e5c7c7e6b66029f4bb44a03881fe1ae58e8ae8554d0
+  metadata.gz: '068e67ec41b9add6e7d9629656dc0a3d39ed32ec0b374ba01599a0b29ec275db7296ebfd120eecd428d13c403cf4edb25a7843f3beba362004e723c74f75dd79'
+  data.tar.gz: 85c7e4caf55464ec1f95f85519f90aabd16c9324889daed683617736a5f54034645dc302248690ccdcd21ba908f4f930d06d421e70a1594e2fe48bb43658b68b

data/app/helpers/metadata_presenter/application_helper.rb

@@ -1,14 +1,8 @@
 module MetadataPresenter
   module ApplicationHelper
     def main_title(component:, tag: :h1, classes: 'govuk-heading-xl')
-      if component.legend.present?
-        content_tag(:h1, class: 'govuk-heading-xl') do
-          component.legend
-        end
-      else
-        content_tag(tag, class: classes) do
-          component.label
-        end
+      content_tag(tag, class: classes) do
+        component.humanised_title
       end
     end
 

data/app/models/metadata_presenter/component.rb

@@ -12,4 +12,8 @@ class MetadataPresenter::Component < MetadataPresenter::Metadata
       MetadataPresenter::Item.new(item, editor: editor?)
     end
   end
+
+  def content?
+    type == 'content'
+  end
 end

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -1,9 +1,10 @@
 module MetadataPresenter
   class PageAnswersPresenter
     FIRST_ANSWER = 0.freeze
+    NO_USER_INPUT = %w(page.checkanswers page.confirmation page.content).freeze
 
     def self.map(view:, pages:, answers:)
-      pages.map do |page|
+      user_input_pages(pages).map do |page|
         Array(page.components).map do |component|
           new(
             view: view,
@@ -15,6 +16,10 @@ module MetadataPresenter
       end.reject { |page| page.empty? }
     end
 
+    def self.user_input_pages(pages)
+      pages.reject { |page| page.type.in?(NO_USER_INPUT) }
+    end
+
     attr_reader :view, :component, :page, :answers
     delegate :url, to: :page
     delegate :humanised_title, to: :component

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

@@ -0,0 +1,20 @@
+<% @page.components.each_with_index do |component, index| %>
+  <div class="fb-editable"
+        id="<%= component.id %>"
+        data-fb-content-type="<%= component.type %>"
+        data-fb-content-id="<%= "page[components[#{index}]]" %>"
+        data-fb-content-data="<%= component.to_json %>">
+
+    <%= render partial: component, locals: {
+        f: f,
+        component: component,
+        component_id: "page[components[#{index}]]",
+        input_title: main_title(
+          component: component,
+          tag: :h2,
+          classes: classes
+        )
+      }
+    %>
+  </div>
+<% end %>

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

@@ -11,10 +11,6 @@
       </h1>
     <% end %>
 
-    <%= render 'metadata_presenter/attribute/lede' %>
-
-    <%= 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">
         <dl class="fb-block fb-block-answers govuk-summary-list">
@@ -68,6 +64,14 @@
         </div>
       <% end %>
 
+      <%= render partial: 'metadata_presenter/component/components',
+                 locals: {
+                   f: f,
+                   components: @page.components,
+                   tag: nil,
+                   classes: nil
+                 } %>
+
       <button <%= 'disabled' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">
         Accept and send application
       </button>

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

@@ -13,3 +13,11 @@
     <%= render 'metadata_presenter/attribute/body' %>
   </div>
 </div>
+
+<%= render partial: 'metadata_presenter/component/components',
+           locals: {
+             f: nil,
+             components: @page.components,
+             tag: nil,
+             classes: nil
+           } %>

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

@@ -17,20 +17,14 @@
       <%= render 'metadata_presenter/attribute/body' %>
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
-        <%= f.govuk_error_summary %>
 
-        <% @page.components.each_with_index do |component, index| %>
-          <div class="fb-editable"
-               data-fb-content-type="<%= component._type %>"
-               data-fb-content-id="<%= "page[components[#{index}]]" %>"
-               data-fb-content-data="<%= component.to_json %>">
-            <%= render partial: component, locals: {
-              component: component,
-              f: f,
-              input_title: main_title(component: component) }
-            %>
-          </div>
-        <% end %>
+        <%= render partial: 'metadata_presenter/component/components',
+                   locals: {
+                     f: f,
+                     components: @page.components,
+                     tag: nil,
+                     classes: nil
+                   } %>
 
         <%= f.govuk_submit(disabled: editable?) %>
       <% end %>

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

@@ -8,18 +8,14 @@
 
       <%= form_for @page_answers, as: :answers, url: @page.url, method: :post do |f| %>
         <%= f.govuk_error_summary %>
-        <% @page.components.each_with_index do |component, index| %>
-          <%= render partial: component, locals: {
-            component: component,
-            component_id: "page[components[#{index}]]",
+
+        <%= render partial: 'metadata_presenter/component/components', locals: {
             f: f,
-            input_title: main_title(
-              component: component,
-              tag: :h2,
-              classes: 'govuk-heading-m govuk-!-margin-top-8'
-            ) }
-          %>
-        <% end %>
+            components: @page.components,
+            tag: :h2,
+            classes: 'govuk-heading-m govuk-!-margin-top-8'
+          }
+        %>
 
         <%= f.govuk_submit(disabled: editable?) %>
       <% end %>

data/default_metadata/page/confirmation.json

@@ -1,5 +1,6 @@
 {
   "_id": "page.confirmation",
   "_type": "page.confirmation",
-  "heading": "Application complete"
+  "heading": "Application complete",
+  "components": []
 }

data/fixtures/version.json

@@ -326,20 +326,31 @@
       "section_heading": "Chain of Command",
       "heading": "Tell me how many lights you see",
       "body": "There are four lights!",
-      "components": [],
+      "components": [
+        {
+          "_id": "how-many-lights_content_1",
+          "_type": "content",
+          "html": "What lights?"
+        }
+      ],
       "url": "how-many-lights"
     },
     {
       "_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
       "_id": "page._check-answers",
       "_type": "page.checkanswers",
-      "body": "Optional content",
       "heading": "Review your answer",
-      "lede": "First paragraph",
       "section_heading": "This section is optional",
       "send_body": "By submitting this answer you confirm all your answers",
       "send_heading": "Send your answer",
-      "url": "/check-answers"
+      "url": "/check-answers",
+      "components": [
+        {
+          "_id": "check-answers_content_1",
+          "_type": "content",
+          "html": "Check yourself before you wreck yourself."
+        }
+      ]
     },
     {
       "_uuid": "b238a22f-c180-48d0-a7d9-8aad2036f1f2",
@@ -348,7 +359,14 @@
       "body": "You'll receive a confirmation email",
       "heading": "Complaint sent",
       "lede": "Optional lede",
-      "url": "/confirmation"
+      "url": "/confirmation",
+      "components": [
+        {
+          "_id": "confirmation_content_1",
+          "_type": "content",
+          "html": "Some day I will be the most powerful Jedi ever!"
+        }
+      ]
     }
   ],
   "locale": "en"

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/schemas/page/checkanswers.json

@@ -17,16 +17,6 @@
       "type": "string",
       "default": "Check your answers"
     },
-    "lede": {
-      "title": "Lede",
-      "type": "string",
-      "description": "Content before the body"
-    },
-    "body": {
-      "title": "Body",
-      "type": "string",
-      "description": "Optional content before showing the summary"
-    },
     "summary_of": {
       "title": "Summary of",
       "description": "Page/section that summary summarises"
@@ -45,6 +35,14 @@
       "content": true,
       "multiline": true,
       "default": "By submitting this application you confirm that, to the best of your knowledge, the details you are providing are correct."
+    },
+    "components": {
+      "title": "Components",
+      "description": "The form or content elements used on the page",
+      "type": "array",
+      "items": {
+        "$ref": "component.content"
+      }
     }
   },
   "required": [

data/schemas/page/confirmation.json

@@ -19,6 +19,14 @@
     },
     "lede": {
       "multiline": true
+    },
+    "components": {
+      "title": "Components",
+      "description": "The form or content elements used on the page",
+      "type": "array",
+      "items": {
+        "$ref": "component.content"
+      }
     }
   },
   "required": [

data/schemas/page/content.json

@@ -7,6 +7,14 @@
   "properties": {
     "_type": {
       "const": "page.content"
+    },
+    "components": {
+      "title": "Components",
+      "description": "The form or content elements used on the page",
+      "type": "array",
+      "items": {
+        "$ref": "component.content"
+      }
     }
   },
   "allOf": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -256,6 +256,7 @@ files:
 - 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/_components.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