metadata_presenter 0.23.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b2ff20300f6b643a7c83f8885c640b375babed55cd30798ca079bbd67b0506
-  data.tar.gz: ba841ff80433e9ff917a2d006eca7a53f618193640815e7594415a8945003c57
+  metadata.gz: 4048587e07e7a5b2b4919a71d0183200b3f88068377b284a307ad917d1a30add
+  data.tar.gz: 4fb293d2eb67132d9f68b8da4f142847864d748a8a3e4dd1bb93151b327aab0a
 SHA512:
-  metadata.gz: 1298d445703206b693fb9153255362433a4476bca5e982aac89a847c8a902013d066e729bdf645ba48fd0b5f4a780b972a94a14740b3db8ba55879439e6fd33f
-  data.tar.gz: 12439df97cda7c675df1f53ebb4151ebdfc64509c64ce08b466c9f16ed67b2f02fb06e9777458c5da37bfc27c54ad5f4368372f07c56292a624d2d36f24196ef
+  metadata.gz: 4110ca082033d1bbdbe271b70942c37b6bb0424d4202874e3016ab96c85d226bb8da432bdc63079918cd544ada93d869add4b45e2d961bf9c0272fc5ba4969ff
+  data.tar.gz: 146b09fa25fc4305b3193b0a932bff1b6846b4d8cf8bf55246b0fc5c01df55b7de41cb701d12f74aab38e365045edb0fd489a78175f7728ef967c363f81084df

data/app/helpers/metadata_presenter/application_helper.rb

@@ -6,15 +6,14 @@ module MetadataPresenter
       end
     end
 
-    # Renders markdown given a text.
+    # Renders html given markdown.
     #
     # @example
-    #   <%=m '# Some markdown' %>
+    #   <%=to_html '# Some markdown' %>
     #
-    def m(text)
+    def to_html(text)
       Kramdown::Document.new(text).to_html.html_safe
     end
-    alias_method :to_markdown, :m
 
     def default_text(property)
       MetadataPresenter::DefaultText[property]

data/app/models/metadata_presenter/page.rb

@@ -1,4 +1,7 @@
 module MetadataPresenter
+  class PageComponentsNotDefinedError < StandardError
+  end
+
   class Page < MetadataPresenter::Metadata
     include ActiveModel::Validations
 
@@ -27,5 +30,28 @@ module MetadataPresenter
     def template
       "metadata_presenter/#{type.gsub('.', '/')}"
     end
+
+    def input_components
+      page_components(raw_type)[:input_components]
+    end
+
+    def content_components
+      page_components(raw_type)[:content_components]
+    end
+
+    private
+
+    def page_components(page_type)
+      values = Rails.application.config.page_components[page_type]
+      if values.blank?
+        raise PageComponentsNotDefinedError, "No page components defined for #{page_type} in config initialiser"
+      end
+
+      values
+    end
+
+    def raw_type
+      type.gsub('page.', '')
+    end
   end
 end

data/app/views/metadata_presenter/attribute/_body.html.erb

@@ -3,6 +3,6 @@
         data-fb-content-id="page[body]"
         data-fb-content-type="content"
         data-fb-default-text="<%= default_text('body') %>">
-    <%= to_markdown(@page.body) %>
+    <%= to_html(@page.body) %>
   </div>
 <%- end %>

data/app/views/metadata_presenter/component/_content.html.erb

@@ -1 +1 @@
-<%= to_markdown(component.html) %>
+<%= to_html(component.content) %>

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

@@ -12,6 +12,17 @@
     <% end %>
 
     <%= form_for @page, url: reserved_submissions_path do |f| %>
+
+    <%= render partial: 'metadata_presenter/component/components',
+                locals: {
+                  f: f,
+                  components: @page.extra_components,
+                  tag: nil,
+                  classes: nil,
+                  input_components: @page.input_components,
+                  content_components: @page.content_components
+                } %>
+
       <div data-block-id="page.checkanswers.answers" data-block-type="answers">
         <dl class="fb-block fb-block-answers govuk-summary-list">
           <% pages_presenters.each do |page_answers_presenters| %>
@@ -69,7 +80,9 @@
                    f: f,
                    components: @page.components,
                    tag: nil,
-                   classes: nil
+                   classes: nil,
+                   input_components: @page.input_components,
+                   content_components: @page.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

@@ -19,5 +19,7 @@
              f: nil,
              components: @page.components,
              tag: nil,
-             classes: nil
+             classes: nil,
+             input_components: @page.input_components,
+             content_components: @page.content_components
            } %>

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

@@ -23,7 +23,9 @@
                      f: f,
                      components: @page.components,
                      tag: nil,
-                     classes: nil
+                     classes: nil,
+                     input_components: @page.input_components,
+                     content_components: @page.content_components
                    } %>
 
         <%= f.govuk_submit(disabled: editable?) %>

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

@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <% if @page.body %>
         <p class="govuk-body-l" data-block-id="<%= @page.id %>" data-block-property="body">
-        <%= to_markdown(@page.body) %>
+        <%= to_html(@page.body) %>
         </p>
       <%- end %>
        <%= form_tag(reserved_answers_path, method: :post) do  %>

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

@@ -12,7 +12,9 @@
             f: f,
             components: @page.components,
             tag: :h2,
-            classes: 'govuk-heading-m govuk-!-margin-top-8'
+            classes: 'govuk-heading-m govuk-!-margin-top-8',
+            input_components: @page.input_components,
+            content_components: @page.content_components
           }
         %>
 

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

@@ -20,7 +20,7 @@
         <div class="fb-editable"
              data-fb-content-id="page[before_you_start]"
              data-fb-content-type="content">
-          <%= to_markdown(@page.before_you_start) %>
+          <%= to_html(@page.before_you_start) %>
         </div>
       <%- end %>
     </div>

data/config/initializers/page_components.rb

@@ -0,0 +1,19 @@
+Rails.application.config.page_components =
+  ActiveSupport::HashWithIndifferentAccess.new({
+    checkanswers: {
+      input_components: %w(),
+      content_components: %w(content)
+    },
+    confirmation: {
+      input_components: %w(),
+      content_components: %w(content)
+    },
+    content: {
+      input_components: %w(),
+      content_components: %w(content)
+    },
+    multiplequestions: {
+      input_components: %w(text textarea number date radios checkboxes),
+      content_components: %w(content)
+    }
+  })

data/default_metadata/component/content.json

@@ -1,5 +1,5 @@
 {
   "_id": "component.content",
   "_type": "content",
-  "html": "[Optional content]"
+  "content": "[Optional content]"
 }

data/default_metadata/page/checkanswers.json

@@ -4,5 +4,6 @@
   "heading": "Check your answers",
   "send_heading": "Now send your application",
   "send_body": "By submitting this application you confirm that, to the best of your knowledge, the details you are providing are correct.",
-  "components": []
+  "components": [],
+  "extra_components": []
 }

data/default_text/content.json

@@ -2,6 +2,6 @@
   "section_heading": "[Optional section heading]",
   "lede": "[Optional lede paragraph]",
   "body": "[Optional content]",
-  "html": "[Optional content]",
+  "content": "[Optional content]",
   "hint": "[Optional hint text]"
 }

data/fixtures/version.json

@@ -178,14 +178,14 @@
           "legend": "Do you like Star Wars?",
           "items": [
             {
-              "_id": "do-you-like-star-wars_radio_1",
+              "_id": "do-you-like-star-wars_radios_1_item_1",
               "_type": "radio",
               "label": "Only on weekends",
               "hint": "Optional item hint",
               "value": "only-on-weekends"
             },
             {
-              "_id": "do-you-like-star-wars_radio_2",
+              "_id": "do-you-like-star-wars_radios_1_item_2",
               "_type": "radio",
               "label": "Hell no!",
               "hint": "Optional item hint",
@@ -236,21 +236,21 @@
           "legend": "What would you like on your burger?",
           "items": [
             {
-              "_id": "burgers_checkbox_1",
+              "_id": "burgers_checkboxes_1_item_1",
               "_type": "checkbox",
               "label": "Beef, cheese, tomato",
               "hint": "Optional item hint",
               "value": "beef-cheese-tomato"
             },
             {
-              "_id": "burgers_checkbox_2",
+              "_id": "burgers_checkboxes_1_item_2",
               "_type": "checkbox",
               "label": "Chicken, cheese, tomato",
               "hint": "Optional item hint",
               "value": "chicken-cheese-tomato"
             },
             {
-              "_id": "burgers_checkbox_3",
+              "_id": "burgers_checkboxes_1_item_3",
               "_type": "checkbox",
               "label": "Mozzarella, cheddar, feta",
               "hint": "Optional item hint",
@@ -330,7 +330,7 @@
         {
           "_id": "how-many-lights_content_1",
           "_type": "content",
-          "html": "What lights?"
+          "content": "What lights?"
         }
       ],
       "url": "how-many-lights"
@@ -348,9 +348,10 @@
         {
           "_id": "check-answers_content_1",
           "_type": "content",
-          "html": "Check yourself before you wreck yourself."
+          "content": "Check yourself before you wreck yourself."
         }
-      ]
+      ],
+      "extra_components": []
     },
     {
       "_uuid": "b238a22f-c180-48d0-a7d9-8aad2036f1f2",
@@ -364,7 +365,7 @@
         {
           "_id": "confirmation_content_1",
           "_type": "content",
-          "html": "Some day I will be the most powerful Jedi ever!"
+          "content": "Some day I will be the most powerful Jedi ever!"
         }
       ]
     }

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.23.0'.freeze
+  VERSION = '0.27.0'.freeze
 end

data/schemas/component/content.json

@@ -11,7 +11,7 @@
     "_type": {
       "const": "content"
     },
-    "html": {
+    "content": {
       "title": "Content",
       "description": "Content to display - use [markdown](https://www.gov.uk/guidance/how-to-publish-on-gov-uk/markdown) to format text or add hyperlinks",
       "type": "string",
@@ -25,6 +25,6 @@
     }
   ],
   "required": [
-    "html"
+    "content"
   ]
 }

data/schemas/page/checkanswers.json

@@ -43,6 +43,14 @@
       "items": {
         "$ref": "component.content"
       }
+    },
+    "extra_components": {
+      "title": "Extra Components",
+      "description": "More form or content elements used on the page",
+      "type": "array",
+      "items": {
+        "$ref": "component.content"
+      }
     }
   },
   "required": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.27.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -303,6 +303,7 @@ files:
 - app/views/metadata_presenter/page/start.html.erb
 - config/initializers/default_metadata.rb
 - config/initializers/default_text.rb
+- config/initializers/page_components.rb
 - config/initializers/schemas.rb
 - config/routes.rb
 - default_metadata/component/checkboxes.json