metadata_presenter 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 406a99897f2deb6565befd01bdc1fd12f67b3bf9cb71e77fc36b8ab3550c3e31
-  data.tar.gz: c2b1e8bdbc48df0357c1f0107f4a619e96bedf17dd110322f43b38e93239685a
+  metadata.gz: ec8517c93b646b82f9084516869dd500189ee28718b67cbf15f681e71b3ae83f
+  data.tar.gz: 31476c840217b5fa8bceb6ccd1e3e008e33784a3fb5506018192e54901e0330a
 SHA512:
-  metadata.gz: 7b80e8327eac16728d8c918f5f32d87a56e4cb506ccd043cfa13e48819ded49da44ec6782e9460872239e7bb7443975dc5a7f1aa36a9d34100a71fa08b3b1d03
-  data.tar.gz: dfaf82d1c09c14edaf1e11b382401ef9394fc35686b9e53875263a43516ad6b1735e30d3dcd9201c18e189956898da4b3c1286ccb170369a1db3b7c43609a7cf
+  metadata.gz: 4bace053abc5af0fc2ba23a7d64348a2bc23aefed4df1e834138988138d6c24fb04ffd552a594537794e76b35308d98e5bf75efed844d99266fc88f0d3b0a861
+  data.tar.gz: aa40d60598b4217c2a0296e61ec5500d1b6df03037783c63de58415d18c1a1819866978e275518fb4e794676f643f1a7b9525c6f3c5e9319a37a66cfc70cfc15

data/app/models/metadata_presenter/page.rb

@@ -12,6 +12,7 @@ module MetadataPresenter
       add_component
       add_extra_component
     ].freeze
+    QUESTION_PAGES = %w[page.singlequestion page.multiplequestions].freeze
 
     def editable_attributes
       to_h.reject { |k, _| k.in?(NOT_EDITABLE) }
@@ -33,11 +34,19 @@ module MetadataPresenter
       to_components(metadata.extra_components, collection: :extra_components)
     end
 
-    def components_by_type(type)
-      supported_components = page_components(raw_type)[type]
+    def input_components
+      all_components.reject(&:content?)
+    end
+
+    def content_components
+      all_components.select(&:content?)
+    end
+
+    def supported_components_by_type(type)
+      supported = supported_components(raw_type)[type]
 
       all_components.select do |component|
-        supported_components.include?(component.type)
+        supported.include?(component.type)
       end
     end
 
@@ -49,12 +58,12 @@ module MetadataPresenter
       "metadata_presenter/#{type.gsub('.', '/')}"
     end
 
-    def input_components
-      page_components(raw_type)[:input]
+    def supported_input_components
+      supported_components(raw_type)[:input]
     end
 
-    def content_components
-      page_components(raw_type)[:content]
+    def supported_content_components
+      supported_components(raw_type)[:content]
     end
 
     def upload_components
@@ -65,6 +74,10 @@ module MetadataPresenter
       type == 'page.standalone'
     end
 
+    def question_page?
+      type.in?(QUESTION_PAGES)
+    end
+
     def title
       return heading if heading?
 
@@ -87,10 +100,10 @@ module MetadataPresenter
       end
     end
 
-    def page_components(page_type)
-      values = Rails.application.config.page_components[page_type]
+    def supported_components(page_type)
+      values = Rails.application.config.supported_components[page_type]
       if values.blank?
-        raise PageComponentsNotDefinedError, "No page components defined for #{page_type} in config initialiser"
+        raise PageComponentsNotDefinedError, "No supported components defined for #{page_type} in config initialiser"
       end
 
       values

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -10,7 +10,7 @@ module MetadataPresenter
 
     def self.map(view:, pages:, answers:)
       user_input_pages(pages).map { |page|
-        Array(page.components_by_type(:input)).map do |component|
+        Array(page.supported_components_by_type(:input)).map do |component|
           new(
             view: view,
             component: component,

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

@@ -16,8 +16,8 @@
                    components: @page.extra_components,
                    tag: nil,
                    classes: nil,
-                   input_components: @page.input_components,
-                   content_components: @page.content_components
+                   input_components: @page.supported_input_components,
+                   content_components: @page.supported_content_components
                  } %>
 
         <dl class="fb-block fb-block-answers govuk-summary-list">
@@ -80,8 +80,8 @@
                    components: @page.components,
                    tag: nil,
                    classes: nil,
-                   input_components: @page.input_components,
-                   content_components: @page.content_components
+                   input_components: @page.supported_input_components,
+                   content_components: @page.supported_content_components
                  } %>
 
         <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">

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

@@ -29,7 +29,7 @@
              components: @page.components,
              tag: nil,
              classes: nil,
-             input_components: @page.input_components,
-             content_components: @page.content_components
+             input_components: @page.supported_input_components,
+             content_components: @page.supported_content_components
            } %>
 </div>

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

@@ -21,8 +21,8 @@
                      components: @page.components,
                      tag: nil,
                      classes: nil,
-                     input_components: @page.input_components,
-                     content_components: @page.content_components
+                     input_components: @page.supported_input_components,
+                     content_components: @page.supported_content_components
                    } %>
 
         <%= f.govuk_submit(disabled: editable?) %>

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

@@ -13,8 +13,8 @@
             components: @page.components,
             tag: :h2,
             classes: 'govuk-heading-m govuk-!-margin-top-8',
-            input_components: @page.input_components,
-            content_components: @page.content_components
+            input_components: @page.supported_input_components,
+            content_components: @page.supported_content_components
           }
         %>
 

data/config/initializers/{page_components.rb → supported_components.rb}

@@ -1,4 +1,4 @@
-Rails.application.config.page_components =
+Rails.application.config.supported_components =
   ActiveSupport::HashWithIndifferentAccess.new({
     checkanswers: {
       input: %w(),

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -343,8 +343,8 @@ files:
 - config/initializers/default_metadata.rb
 - config/initializers/default_text.rb
 - config/initializers/inflections.rb
-- config/initializers/page_components.rb
 - config/initializers/schemas.rb
+- config/initializers/supported_components.rb
 - config/routes.rb
 - default_metadata/component/checkboxes.json
 - default_metadata/component/content.json