metadata_presenter 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff1faeeda0dc9ad30f761911443f2f61adade496ec5c1083dbbe5f30a4d98b3
-  data.tar.gz: a52199fbdfea2f4ee641dd62d792f7bfc2ab76955c40eb8edd0109171120a22f
+  metadata.gz: 951d82f5f5c4cb5ac86290e44bab1301c7e3c0d3d803dd323024339108d1af02
+  data.tar.gz: 669f233609d32a82bffb442ce9f666d5af1de8f831da3e5e38f8ff85a2da9709
 SHA512:
-  metadata.gz: cd44c337711cb58997b98ff2ef941f573093d135ba79342181226ac294a5efc134072767ed505199c188d906a5a26a500d93bf937ee359309023595674af290f
-  data.tar.gz: 19e793b3f02f3fcba3fb45822da09b6dd4c48037512af6616a8711d3d841cf90f7b549605cb822d891bc5124e39a59d5ace2549757227dd8bb9038de1bc56764
+  metadata.gz: 76a0540b501f5d5b2ca999da539001ecc793cb21bdab95b2a885753ef84bd74e755a4849b1deb23c28d93947be79ac5f06672a9cbbb7bbe6f8e8016e58d96638
+  data.tar.gz: c89a2d3db1f7bcacd7ad40c4cb550349685822c1914164f9fc5f0d800b00d93ae8ee58f6a50397cf096372451fd4b54479f4fe68aee62b57d4ea46bbc5446317

data/app/helpers/metadata_presenter/application_helper.rb

@@ -1,7 +1,39 @@
 module MetadataPresenter
   module ApplicationHelper
-    def to_markdown(text)
+    ## Display user answers on the view
+    ## When the user doesn't answered yet the component will be blank
+    # or with data otherwise, so doing the if in every output is not
+    # pratical.
+    #
+    # The below example search for 'first_name' in the user data instance
+    # variable as long your load_user_data in the controller sets the variable.
+    #
+    # @example
+    #   <%=a 'first_name' %>
+    #
+    def a(component_key)
+      if @user_data.present?
+        @user_data[component_key]
+      end
+    end
+    alias answer a
+
+    ## Display user answers on the view formatted.
+    ##
+    def formatted_answer(component_key)
+      user_answer = answer(component_key)
+
+      simple_format(user_answer) if user_answer.present?
+    end
+
+    # Renders markdown given a text.
+    #
+    # @example
+    #   <%=m '# Some markdown' %>
+    #
+    def m(text)
       (Kramdown::Document.new(text).to_html).html_safe
     end
+    alias to_markdown m
   end
 end

data/app/models/metadata_presenter/metadata.rb

@@ -8,6 +8,10 @@ class MetadataPresenter::Metadata
     @metadata = OpenStruct.new(metadata)
   end
 
+  def to_json
+    self.to_h.to_json
+  end
+
   def id
     metadata._id
   end

data/app/models/metadata_presenter/service.rb

@@ -7,8 +7,12 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
     pages.first
   end
 
+  def service_slug
+    service_name.parameterize
+  end
+
   def find_page_by_url(url)
-    pages.find { |page| page.url == url }
+    pages.find { |page| strip_slash(page.url) == strip_slash(url) }
   end
 
   def find_page_by_uuid(uuid)
@@ -29,4 +33,12 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
       page.type == 'page.confirmation'
     end
   end
+
+  private
+
+  def strip_slash(url)
+    return url if url == '/'
+
+    url.gsub(/^\//, '')
+  end
 end

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

@@ -3,5 +3,5 @@
     label: { text: component.label },
     hint: { text: component.hint },
     name: "answers[#{component.name}]",
-    value: @user_data ? @user_data[component.name] : nil
+    value: answer(component.name)
 %>

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

@@ -0,0 +1,11 @@
+<%=
+  f.govuk_text_area component.id.to_sym,
+    label: { text: component.label },
+    hint: { text: component.hint },
+    name: "answers[#{component.name}]",
+    value: answer(component.name),
+    max_chars: component.maxchars,
+    max_words: component.maxwords,
+    threshold: component.threshold,
+    rows: component.rows
+%>

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

@@ -35,7 +35,7 @@
                 </dt>
 
                 <dd class="govuk-summary-list__value">
-                  <%= @user_data[component.name] %>
+                  <%= formatted_answer(component.name) %>
                 </dd>
                 <dd class="govuk-summary-list__actions">
                 <%= link_to(
@@ -66,7 +66,7 @@
         </div>
       <% end %>
 
-      <button 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">
+      <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">
         Accept and send application
       </button>
     <% end %>

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

@@ -25,7 +25,7 @@
         </p>
       <%- end %>
 
-      <%= form_tag(@page.url, method: :post) do %>
+      <%= form_tag(root_path, method: :post) do %>
         <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
         Start
           <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">

data/default_metadata/component/text.json

@@ -4,5 +4,8 @@
   "errors": {},
   "hint": "Component hint",
   "label": "Component label",
-  "name": "component-name"
+  "name": "component-name",
+  "validation": {
+    "required": true
+  }
 }

data/default_metadata/component/textarea.json

@@ -0,0 +1,12 @@
+{
+  "_id": "component.textarea",
+  "_type": "textarea",
+  "errors": {},
+  "hint": "Component hint",
+  "label": "Component label",
+  "name": "component-name",
+  "rows": 5,
+  "validation": {
+    "required": true
+  }
+}

data/fixtures/version.json

@@ -124,6 +124,25 @@
       "heading": "Parent name",
       "url": "/parent-name"
     },
+    {
+      "_uuid": "7b748584-100e-4d81-a54a-5049190136cc",
+      "_id": "page.family_hobbies",
+      "_type": "page.singlequestion",
+      "components": [
+        {
+          "_id": "page.family-hobbies--text.auto_name__3",
+          "_type": "textarea",
+          "label": "Your family hobbies",
+          "name": "family_hobbies",
+          "rows": 5,
+          "validation": {
+            "required": true
+          }
+        }
+      ],
+      "heading": "Family Hobbies",
+      "url": "/family-hobbies"
+    },
     {
       "_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
       "_id": "page._check-answers",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.3.0'
+  VERSION = '0.6.0'
 end

data/schemas/textarea/textarea.json

@@ -0,0 +1,55 @@
+{
+  "_id": "component.textarea",
+  "_name": "textarea",
+  "title": "Textarea",
+  "description": "Let users enter text that can be longer than a single line",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "textarea"
+    },
+    "maxwords": {
+      "type": "number",
+      "title": "Maximum words",
+      "description": "Set a word limit",
+      "category": [
+        "userinput"
+      ]
+    },
+    "maxchars": {
+      "type": "number",
+      "title": "Maximum characters",
+      "description": "Set a character limit",
+      "category": [
+        "userinput"
+      ]
+    },
+    "threshold": {
+      "type": "number",
+      "title": "Threshold percentage",
+      "description": "Display the message about maximum length or words after a user has entered a certain amount",
+      "category": [
+        "userinput"
+      ]
+    },
+    "rows": {
+      "type": "number",
+      "title": "Number of rows in the textarea",
+      "description": "Set the number of rows",
+      "category": [
+        "userinput"
+      ]
+    }
+  },
+  "allOf": [
+   {
+      "$ref": "definition.field"
+    },
+    {
+      "$ref": "validations#/definitions/string_bundle"
+    },
+    {
+      "$ref": "definition.width_class.input"
+    }
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,6 +246,7 @@ files:
 - app/views/errors/404.html
 - app/views/layouts/metadata_presenter/application.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
+- app/views/metadata_presenter/component/_textarea.html.erb
 - app/views/metadata_presenter/header/show.html.erb
 - app/views/metadata_presenter/page/checkanswers.html.erb
 - app/views/metadata_presenter/page/confirmation.html.erb
@@ -256,6 +257,7 @@ files:
 - config/initializers/schemas.rb
 - config/routes.rb
 - default_metadata/component/text.json
+- default_metadata/component/textarea.json
 - default_metadata/config/meta.json
 - default_metadata/config/service.json
 - default_metadata/page/checkanswers.json
@@ -317,6 +319,7 @@ files:
 - schemas/service/configuration.json
 - schemas/service/locale.json
 - schemas/text/text.json
+- schemas/textarea/textarea.json
 - schemas/validations/validations.json
 homepage: https://moj-online.service.justice.gov.uk
 licenses: