metadata_presenter 0.11.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28074c7149c34365903ebb2d3f63f679fe15a9365d9d8d52212bf46781506ae
-  data.tar.gz: b5c02391b3978aaadc551076f9b0823c6e73f585d7e401ac5980d976d6e568f2
+  metadata.gz: f61c08ab0dfb4a0f2d07168015012f35efd105f2bcaea0d9ce547bd291eeabd5
+  data.tar.gz: b602b6f0043d681f73e09720c0fdc61b308a751536b7b5df11e4023fdbd470c9
 SHA512:
-  metadata.gz: 2b94a8004d81073a597b09b27844d16d5833a8b68a458423afb330fe1fd880d3a4feea508d7f5ec00e290ce75b7f73e8dc3b5094b5276f75c8477241068ba14a
-  data.tar.gz: fb7392086d34f13606a4def4b0347190ec45a90fd2f3ec66271b1ef517a2923496e0ce131323ef8b6084491a93d570282204b33a4bf21d4515c0c1185d05fa3e
+  metadata.gz: c4a4278f4867f2edf69b87097f0bd384e37f85fcf059c56884c8e52ce19f2f045b9ee294ab173387e427d6dee022ceb6141970ce64ea1a35f15017fbd7a6a084
+  data.tar.gz: bace9ee8b5f8c5226819c5f61292612074b7fa140d51fdae77aaf6ea210b86953935c04e71300dda35239b5a1770d8df436bc8a44e635533fcd2b30b106c9134

data/app/controllers/metadata_presenter/engine_controller.rb

@@ -8,7 +8,9 @@ module MetadataPresenter
     def back_link
       return if @page.blank?
 
-      @back_link ||= service.previous_page(current_page: @page)&.url
+      previous_page = service.previous_page(current_page: @page)&.url
+
+      @back_link ||= File.join(request.script_name, previous_page) if previous_page
     end
     helper_method :back_link
 

data/app/controllers/metadata_presenter/pages_controller.rb

@@ -11,5 +11,14 @@ module MetadataPresenter
         not_found
       end
     end
+
+    def page_answers_presenters
+      PageAnswersPresenter.map(
+        view: view_context,
+        pages: service.pages,
+        answers: @user_data
+      )
+    end
+    helper_method :page_answers_presenters
   end
 end

data/app/helpers/metadata_presenter/application_helper.rb

@@ -14,32 +14,6 @@ module MetadataPresenter
       end
     end
 
-    ## 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

data/app/models/metadata_presenter/date_field.rb

@@ -0,0 +1,19 @@
+module MetadataPresenter
+  class DateField
+    attr_reader :day, :month, :year
+
+    def initialize(day:, month:, year:)
+      @day = day
+      @month = month
+      @year = year
+    end
+
+    def present?
+      !blank?
+    end
+
+    def blank?
+      @day.blank? || @month.blank? || @year.blank?
+    end
+  end
+end

data/app/models/metadata_presenter/page_answers.rb

@@ -17,11 +17,33 @@ module MetadataPresenter
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      answers[method_name.to_s].present?
+      method_name.to_s.in?(components.map(&:id))
     end
 
     def method_missing(method_name, *args, &block)
-      answers[method_name.to_s]
+      component = components.find { |component| component.id == method_name.to_s }
+
+      if component && component.type == 'date'
+        date_answer(component.id)
+      else
+        answers[method_name.to_s]
+      end
+    end
+
+    def date_answer(component_id)
+      date = raw_date_answer(component_id)
+
+      MetadataPresenter::DateField.new(day: date[0], month: date[1], year: date[2])
+    end
+
+    def raw_date_answer(component_id)
+      [
+        GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:day],
+        GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:month],
+        GOVUKDesignSystemFormBuilder::Elements::Date::SEGMENTS[:year]
+      ].map do |segment|
+        answers["#{component_id.to_s}(#{segment})"]
+      end
     end
 
     private

data/app/presenters/metadata_presenter/page_answers_presenter.rb

@@ -0,0 +1,57 @@
+module MetadataPresenter
+  class PageAnswersPresenter
+    def self.map(view:, pages:, answers:)
+      pages.map do |page|
+        Array(page.components).map do |component|
+          new(
+            view: view,
+            component: component,
+            page: page,
+            answers: answers
+          )
+        end
+      end.flatten
+    end
+
+    attr_reader :view, :component, :page, :answers
+    delegate :url, to: :page
+    delegate :humanised_title, to: :component
+
+    def initialize(view:, component:, page:, answers:)
+      @view = view
+      @component = component
+      @page = page
+      @answers = answers
+
+      @page_answers = PageAnswers.new(page, answers)
+    end
+
+    def answer
+      value = @page_answers.send(component.id)
+
+      return '' if value.blank?
+      if self.class.private_method_defined?(component.type.to_sym)
+        send(component.type.to_sym, value)
+      else
+        value
+      end
+    end
+
+    private
+
+    def date(value)
+      I18n.l(
+        Date.civil(value.year.to_i, value.month.to_i, value.day.to_i),
+        format: '%d %B %Y'
+      )
+    end
+
+    def textarea(value)
+      view.simple_format(value, {}, wrapper_tag: 'span')
+    end
+
+    def checkboxes(value)
+      value.reject(&:blank?).join("<br>").html_safe
+    end
+  end
+end

data/app/validators/metadata_presenter/base_validator.rb

@@ -38,7 +38,7 @@ module MetadataPresenter
     end
 
     def valid?
-      return true if user_answer.blank? && allow_blank?
+      return true if allow_blank?
 
       if invalid_answer?
         error_message = custom_error_message || default_error_message
@@ -63,7 +63,12 @@ module MetadataPresenter
     # @return [String] user answer for the specific component
     #
     def user_answer
-      page_answers.send(component.name)
+      value = page_answers.send(component.name)
+      if component.type == 'checkboxes'
+        Array(value).reject(&:blank?)
+      else
+        value
+      end
     end
 
     # The default error message will be look using the schema key.
@@ -127,7 +132,7 @@ module MetadataPresenter
     # @return [TrueClass]
     #
     def allow_blank?
-      true unless self.class.name.demodulize.include?('RequiredValidator')
+      user_answer.blank? && !self.class.name.demodulize.include?('RequiredValidator')
     end
   end
 end

data/app/validators/metadata_presenter/date_validator.rb

@@ -0,0 +1,14 @@
+module MetadataPresenter
+  class DateValidator < BaseValidator
+    def invalid_answer?
+      Date.strptime(
+        "#{user_answer.year}-#{user_answer.month}-#{user_answer.day}",
+        '%Y-%m-%d'
+      )
+
+      false
+    rescue Date::Error
+      true
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+<%=
+  f.govuk_collection_check_boxes component.id.to_sym,
+    component.items,
+    :id,
+    :name,
+    :description,
+    legend: { text: input_title },
+    hint: { text: component.hint }
+%>

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

@@ -0,0 +1,5 @@
+<%=
+  f.govuk_date_field component.id.to_sym,
+    hint: { text: component.hint },
+    legend: { text: input_title }
+%>

data/app/views/metadata_presenter/header/show.html.erb

@@ -26,7 +26,7 @@
     </div>
     <% if service.service_name.present? %>
       <div class="govuk-header__content">
-        <a href="/" class="govuk-header__link govuk-header__link--service-name">
+        <a href="<%= root_path %>" class="govuk-header__link govuk-header__link--service-name">
           <%= service.service_name %>
         </a>
     <% end %>

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

@@ -27,27 +27,25 @@
     <%= form_for @page, url: reserved_submissions_path do |f| %>
       <div data-block-id="page.checkanswers.answers" data-block-type="answers">
         <dl class="fb-block fb-block-answers govuk-summary-list">
-          <% @service.pages.each do |page| %>
-            <% Array(page.components).each do |component| %>
-              <div class="govuk-summary-list__row">
-                <dt class="govuk-summary-list__key">
-                  <%= component.humanised_title %>
-                </dt>
+          <% page_answers_presenters.each do |page_answers_presenter| %>
+            <div class="govuk-summary-list__row">
+              <dt class="govuk-summary-list__key">
+                <%= page_answers_presenter.humanised_title %>
+              </dt>
 
-                <dd class="govuk-summary-list__value">
-                  <%= formatted_answer(component.name) %>
-                </dd>
-                <dd class="govuk-summary-list__actions">
-                <%= link_to(
-                      change_answer_path(url: page.url),
-                      class: 'govuk-link'
-                    ) do %>
-                       Change<span class="govuk-visually-hidden"> Your answer for <%= component.label %></span>
-                  <% end %>
-                  </a>
-                </dd>
-              </div>
-            <% end %>
+              <dd class="govuk-summary-list__value">
+                <%= page_answers_presenter.answer %>
+              </dd>
+              <dd class="govuk-summary-list__actions">
+              <%= link_to(
+                    change_answer_path(url: page_answers_presenter.url),
+                    class: 'govuk-link'
+                  ) do %>
+                     Change<span class="govuk-visually-hidden"> Your answer for <%= page_answers_presenter.humanised_title %></span>
+                <% end %>
+                </a>
+              </dd>
+            </div>
           <% end %>
         </dl>
       </div>

data/default_metadata/component/checkboxes.json

@@ -0,0 +1,24 @@
+{
+  "_id": "component.checkboxes",
+  "_type": "checkboxes",
+  "errors": {},
+  "hint": "[Hint text (optional)]",
+  "items": [
+    {
+      "_id": "component_checkbox_1",
+      "_type": "checkbox",
+      "label": "Option",
+      "hint": "[Hint text (optional)]",
+      "value": "value-1"
+    },
+    {
+      "_id": "component_checkbox_2",
+      "_type": "checkbox",
+      "label": "Option",
+      "hint": "[Hint text (optional)]",
+      "value": "value-2"
+    }
+  ],
+  "name": "component-name",
+  "legend": "Question"
+}

data/default_metadata/component/date.json

@@ -0,0 +1,12 @@
+{
+  "_id": "component.date",
+  "_type": "date",
+  "errors": {},
+  "hint": "Component hint",
+  "legend": "Component legend",
+  "name": "component-name",
+  "date_type": "day-month-year",
+  "validation": {
+    "date": true
+  }
+}

data/default_metadata/component/radios.json

@@ -2,8 +2,23 @@
   "_id": "component.radios",
   "_type": "radios",
   "errors": {},
-  "hint": "Component hint",
-  "items": [],
+  "hint": "[Hint text (optional)]",
+  "items": [
+    {
+      "_id": "component_radio_1",
+      "_type": "radio",
+      "label": "Option",
+      "hint": "[Hint text (optional)]",
+      "value": "value-1"
+    },
+    {
+      "_id": "component_radio_2",
+      "_type": "radio",
+      "label": "Option",
+      "hint": "[Hint text (optional)]",
+      "value": "value-2"
+    }
+  ],
   "name": "component-name",
-  "legend": "Required legend"
+  "legend": "Question"
 }

data/default_metadata/definition/checkbox.json

@@ -0,0 +1,7 @@
+{
+	"_id": "definition.checkbox",
+	"_type": "checkbox",
+	"label": "Option",
+	"hint": "[Hint text (optional)]",
+	"value": "checkbox-value"
+}

data/default_metadata/definition/radio.json

@@ -1,6 +1,7 @@
 {
   "_id": "definition.radio",
   "_type": "radio",
-  "label": "Required label",
+  "label": "Option",
+  "hint": "[Hint text (optional)]",
   "value": "radio-value"
 }

data/default_metadata/string/error.date.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.date",
+  "_type": "string.error",
+  "description": "Input (date) is not a valid date",
+  "value": "Enter a valid date for %{control}"
+}

data/fixtures/version.json

@@ -201,6 +201,71 @@
       "heading": "Radio buttons",
       "url": "/do-you-like-star-wars"
     },
+    {
+      "_id": "page.holiday",
+      "url": "holiday",
+      "_type":"page.singlequestion",
+      "_uuid":"ff4557b2-486b-481e-9eef-f315718639e8",
+      "heading":"Question",
+      "components": [
+        {
+          "_id": "holiday_date_1",
+          "hint": "Component hint",
+          "name": "holiday_date_1",
+          "_type": "date",
+          "legend": "What is the day that you like to take holidays?",
+          "errors": {},
+          "date_type": "day-month-year",
+          "validation": {
+            "date": true,
+            "required": true
+          }
+        }
+      ]
+    },
+    {
+      "_uuid": "7b748584-100e-4d81-a54a-5049190136cc",
+      "_id": "page.burgers",
+      "_type": "page.singlequestion",
+      "components": [
+        {
+          "_id": "burgers_checkboxes_1",
+          "_type": "checkboxes",
+          "errors": {},
+          "hint": "Select all that apply",
+          "legend": "What would you like on your burger?",
+          "items": [
+            {
+              "_id": "burgers_checkbox_1",
+              "_type": "checkbox",
+              "label": "Beef, cheese, tomato",
+              "hint": "Optional item hint",
+              "value": "beef-cheese-tomato"
+            },
+            {
+              "_id": "burgers_checkbox_2",
+              "_type": "checkbox",
+              "label": "Chicken, cheese, tomato",
+              "hint": "Optional item hint",
+              "value": "chicken-cheese-tomato"
+            },
+            {
+              "_id": "burgers_checkbox_3",
+              "_type": "checkbox",
+              "label": "Mozzarella, cheddar, feta",
+              "hint": "Optional item hint",
+              "value": "mozzarella-cheddar-feta"
+            }
+          ],
+          "name": "burgers_checkboxes_1",
+          "validation": {
+            "required": true
+          }
+        }
+      ],
+      "heading": "Checkboxes",
+      "url": "/burgers"
+    },
     {
       "_uuid": "e819d0c2-7062-4997-89cf-44d26d098404",
       "_id": "page._check-answers",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '0.11.0'
+  VERSION = '0.13.3'
 end

data/schemas/component/checkboxes.json

@@ -0,0 +1,33 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/checkboxes",
+  "_name": "component.checkboxes",
+  "title": "Checkboxes",
+  "description": "Let users select one or more options from a list",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "checkboxes"
+    },
+    "items": {
+      "title": "Options",
+      "description": "Items that users can select",
+      "type": "array",
+      "items": {
+        "$ref": "definition.checkbox"
+      }
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.fieldset"
+    }
+  ],
+  "transforms": {
+    "namespace": {
+      "propagation": "items[?(@._type === 'checkbox')]"
+    }
+  },
+  "required": [
+    "items"
+  ]
+}

data/schemas/component/date.json

@@ -0,0 +1,48 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/date",
+  "_name": "component.date",
+  "title": "Date",
+  "description": "Let users enter an exact date",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "date"
+    },
+    "name": {
+      "inputType": "date"
+    },
+    "date_type": {
+      "title": "Date type",
+      "description": "The format for entering dates",
+      "type": "string",
+      "enum": [
+        "day-month-year",
+        "month-year",
+        "day-month",
+        "year"
+      ],
+      "default": "day-month-year"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.fieldset"
+    },
+    {
+      "$ref": "validations#/definitions/date_bundle"
+    }
+  ],
+  "composite": [
+    "day",
+    "month",
+    "year"
+  ],
+  "definitions": {
+    "date_type_enum": {
+      "day-month-year": "Day / Month / Year",
+      "month-year": "Month / Year",
+      "year": "Year",
+      "day-month": "Day / Month"
+    }
+  }
+}

data/schemas/definition/checkbox.json

@@ -0,0 +1,46 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/checkbox",
+  "_name": "definition.checkbox",
+  "title": "Checkbox item",
+  "description": "Component that provides a checkbox item",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "checkbox"
+    },
+    "value": {
+      "default": "yes"
+    },
+    "label": {
+      "skipOptional": true
+    },
+    "hint": {
+      "title": "Hint text",
+      "description": "Text to help users understand an option - appears in grey under the label",
+      "type": "string",
+      "content": true
+    },
+    "conditional_component": {
+      "$ref": "definition.conditionalcomponent"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "definition.namespace"
+    },
+    {
+      "$ref": "definition.option"
+    },
+    {
+      "$ref": "definition.name"
+    }
+  ],
+  "required": [
+    "label"
+  ],
+  "transforms": {
+    "namespace": {
+      "propagation": "conditional_component"
+    }
+  }
+}

data/schemas/validations/validations.json

@@ -25,6 +25,15 @@
       ],
       "default": true
     },
+    "date": {
+      "title": "Date",
+      "description": "Whether the user must answer with a valid date",
+      "oneOf": [
+        {
+          "$ref": "definition.conditional.boolean"
+        }
+      ]
+    },
     "errors_required": {
       "title": "Error messages for ‘Required’",
       "allOf": [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.3
 platform: ruby
 authors:
 - MoJ Online
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -233,12 +233,15 @@ files:
 - app/helpers/metadata_presenter/application_helper.rb
 - app/jobs/metadata_presenter/application_job.rb
 - app/models/metadata_presenter/component.rb
+- app/models/metadata_presenter/date_field.rb
 - app/models/metadata_presenter/metadata.rb
 - app/models/metadata_presenter/next_page.rb
 - app/models/metadata_presenter/page.rb
 - app/models/metadata_presenter/page_answers.rb
 - app/models/metadata_presenter/service.rb
+- app/presenters/metadata_presenter/page_answers_presenter.rb
 - app/validators/metadata_presenter/base_validator.rb
+- app/validators/metadata_presenter/date_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
 - app/validators/metadata_presenter/number_validator.rb
@@ -247,6 +250,8 @@ files:
 - app/validators/metadata_presenter/validate_schema.rb
 - app/views/errors/404.html
 - app/views/layouts/metadata_presenter/application.html.erb
+- app/views/metadata_presenter/component/_checkboxes.html.erb
+- app/views/metadata_presenter/component/_date.html.erb
 - app/views/metadata_presenter/component/_number.html.erb
 - app/views/metadata_presenter/component/_radios.html.erb
 - app/views/metadata_presenter/component/_text.html.erb
@@ -260,18 +265,22 @@ files:
 - config/initializers/default_metadata.rb
 - config/initializers/schemas.rb
 - config/routes.rb
+- default_metadata/component/checkboxes.json
+- default_metadata/component/date.json
 - default_metadata/component/number.json
 - default_metadata/component/radios.json
 - default_metadata/component/text.json
 - default_metadata/component/textarea.json
 - default_metadata/config/meta.json
 - default_metadata/config/service.json
+- default_metadata/definition/checkbox.json
 - default_metadata/definition/radio.json
 - default_metadata/page/checkanswers.json
 - default_metadata/page/confirmation.json
 - default_metadata/page/singlequestion.json
 - default_metadata/page/start.json
 - default_metadata/service/base.json
+- default_metadata/string/error.date.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.min_length.json
 - default_metadata/string/error.number.json
@@ -284,6 +293,8 @@ files:
 - lib/metadata_presenter/test_helpers.rb
 - lib/metadata_presenter/version.rb
 - lib/tasks/metadata_presenter_tasks.rake
+- schemas/component/checkboxes.json
+- schemas/component/date.json
 - schemas/component/number.json
 - schemas/component/radios.json
 - schemas/component/text.json
@@ -292,6 +303,7 @@ files:
 - schemas/config/meta.json
 - schemas/config/service.json
 - schemas/definition/block.json
+- schemas/definition/checkbox.json
 - schemas/definition/component.json
 - schemas/definition/components.json
 - schemas/definition/condition.base.json