metadata_presenter 0.28.5 → 0.28.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a26379b45ed9982427ad0bc57cc742a632ad586731974f405aa8471c8d3f0cb
-  data.tar.gz: 244f8e39ec507882de9c31aae45ea607f9e4093b3fb8f4705683f1a04caa9901
+  metadata.gz: ab52764aea2d132a57111ec99a9d7523362e8163a4d78a6254667c47cbb35f2a
+  data.tar.gz: bc5f21431c95fbd7ca139adb76376879eb712b31b360694ed98cf3941dfcb318
 SHA512:
-  metadata.gz: 87dcb1e44ccbfa18cc3e1991a782c69dc58eb5e902ad9dbfd762a4f9a20654a8c8d80e6e108c22a413a7fbd4b6a4ff65bda0504e5a0ad02433f4f755d08b53d1
-  data.tar.gz: a0bcb5182fc957f5d32836cdc98d53667ceac478dd394ba1ca8fba9a9c839a04681f23d749b53fc9b69b7546ef0258866910ce6bedec739b993a3eae4a3bab9d
+  metadata.gz: ebd89e1970ddaad3e8062c9c5e5815ac3095c3a1b0897645bcb5c307f95dd3a38f39fcf37ee2c405a6e954f8383cc1b339c74af6926b7d47f38094aa153e88dd
+  data.tar.gz: aaf3a97b00bd56921805985eb06a6dbbc9109281d7d96e6e9a7ae1924c967edaed4d0b8f7a6118a2128189bc4ca3f52648df7b72c634d2462e5c967d262f8fa7

data/app/helpers/metadata_presenter/application_helper.rb

@@ -18,9 +18,5 @@ module MetadataPresenter
     def default_text(property)
       MetadataPresenter::DefaultText[property]
     end
-
-    def meta_items
-      service.meta.items
-    end
   end
 end

data/app/models/metadata_presenter/metadata.rb

@@ -13,6 +13,10 @@ class MetadataPresenter::Metadata
     to_h.to_json
   end
 
+  def uuid
+    metadata._uuid
+  end
+
   def id
     metadata._id
   end

data/app/models/metadata_presenter/page.rb

@@ -5,21 +5,40 @@ module MetadataPresenter
   class Page < MetadataPresenter::Metadata
     include ActiveModel::Validations
 
-    def uuid
+    NOT_EDITABLE = %i[
       _uuid
-    end
+      _id
+      _type
+      steps
+      add_component
+      add_extra_component
+    ].freeze
 
     def ==(other)
       id == other.id if other.respond_to? :id
     end
 
     def editable_attributes
-      to_h.reject { |k, _| k.in?(%i[_id _type steps]) }
+      to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
+    end
+
+    def all_components
+      [components, extra_components].flatten.compact
     end
 
     def components
-      metadata.components&.map do |component|
-        MetadataPresenter::Component.new(component, editor: editor?)
+      to_components(metadata.components, collection: :components)
+    end
+
+    def extra_components
+      to_components(metadata.extra_components, collection: :extra_components)
+    end
+
+    def components_by_type(type)
+      supported_components = page_components(raw_type)[type]
+
+      all_components.select do |component|
+        supported_components.include?(component.type)
       end
     end
 
@@ -32,15 +51,24 @@ module MetadataPresenter
     end
 
     def input_components
-      page_components(raw_type)[:input_components]
+      page_components(raw_type)[:input]
     end
 
     def content_components
-      page_components(raw_type)[:content_components]
+      page_components(raw_type)[:content]
     end
 
     private
 
+    def to_components(node_components, collection:)
+      node_components&.map do |component|
+        MetadataPresenter::Component.new(
+          component.merge(collection: collection),
+          editor: editor?
+        )
+      end
+    end
+
     def page_components(page_type)
       values = Rails.application.config.page_components[page_type]
       if values.blank?

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -1,11 +1,16 @@
 module MetadataPresenter
   class PageAnswersPresenter
     FIRST_ANSWER = 0
-    NO_USER_INPUT = %w[page.checkanswers page.confirmation page.content].freeze
+    NO_USER_INPUT = %w[
+      page.checkanswers
+      page.confirmation
+      page.content
+      page.start
+    ].freeze
 
     def self.map(view:, pages:, answers:)
       user_input_pages(pages).map { |page|
-        Array(page.components).map do |component|
+        Array(page.components_by_type(:input)).map do |component|
           new(
             view: view,
             component: component,
@@ -47,11 +52,19 @@ module MetadataPresenter
     end
 
     def display_heading?(index)
-      page.type == 'page.multiplequestions' && index == FIRST_ANSWER
+      multiplequestions_page? && index == FIRST_ANSWER
+    end
+
+    def last_multiple_question?(index, presenters_count_for_page)
+      multiplequestions_page? && index == presenters_count_for_page - 1
     end
 
     private
 
+    def multiplequestions_page?
+      page.type == 'page.multiplequestions'
+    end
+
     def date(value)
       I18n.l(
         Date.civil(value.year.to_i, value.month.to_i, value.day.to_i),

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

@@ -1,14 +1,14 @@
-<% @page.components.each_with_index do |component, index| %>
+<% 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-id="<%= "page[#{component.collection}[#{index}]]" %>"
         data-fb-content-data="<%= component.to_json %>">
 
     <%= render partial: component, locals: {
         f: f,
         component: component,
-        component_id: "page[components[#{index}]]",
+        component_id: "page[#{component.collection}[#{index}]]",
         input_title: main_title(
           component: component,
           tag: :h2,

data/app/views/metadata_presenter/footer/_meta.html.erb

@@ -1,6 +1,6 @@
 <h2 class="govuk-visually-hidden">Support links</h2>
 <ul class="govuk-footer__inline-list">
-<% meta_items.each do |item| %>
+<% service.meta.items.each do |item| %>
   <li class="govuk-footer__inline-list-item">
     <a class="govuk-footer__link" href=<%= File.join(request.script_name, item.href) %>><%= item.text %></a>
   </li>

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

@@ -2,8 +2,6 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
 
-      <%= render partial: 'metadata_presenter/attribute/section_heading' %>
-
       <h1 class="fb-editable govuk-heading-xl"
           data-fb-content-type="element"
           data-fb-content-id="page[heading]">
@@ -44,13 +42,18 @@
                 </dd>
                 <dd class="govuk-summary-list__actions">
                   <%= link_to(
-                    change_answer_path(url: page_answers_presenter.url),
+                    editable? ? '#' : change_answer_path(url: page_answers_presenter.url),
                     class: 'govuk-link'
                   ) do %>
                     Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
                   <% end %>
                 </dd>
               </div>
+
+              <% if page_answers_presenter.last_multiple_question?(index, page_answers_presenters.size) %>
+        </dl>
+        <dl class="fb-block fb-block-answers govuk-summary-list">
+              <% end %>
             <% end %>
           <% end %>
         </dl>

data/config/initializers/page_components.rb

@@ -1,19 +1,23 @@
 Rails.application.config.page_components =
   ActiveSupport::HashWithIndifferentAccess.new({
     checkanswers: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     confirmation: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     content: {
-      input_components: %w(),
-      content_components: %w(content)
+      input: %w(),
+      content: %w(content)
     },
     multiplequestions: {
-      input_components: %w(text textarea number date radios checkboxes),
-      content_components: %w(content)
-    }
+      input: %w(text textarea number date radios checkboxes),
+      content: %w(content)
+    },
+    singlequestion: {
+      input: %w(text textarea number date radios checkboxes),
+      content: %w()
+     }
   })

data/default_metadata/page/start.json

@@ -2,7 +2,7 @@
   "_id": "page.start",
   "_type": "page.start",
   "heading": "Service name goes here",
-  "lede": "This is your start page first paragraph. You can only have one paragraph here.",
+  "lede": "",
   "body": "Use this service to:\r\n\r\n* do something\r\n* update your name, address or other details\r\n* do something else\r\n\r\nRegistering takes around 5 minutes.",
   "before_you_start": "###Before you start\r\nYou can also register by post.\r\n\r\nThe online service is also available in Welsh (Cymraeg).\r\n\r\nYou cannot register for this service if you’re in the UK illegally.",
   "steps": [],

data/fixtures/version.json

@@ -340,18 +340,25 @@
       "_id": "page._check-answers",
       "_type": "page.checkanswers",
       "heading": "Review your answer",
-      "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",
       "components": [
         {
+          "_uuid": "256291c2-8ffa-4bda-8282-88e0724ccd10",
           "_id": "check-answers_content_1",
           "_type": "content",
           "content": "Check yourself before you wreck yourself."
         }
       ],
-      "extra_components": []
+      "extra_components": [
+        {
+          "_uuid": "09961c6a-29f8-4d4f-a6d2-af00cff15536",
+          "_id": "check-answers_content_1",
+          "_type": "content",
+          "content": "Take the cannoli."
+        }
+      ]
     },
     {
       "_uuid": "b238a22f-c180-48d0-a7d9-8aad2036f1f2",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.28.5'.freeze
+  VERSION = '0.28.10'.freeze
 end

data/schemas/page/checkanswers.json

@@ -8,11 +8,6 @@
     "_type": {
       "const": "page.checkanswers"
     },
-    "section_heading": {
-      "title": "Section heading",
-      "type": "string",
-      "description": "Section to display before the heading"
-    },
     "heading": {
       "type": "string",
       "default": "Check your answers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.28.5
+  version: 0.28.10
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder