metadata_presenter 0.28.6 → 0.28.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea3e46c638a7106dfc7686c3b5116e9c53d18a2d3bcf3654a3bfb8b36875094
-  data.tar.gz: ea7e5ffdf31633d8fd72b0bdca31c24161f9e1b6c6227502428952dbad00d08c
+  metadata.gz: f78817e09df43b22a08bde0ef895aab1dad0b5df6c832a4863d3acd65226edc1
+  data.tar.gz: 7abf811d72763e4c898a6f99b39cd0626b2cec3f1669f95c93a76a44cf7366c5
 SHA512:
-  metadata.gz: 64d8e27ec3ab680aeaa2c7e92685ef0388282a62b010b79c100d5e5bc352a9f530dfe74c03cf1eda7a6ff723d09abe7a1f8d980a0dd59f08264667f0e6dd3822
-  data.tar.gz: 53f666eaff835a7fe1668809917021037f986e516180ba6433e75df9a5bcd9b9d6bfd1b0b1787362f43cb9ba708a6541b3c86ff7e57fd418458fa75c3c9d52a1
+  metadata.gz: 1b97ab2f1943cd6606c46e1060bade9369c5153dbad518f7703ab9f2031b9c087b7c5c1c00b9e9c04d09ca56caf0249ebf8811ebdc5c3eafb87b1210dc743552
+  data.tar.gz: 8b5332c2a57fdc8c3008b1dba0017a0d858330d81b92ec8560dbee1f1a6f40bebf52965ee109bb8c2bff1019bef7855e3417539736765a226ee7936cc34f61e6

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,16 +5,25 @@ 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
@@ -25,6 +34,14 @@ module MetadataPresenter
       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
+
     def to_partial_path
       type.gsub('.', '/')
     end
@@ -34,11 +51,11 @@ 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

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/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]">
@@ -51,6 +49,11 @@
                   <% 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

@@ -280,6 +280,11 @@
             "required": true
           }
         },
+        {
+          "_id": "star-wars-knowledge_content_1",
+          "_type": "content",
+          "content": "Stay on target"
+        },
         {
           "_id": "star-wars-knowledge_radios_1",
           "_type": "radios",
@@ -340,12 +345,12 @@
       "_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."
@@ -353,6 +358,7 @@
       ],
       "extra_components": [
         {
+          "_uuid": "09961c6a-29f8-4d4f-a6d2-af00cff15536",
           "_id": "check-answers_content_1",
           "_type": "content",
           "content": "Take the cannoli."

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.28.6'.freeze
+  VERSION = '0.28.11'.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.6
+  version: 0.28.11
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder