metadata_presenter 2.0.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e13fd4a4a17bf97e91a2e69b59a5c12c3743e0cf38ce40a1c06b9b4b9915898
-  data.tar.gz: c35ff1dc9a73b802e01f4995a4224ac73077f1a2e00676e67e7a49095d29c6fb
+  metadata.gz: 0b021784e55967939a9588d2e9503b1b572668a6015c4fc5021c1b44b85d99b5
+  data.tar.gz: 9c6784cab9f797a215100a0c1eeb53586a5fe4c9b7ac2afe0ee0b2fa3a7b252f
 SHA512:
-  metadata.gz: 9d456b26ddc24e8e39e586eec91f7bc4acfd2c67506bc59d70fc1fdda8e8e0846dfc27fb965b9cd67653d6cca60ef7262a691cc4e8399486db0626b157f9b789
-  data.tar.gz: 073523ef858cf90830133c5c8f2cdc3a230b6d79c8b9794c2d156892cfbfbc8a8208f744937aa63f55cefa70d5846a533f4fa492dfbee35b8f2fa06122adbf46
+  metadata.gz: 94aeac55e2766b36fece298133e5a4ed8506f849f9b99c3851e3d5733800469c9512717ed666b4573a17a74f60f11a46750512e23af9ef41f2e06a974bba2549
+  data.tar.gz: be13444b27be0604b4bb7875dffeafb4b014c20affee27438983197eb2f40a3b5d1ca1ab72695def1e810b86d8dda84397818176ce3b53dd70c3785e0c051bc8

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/models/metadata_presenter/previous_page.rb

@@ -6,24 +6,11 @@ module MetadataPresenter
     def page
       return if no_current_or_referrer_pages? || service.no_back_link?(current_page)
 
-      return referrer_page if return_to_referrer?
-
       TraversedPages.new(service, user_data, current_page).last
     end
 
     private
 
-    def referrer_page
-      @referrer_page ||= service.find_page_by_url(URI(referrer).path)
-    end
-
-    def return_to_referrer?
-      return false unless current_page.standalone?
-
-      current_page.standalone? ||
-        (referrer_page && referrer_page.standalone?)
-    end
-
     def no_current_or_referrer_pages?
       current_page.blank? || referrer.nil?
     end

data/app/models/metadata_presenter/service.rb

@@ -5,6 +5,13 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def branches
+    collection = flow.map do |_, flow|
+      MetadataPresenter::Flow.new(flow)
+    end
+    collection.select { |flow| flow.type == 'flow.branch' }
+  end
+
   def flow_object(uuid)
     MetadataPresenter::Flow.new(metadata.flow[uuid])
   rescue StandardError
@@ -38,14 +45,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     pages[pages.index(current_page) + 1] if current_page.present?
   end
 
-  def previous_page(current_page:, referrer:)
-    return if current_page.nil? || referrer.nil?
-
-    unless no_back_link?(current_page)
-      flow_page(current_page) || referrer_page(referrer)
-    end
-  end
-
   def confirmation_page
     @confirmation_page ||= pages.find do |page|
       page.type == 'page.confirmation'
@@ -57,7 +56,15 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def no_back_link?(current_page)
-    current_page == start_page || current_page == confirmation_page
+    current_page == start_page ||
+      current_page == confirmation_page ||
+      current_page.standalone?
+  end
+
+  def page_with_component(uuid)
+    pages.find do |page|
+      Array(page.components).any? { |component| component.uuid == uuid }
+    end
   end
 
   private

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/default_metadata/flow/branch.json

@@ -1,5 +1,6 @@
 {
   "_type": "flow.branch",
+  "title": "",
   "next": {
     "default": "",
     "conditionals": []

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/schemas/flow/branch.json

@@ -9,6 +9,9 @@
       "type": "string",
       "const": "flow.branch"
     },
+    "title": {
+      "type": "string"
+    },
     "next": {
       "type": "object",
       "properties": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.3.0
 platform: ruby
 authors:
-- MoJ Online
+- MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -254,9 +254,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Service Metadata Presenter for the Form Builder product
+description: Service Metadata Presenter for the MoJ Forms product
 email:
-- moj-online@digital.justice.gov.uk
+- moj-forms@digital.justice.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -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
@@ -453,7 +453,7 @@ files:
 - schemas/service/configuration.json
 - schemas/service/locale.json
 - schemas/validations/validations.json
-homepage: https://moj-online.service.justice.gov.uk
+homepage: https://moj-forms.service.justice.gov.uk/
 licenses:
 - MIT
 metadata: {}