metadata_presenter 0.28.9 → 0.28.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d5dbea9a24b8fae69170d03e8ff69dafd77a0b858013baee1c8c1434fdcca1
-  data.tar.gz: 415da25856e17541de78ece98f8539471e33ae8417285630ef00a55152982999
+  metadata.gz: ab52764aea2d132a57111ec99a9d7523362e8163a4d78a6254667c47cbb35f2a
+  data.tar.gz: bc5f21431c95fbd7ca139adb76376879eb712b31b360694ed98cf3941dfcb318
 SHA512:
-  metadata.gz: 770aed14f9470f3d1f0af53e0411e3f190aa92268a031eb0cfd8af5aea8822e1b9aed8544db21d494cd897ac48f43676ae35a1ac7ce6fefd2a7fc96be59151d7
-  data.tar.gz: c64ee626011dd6027f48c6a98e86309efc8b8671d1f52cb7ead124650a7cb23d1d3c9850a49f6e3dace01297f7a94b5ee8111e8bd98b931cd8f7933f8885183a
+  metadata.gz: ebd89e1970ddaad3e8062c9c5e5815ac3095c3a1b0897645bcb5c307f95dd3a38f39fcf37ee2c405a6e954f8383cc1b339c74af6926b7d47f38094aa153e88dd
+  data.tar.gz: aaf3a97b00bd56921805985eb06a6dbbc9109281d7d96e6e9a7ae1924c967edaed4d0b8f7a6118a2128189bc4ca3f52648df7b72c634d2462e5c967d262f8fa7

data/app/models/metadata_presenter/page.rb

@@ -22,6 +22,10 @@ module MetadataPresenter
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
     end
 
+    def all_components
+      [components, extra_components].flatten.compact
+    end
+
     def components
       to_components(metadata.components, collection: :components)
     end
@@ -30,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
@@ -39,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/page/checkanswers.html.erb

@@ -49,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/lib/metadata_presenter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.28.9
+  version: 0.28.10
 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