Remove numbers and other invalid characters from the component name field (#39)

Author: davidjamesstone

src/server/forms/report-a-terrorist.json

@@ -54,15 +54,15 @@
           "schema": {}
         },
         {
-          "name": "3jdOpV",
+          "name": "ajdOpV",
           "options": {},
           "type": "Details",
           "title": "Help me take a screenshot",
           "content": "Try this:Press the Shift key (⇧), command (or Cmd), and 3The screenshot will be saved to your DesktopYou can now upload it to the formTry this:Press the Ctrl key and the switch window keyThe screenshot will be saved to your DownloadsYou can now upload it to the formIf that doesn’t work, try pressing Ctrl and F5.When viewing the material:Press the Prt Scr key (or similar) to take a copy of your screenPaste the image into Microsoft Paint or a similar applicationSave the file to your computerUpload the file to the formIf that doesn’t work, you may need to search for how to take screenshots on your particular computer model.",
           "schema": {}
         },
         {
-          "name": "LU6RMD",
+          "name": "LUBRMD",
           "options": {},
           "type": "RadiosField",
           "title": "Do you have any evidence?",
@@ -92,15 +92,15 @@
       "title": "Is there anything else you can tell us?",
       "components": [
         {
-          "name": "HETM3o",
+          "name": "HETMBo",
           "title": "Html",
           "options": {},
           "type": "Html",
           "content": "<p class=\"govuk-body\">Details may include:who shared the materialwhen it was shareda description, if you haven’t provided a link or evidence</p>",
           "schema": {}
         },
         {
-          "name": "evZ-IJ",
+          "name": "evZxIJ",
           "options": {
             "required": false
           },
@@ -141,7 +141,7 @@
       "title": "Yes I have evidence",
       "components": [
         {
-          "name": "koE_ae",
+          "name": "koExae",
           "options": {
             "required": false
           },
@@ -230,7 +230,7 @@
         "conditions": [
           {
             "field": {
-              "name": "PMXq1s.LU6RMD",
+              "name": "PMXq1s.LUBRMD",
               "type": "RadiosField",
               "display": "Do you have any evidence? in PMXq1s"
             },
@@ -252,7 +252,7 @@
         "conditions": [
           {
             "field": {
-              "name": "PMXq1s.LU6RMD",
+              "name": "PMXq1s.LUBRMD",
               "type": "RadiosField",
               "display": "Do you have any evidence? in PMXq1s"
             },

src/server/forms/runner-components-test.json

@@ -6,7 +6,7 @@
       "path": "/do-you-own-a-vehicle",
       "components": [
         {
-          "name": "qqbRw1",
+          "name": "qqbRwx",
           "options": {},
           "type": "YesNoField",
           "title": "Do you own a vehicle?",
@@ -32,7 +32,7 @@
       "title": "What address is the vehicle registered to?",
       "components": [
         {
-          "name": "sFR4aX",
+          "name": "sFRxaX",
           "options": {},
           "type": "UkAddressField",
           "title": "What address is the vehicle registered to?",
@@ -46,7 +46,7 @@
           "schema": {}
         },
         {
-          "name": "Z0Guyn",
+          "name": "ZxGuyn",
           "options": {},
           "type": "CheckboxesField",
           "title": "Which Clean Air Zones are you claiming an exemption for?",
@@ -66,7 +66,7 @@
       "title": "Clean Air Zone (CAZ) Exemption",
       "components": [
         {
-          "name": "MOB13t",
+          "name": "MOBxxt",
           "title": "Html",
           "options": {},
           "type": "Html",
@@ -86,23 +86,23 @@
       "title": "Details about your vehicle",
       "components": [
         {
-          "name": "0ZVmN_",
+          "name": "xZVmNx",
           "options": {},
           "type": "AutocompleteField",
           "title": "What is the make of you vehicle?",
           "list": "-HMHHj",
           "schema": {}
         },
         {
-          "name": "gHSgo2",
+          "name": "gHSgox",
           "options": {},
           "type": "TextField",
           "title": "Vehicle Model",
           "hint": "For example A1, 740, Elantra",
           "schema": {}
         },
         {
-          "name": "4LZ9to",
+          "name": "xLZxto",
           "options": {},
           "type": "DatePartsField",
           "title": "Date you purchased the vehicle?",
@@ -152,7 +152,7 @@
           "schema": {}
         },
         {
-          "name": "0zL5bB",
+          "name": "xzLxbB",
           "options": {},
           "type": "TelephoneNumberField",
           "title": "Contact number",
@@ -171,15 +171,15 @@
       "title": "final steps",
       "components": [
         {
-          "name": "fkd8av",
+          "name": "fkdxav",
           "options": {},
           "type": "List",
           "title": "Declaration",
           "list": "mJHWaC",
           "schema": {}
         },
         {
-          "name": "L_2AYe",
+          "name": "LxxAYe",
           "options": {},
           "type": "EmailAddressField",
           "title": "Your email address",

test/form/definitions/titles.json

@@ -16,7 +16,7 @@
         },
         {
           "type": "TextField",
-          "name": "firstName1",
+          "name": "firstNameOne",
           "title": "First name",
           "options": {
             "required": true
@@ -29,14 +29,14 @@
             "optionalText": false
           },
           "type": "TextField",
-          "name": "middleName1",
+          "name": "middleNameOne",
           "title": "Middle name",
           "hint": "If you have a middle name on your passport you must include it here",
           "schema": {}
         },
         {
           "type": "TextField",
-          "name": "lastName1",
+          "name": "lastNameOne",
           "title": "Surname",
           "options": {
             "required": true
@@ -56,7 +56,7 @@
       "components": [
         {
           "type": "UkAddressField",
-          "name": "address1",
+          "name": "addressOne",
           "title": "Address",
           "options": {
             "required": true
@@ -86,7 +86,7 @@
         },
         {
           "type": "TextField",
-          "name": "firstName2",
+          "name": "firstNameTwo",
           "title": "First name",
           "options": {
             "required": true
@@ -99,14 +99,14 @@
             "optionalText": false
           },
           "type": "TextField",
-          "name": "middleName2",
+          "name": "middleNameTwo",
           "title": "Middle name",
           "hint": "If you have a middle name on your passport you must include it here",
           "schema": {}
         },
         {
           "type": "TextField",
-          "name": "lastName2",
+          "name": "lastNameTwo",
           "title": "Surname",
           "options": {
             "required": true
@@ -126,7 +126,7 @@
       "components": [
         {
           "type": "UkAddressField",
-          "name": "address2",
+          "name": "addressTwo",
           "title": "Address",
           "options": {
             "required": false

test/form/titles.test.js

@@ -45,40 +45,40 @@ describe('Title and section title', () => {
         path: '/applicant-one',
         payload: {
           crumb: csrfToken,
-          firstName1: 'Firstname',
-          middleName1: '',
-          lastName1: 'Lastname'
+          firstNameOne: 'Firstname',
+          middleNameOne: '',
+          lastNameOne: 'Lastname'
         }
       },
       {
         path: '/applicant-one-address',
         payload: {
           crumb: csrfToken,
-          address1__addressLine1: 'Richard Fairclough House',
-          address1__addressLine2: 'Knutsford Road',
-          address1__town: 'Warrington',
-          address1__county: 'Cheshire',
-          address1__postcode: 'WA4 1HT'
+          addressOne__addressLine1: 'Richard Fairclough House',
+          addressOne__addressLine2: 'Knutsford Road',
+          addressOne__town: 'Warrington',
+          addressOne__county: 'Cheshire',
+          addressOne__postcode: 'WA4 1HT'
         }
       },
       {
         path: '/applicant-two',
         payload: {
           crumb: csrfToken,
-          firstName2: 'Firstname',
-          middleName2: '',
-          lastName2: 'Lastname'
+          firstNameTwo: 'Firstname',
+          middleNameTwo: '',
+          lastNameTwo: 'Lastname'
         }
       },
       {
         path: '/applicant-two-address-optional',
         payload: {
           crumb: csrfToken,
-          address2__addressLine1: '',
-          address2__addressLine2: '',
-          address2__town: '',
-          address2__county: '',
-          address2__postcode: ''
+          addressTwo__addressLine1: '',
+          addressTwo__addressLine2: '',
+          addressTwo__town: '',
+          addressTwo__county: '',
+          addressTwo__postcode: ''
         }
       }
     ]) {