metadata_presenter 2.14.1 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7184f97740de68d7fb003316d4d2bc5a822ccdfa13749c858b638b64b7f59e6
-  data.tar.gz: 6d540b23868160de18de5c3ef87c5a9ef2f7ecc279ed72e4e2c9ab5bb3c0369d
+  metadata.gz: c193e65ab0f33ff31b7493e07470de7020282d5bf194e7bfe3263ca7466b8c3b
+  data.tar.gz: 7ae63df4cd59d812f375a716a1d04785ca1ad050577ca5cfa5ec3c355be78282
 SHA512:
-  metadata.gz: 10c4c37e567f4b1c58546627c480ceda59a1c65bdafeacf65014c044a380a03a7f22f40180674054f5614adc742fd95aca4624b6d8a1af3ac2158b96a0ebbac0
-  data.tar.gz: 3eb7004878552017ce8c9e180675330d824461234ad410f11384b788eeb5ab46a480526020a7edf4efd6ece8d1f7588d0cfd2ed3561fe9270d2c936717072b4b
+  metadata.gz: 3df3cf7faee63fe939f79cdb59df22c6263beb1cb65f34878e7a8062da829f4c883bc085a5f7bd435ff4f1f39696d220d6e92db3163bab66816e60786ce3fa4f
+  data.tar.gz: e84b4bc9e3a506d3f9161f17884cda0ce40d22859b11f002885978763b77db546404aeb36648dbd5da932b4d49061b6ccdeafa26a2e1551c38e3c2272284a13a

data/app/models/metadata_presenter/grid.rb

@@ -19,7 +19,7 @@ module MetadataPresenter
 
   class Grid
     include BranchDestinations
-    attr_reader :start_from
+    attr_reader :service, :start_from
 
     def initialize(service, start_from: nil, main_flow: [])
       @service = service
@@ -67,9 +67,13 @@ module MetadataPresenter
       ordered_pages.map(&:uuid)
     end
 
+    def show_warning?
+      checkanswers_warning.show_warning? || confirmation_warning.show_warning?
+    end
+
     private
 
-    attr_reader :service, :main_flow
+    attr_reader :main_flow
     attr_accessor :ordered, :traversed, :routes, :coordinates
 
     def route_from_start
@@ -277,46 +281,21 @@ module MetadataPresenter
     # Include a warning if a service does not have a CYA or Confirmation page in the
     # main flow. The warning should always be in the first row, last column.
     def insert_warning
-      if cya_and_confirmation_pages_not_in_service? ||
-          cya_and_confirmation_pages_detached?
-        @ordered.append([MetadataPresenter::Warning.new])
-      end
-    end
-
-    def cya_and_confirmation_pages_not_in_service?
-      (checkanswers_not_in_service? && confirmation_not_in_service?) ||
-        checkanswers_not_in_service? ||
-        confirmation_not_in_service?
-    end
-
-    def checkanswers_not_in_service?
-      service.checkanswers_page.blank?
+      @ordered.append([MetadataPresenter::Warning.new]) if show_warning?
     end
 
-    def confirmation_not_in_service?
-      service.confirmation_page.blank?
+    def checkanswers_warning
+      MetadataPresenter::PageWarning.new(
+        page: service.checkanswers_page,
+        main_flow_uuids: flow_uuids
+      )
     end
 
-    def cya_and_confirmation_pages_detached?
-      (checkanswers_detached? && confirmation_detached?) ||
-        checkanswers_detached? ||
-        confirmation_detached?
-    end
-
-    def checkanswers_detached?
-      if service.checkanswers_page.present?
-        uuid = service.checkanswers_page.uuid
-        position = coordinates.positions[uuid]
-        detached?(position)
-      end
-    end
-
-    def confirmation_detached?
-      if service.confirmation_page.present?
-        uuid = service.confirmation_page.uuid
-        position = coordinates.positions[uuid]
-        detached?(position)
-      end
+    def confirmation_warning
+      MetadataPresenter::PageWarning.new(
+        page: service.confirmation_page,
+        main_flow_uuids: flow_uuids
+      )
     end
 
     # Any destinations exiting the branch that have not already been traversed.

data/app/models/metadata_presenter/page_warning.rb

@@ -0,0 +1,24 @@
+module MetadataPresenter
+  class PageWarning
+    def initialize(page:, main_flow_uuids:)
+      @page = page
+      @main_flow_uuids = main_flow_uuids
+    end
+
+    def show_warning?
+      missing? || detached?
+    end
+
+    def missing?
+      page.blank?
+    end
+
+    def detached?
+      main_flow_uuids.exclude?(page&.uuid)
+    end
+
+    private
+
+    attr_reader :page, :main_flow_uuids
+  end
+end

data/app/validators/metadata_presenter/email_validator.rb

@@ -0,0 +1,8 @@
+module MetadataPresenter
+  class EmailValidator < BaseValidator
+    def invalid_answer?
+      regex = URI::MailTo::EMAIL_REGEXP
+      user_answer.match(regex).nil?
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+<%=
+  f.govuk_email_field component.id.to_sym,
+    label: { text: input_title },
+    hint: {
+      data: { "fb-default-text" => default_text('hint') },
+      text: component.hint
+    },
+    name: "answers[#{component.name}]",
+    spellcheck: "false",
+    autocomplete: "email"
+%>

data/config/initializers/supported_components.rb

@@ -17,11 +17,11 @@ Rails.application.config.supported_components =
       content: %w(content)
     },
     multiplequestions: {
-      input: %w(text textarea number date radios checkboxes),
+      input: %w(text textarea number date radios checkboxes email),
       content: %w(content)
     },
     singlequestion: {
-      input: %w(text textarea number date radios checkboxes upload),
+      input: %w(text textarea number date radios checkboxes email upload),
       content: %w()
      }
   })

data/default_metadata/component/email.json

@@ -0,0 +1,13 @@
+{
+  "_id": "component.email",
+  "_type": "email",
+  "errors": {},
+  "label": "Question",
+  "hint": "",
+  "name": "component-name",
+  "validation": {
+    "email": true,
+    "max_length": 256,
+    "required": true
+  }
+}

data/default_metadata/string/error.email.json

@@ -0,0 +1,6 @@
+{
+  "_id": "error.email",
+  "_type": "string.error",
+  "description": "Input (email) is not a valid email",
+  "value": "Enter an email address in the correct format, like name@example.com"
+}

data/fixtures/version.json

@@ -63,6 +63,12 @@
       }
     },
     "80420693-d6f2-4fce-a860-777ca774a6f5": {
+      "_type": "flow.page",
+      "next": {
+        "default": "adcb61c3-52b1-479b-be51-1bb610876d54"
+      }
+    },
+    "adcb61c3-52b1-479b-be51-1bb610876d54" : {
       "_type": "flow.page",
       "next": {
         "default": "2ef7d11e-0307-49e9-9fe2-345dc528dd66"
@@ -503,6 +509,31 @@
       "add_component": "content",
       "section_heading": "Chain of Command"
     },
+    {
+      "_id": "page.email",
+      "url": "email",
+      "body": "Body section",
+      "_type": "page.singlequestion",
+      "_uuid": "adcb61c3-52b1-479b-be51-1bb610876d54",
+      "heading": "Email",
+      "components": [
+        {
+          "_id": "email-address_email_1",
+          "hint": "",
+          "name": "email-address_email_1",
+          "_type": "email",
+          "_uuid": "482cb2d0-fda7-4e5c-9591-96dcb546e181",
+          "label": "Email address",
+          "errors": {},
+          "collection": "components",
+          "validation": {
+            "required": true,
+            "email": true,
+            "max_length": 256
+          }
+        }
+      ]
+    },
     {
       "_id": "page.dog-picture",
       "url": "dog-picture",

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '2.14.1'.freeze
+  VERSION = '2.15.3'.freeze
 end

data/schemas/component/email.json

@@ -0,0 +1,23 @@
+{
+  "$id": "http://gov.uk/schema/v1.0.0/email",
+  "_name": "component.email",
+  "title": "Email",
+  "description": "Let users enter an email address",
+  "type": "object",
+  "properties": {
+    "_type": {
+      "const": "email"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "http://gov.uk/schema/v1.0.0/definition/field"
+    },
+    {
+      "$ref": "http://gov.uk/schema/v1.0.0/definition/widthclass/input"
+    }
+  ],
+  "validation": {
+    "format": "email"
+  }
+}

data/schemas/component/text.json

@@ -13,9 +13,6 @@
     {
       "$ref": "definition.field"
     },
-    {
-      "$ref": "validations#/definitions/string_bundle"
-    },
     {
       "$ref": "definition.width_class.input"
     }

data/schemas/component/textarea.json

@@ -45,9 +45,6 @@
    {
       "$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: 2.14.1
+  version: 2.15.3
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder
@@ -295,6 +295,7 @@ files:
 - app/models/metadata_presenter/offline_upload_adapter.rb
 - app/models/metadata_presenter/page.rb
 - app/models/metadata_presenter/page_answers.rb
+- app/models/metadata_presenter/page_warning.rb
 - app/models/metadata_presenter/previous_page.rb
 - app/models/metadata_presenter/route.rb
 - app/models/metadata_presenter/row_number.rb
@@ -311,6 +312,7 @@ files:
 - app/validators/metadata_presenter/accept_validator.rb
 - app/validators/metadata_presenter/base_validator.rb
 - app/validators/metadata_presenter/date_validator.rb
+- app/validators/metadata_presenter/email_validator.rb
 - app/validators/metadata_presenter/max_length_validator.rb
 - app/validators/metadata_presenter/max_size_validator.rb
 - app/validators/metadata_presenter/min_length_validator.rb
@@ -330,6 +332,7 @@ files:
 - app/views/metadata_presenter/component/_components.html.erb
 - app/views/metadata_presenter/component/_content.html.erb
 - app/views/metadata_presenter/component/_date.html.erb
+- app/views/metadata_presenter/component/_email.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
@@ -356,6 +359,7 @@ files:
 - default_metadata/component/checkboxes.json
 - default_metadata/component/content.json
 - default_metadata/component/date.json
+- default_metadata/component/email.json
 - default_metadata/component/number.json
 - default_metadata/component/radios.json
 - default_metadata/component/text.json
@@ -380,6 +384,7 @@ files:
 - default_metadata/service/base.json
 - default_metadata/string/error.accept.json
 - default_metadata/string/error.date.json
+- default_metadata/string/error.email.json
 - default_metadata/string/error.max_length.json
 - default_metadata/string/error.max_size.json
 - default_metadata/string/error.min_length.json
@@ -422,6 +427,7 @@ files:
 - schemas/component/checkboxes.json
 - schemas/component/content.json
 - schemas/component/date.json
+- schemas/component/email.json
 - schemas/component/number.json
 - schemas/component/radios.json
 - schemas/component/text.json
@@ -502,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Service Metadata Presenter