metadata_presenter 2.1.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 406a99897f2deb6565befd01bdc1fd12f67b3bf9cb71e77fc36b8ab3550c3e31
-  data.tar.gz: c2b1e8bdbc48df0357c1f0107f4a619e96bedf17dd110322f43b38e93239685a
+  metadata.gz: a37e17a557bd814c79d294f394f8d2d7a4013b12bbd113f7c3f050c4854bb8b1
+  data.tar.gz: eed17391e7ffbcd4a42bc5763cf32f34946f592a2d907fb8356e6f52fd832267
 SHA512:
-  metadata.gz: 7b80e8327eac16728d8c918f5f32d87a56e4cb506ccd043cfa13e48819ded49da44ec6782e9460872239e7bb7443975dc5a7f1aa36a9d34100a71fa08b3b1d03
-  data.tar.gz: dfaf82d1c09c14edaf1e11b382401ef9394fc35686b9e53875263a43516ad6b1735e30d3dcd9201c18e189956898da4b3c1286ccb170369a1db3b7c43609a7cf
+  metadata.gz: 6f35bbefeff65553c2d32efa3ec0f831765e0776291246d6c2208de59e35886973a2db126ff059e5c4862d5ec50fb19807e4e0e6ba5d725f64996b0cbccd9367
+  data.tar.gz: 78985c06bdc8d187c25cdc459f0db742e80bb236520b326579224b8f31a6be474b3d2b3125e0a0fb391bdec4f3d40f19206e4b1b4dfc00368d7348dd6b988a02

data/app/models/metadata_presenter/flow.rb

@@ -1,5 +1,13 @@
 module MetadataPresenter
   class Flow < MetadataPresenter::Metadata
+    attr_reader :uuid
+
+    def initialize(uuid, flow)
+      @uuid = uuid
+
+      super(flow)
+    end
+
     def branch?
       type == 'flow.branch'
     end

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/service.rb

@@ -5,8 +5,16 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     end
   end
 
+  def flow_objects
+    flow.map { |uuid, flow| MetadataPresenter::Flow.new(uuid, flow) }
+  end
+
+  def branches
+    flow_objects.select { |flow| flow.type == 'flow.branch' }
+  end
+
   def flow_object(uuid)
-    MetadataPresenter::Flow.new(metadata.flow[uuid])
+    MetadataPresenter::Flow.new(uuid, metadata.flow[uuid])
   rescue StandardError
     nil
   end

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/app/views/metadata_presenter/page/start.html.erb

@@ -3,7 +3,6 @@
     <div class="govuk-grid-column-two-thirds">
 
       <%= render 'metadata_presenter/attribute/heading' %>
-      <%= render 'metadata_presenter/attribute/lede' %>
       <%= render 'metadata_presenter/attribute/body' %>
 
       <%= form_tag(root_path, method: :post) do %>

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/default_metadata/page/start.json

@@ -2,7 +2,6 @@
   "_id": "page.start",
   "_type": "page.start",
   "heading": "Service name goes 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.",
   "url": "/"

data/fixtures/branching.json

@@ -364,7 +364,6 @@
       "_id": "page.start",
       "url": "/",
       "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.",
-      "lede": "",
       "_type": "page.start",
       "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
       "heading": "Service name goes here",

data/fixtures/version.json

@@ -92,7 +92,6 @@
       "_id": "page.start",
       "url": "/",
       "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.",
-      "lede": "",
       "_type": "page.start",
       "_uuid": "cf6dc32f-502c-4215-8c27-1151a45735bb",
       "heading": "Service name goes here",

data/lib/metadata_presenter/version.rb

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

data/schemas/flow/branch.json

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

data/schemas/page/start.json

@@ -28,7 +28,6 @@
   ],
   "ui_category": {
     "main": [
-      "lede",
       "body",
       "before_you_start"
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.2
 platform: ruby
 authors:
-- MoJ Online
+- MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-19 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: {}