metadata_presenter 2.15.3 → 2.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c193e65ab0f33ff31b7493e07470de7020282d5bf194e7bfe3263ca7466b8c3b
-  data.tar.gz: 7ae63df4cd59d812f375a716a1d04785ca1ad050577ca5cfa5ec3c355be78282
+  metadata.gz: d9e3440c00ba0d6f409a1bbf12067692b52b5fc9f82d236c4914e1ddee934b96
+  data.tar.gz: 0ebdbe91b53ec56f5af3b8a6c2fefd0c6e72eae410843e26120198afe4513e73
 SHA512:
-  metadata.gz: 3df3cf7faee63fe939f79cdb59df22c6263beb1cb65f34878e7a8062da829f4c883bc085a5f7bd435ff4f1f39696d220d6e92db3163bab66816e60786ce3fa4f
-  data.tar.gz: e84b4bc9e3a506d3f9161f17884cda0ce40d22859b11f002885978763b77db546404aeb36648dbd5da932b4d49061b6ccdeafa26a2e1551c38e3c2272284a13a
+  metadata.gz: c79b50a7ead0b35d3fca70af9c7f4a51b7d66a79963b7cc0f63dc1bbf9711fbfc8bdb3b4b9f39c20a092d63c166b23591b50a402b2b1cea6c13a50902c60f11b
+  data.tar.gz: faa1fab939c694bfe663c2dd0df71cd567f423af222e8a84fe16e05eeb572d2d6f2a36382b7efedfba7c7fb2afed7f2f3e655187d135bac84fc0e4949658bb11

data/config/initializers/supported_components.rb

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

data/default_metadata/component/email.json

@@ -2,7 +2,7 @@
   "_id": "component.email",
   "_type": "email",
   "errors": {},
-  "label": "Question",
+  "label": "Email address question",
   "hint": "",
   "name": "component-name",
   "validation": {

data/fixtures/branching_10.json

@@ -358,8 +358,8 @@
       "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."
     },
     {
-      "_id": "page.thisisareallylongnamethatshouldcauseavisualissue",
-      "url": "thisisareallylongnamethatshouldcauseavisualissue",
+      "_id": "page.page-a",
+      "url": "page-a",
       "body": "Body section",
       "lede": "",
       "_type": "page.singlequestion",
@@ -367,9 +367,9 @@
       "heading": "",
       "components": [
         {
-          "_id": "thisisareallylongnamethatshouldcauseavisualissue_text_1",
+          "_id": "page-a_text_1",
           "hint": "",
-          "name": "thisisareallylongnamethatshouldcauseavisualissue_text_1",
+          "name": "page-a_text_1",
           "_type": "text",
           "_uuid": "bcedde64-8996-4911-9426-fafaf91008e0",
           "label": "Page A",

data/fixtures/branching_9.json

@@ -281,8 +281,8 @@
       "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."
     },
     {
-      "_id": "page.thisisareallylongnamethatshouldcauseavisualissue",
-      "url": "thisisareallylongnamethatshouldcauseavisualissue",
+      "_id": "page.page-a",
+      "url": "page-a",
       "body": "Body section",
       "lede": "",
       "_type": "page.singlequestion",
@@ -290,9 +290,9 @@
       "heading": "",
       "components": [
         {
-          "_id": "thisisareallylongnamethatshouldcauseavisualissue_text_1",
+          "_id": "page-a_text_1",
           "hint": "",
-          "name": "thisisareallylongnamethatshouldcauseavisualissue_text_1",
+          "name": "page-a_text_1",
           "_type": "text",
           "_uuid": "bcedde64-8996-4911-9426-fafaf91008e0",
           "label": "Page A",

data/fixtures/version.json

@@ -11,10 +11,10 @@
     "9e1ba77f-f1e5-42f4-b090-437aa9af7f73": {
       "_type": "flow.page",
       "next": {
-        "default": "df1ba645-f748-46d0-ad75-f34112653e37"
+        "default": "adcb61c3-52b1-479b-be51-1bb610876d54"
       }
     },
-    "df1ba645-f748-46d0-ad75-f34112653e37": {
+    "adcb61c3-52b1-479b-be51-1bb610876d54": {
       "_type": "flow.page",
       "next": {
         "default": "4b8c6bf3-878a-4446-9198-48351b3e2185"
@@ -63,12 +63,6 @@
       }
     },
     "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"
@@ -133,35 +127,23 @@
       "_id": "page.email-address",
       "url": "email-address",
       "body": "Body section",
-      "lede": "",
       "_type": "page.singlequestion",
-      "_uuid": "df1ba645-f748-46d0-ad75-f34112653e37",
+      "_uuid": "adcb61c3-52b1-479b-be51-1bb610876d54",
       "heading": "Question",
       "components": [
         {
-          "_id": "email-address_text_1",
+          "_id": "email-address_email_1",
           "hint": "",
-          "name": "email-address_text_1",
-          "_type": "text",
-          "_uuid": "f27e5788-e784-4bfd-8b21-2fab8ce95abb",
+          "name": "email-address_email_1",
+          "_type": "email",
+          "_uuid": "482cb2d0-fda7-4e5c-9591-96dcb546e181",
           "label": "Email address",
-          "errors": {
-            "format": {},
-            "required": {
-              "any": "Enter an email address"
-            },
-            "max_length": {
-              "any": "%{control} is too long."
-            },
-            "min_length": {
-              "any": "%{control} is too short."
-            }
-          },
+          "errors": {},
           "collection": "components",
           "validation": {
             "required": true,
-            "max_length": 30,
-            "min_length": 2
+            "email": true,
+            "max_length": 256
           }
         }
       ]
@@ -182,7 +164,18 @@
           "_type": "text",
           "_uuid": "5ad372fa-ed35-477f-b471-4d444f991210",
           "label": "Parent name",
-          "errors": {},
+          "errors": {
+            "format": {},
+            "required": {
+              "any": "Enter a parent name"
+            },
+            "max_length": {
+              "any": "%{control} is too long."
+            },
+            "min_length": {
+              "any": "%{control} is too short."
+            }
+          },
           "collection": "components",
           "validation": {
             "required": false,
@@ -509,31 +502,6 @@
       "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.15.3'.freeze
+  VERSION = '2.15.7'.freeze
 end

data/schemas/component/email.json

@@ -11,13 +11,10 @@
   },
   "allOf": [
     {
-      "$ref": "http://gov.uk/schema/v1.0.0/definition/field"
+      "$ref":  "definition.field"
     },
     {
-      "$ref": "http://gov.uk/schema/v1.0.0/definition/widthclass/input"
+      "$ref": "definition.width_class.input"
     }
-  ],
-  "validation": {
-    "format": "email"
-  }
+  ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.15.7
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder