PAF-129/ PAF-128 - Fix bug to add country from list and validate country textbox. (#96)

* PAF-128 & PAF-129 Added validation for phone and country textbox

[PAF- 129](https://collaboration.homeoffice.gov.uk/jira/browse/PAF-129) All 'Country' fields allow any text without the use of drop down list

[PAF-128](https://collaboration.homeoffice.gov.uk/jira/browse/PAF-128 URL's are being accepted in all free text fields

- added validation rules to all countries fields in field/index.js

- added dependent property to avoid error message when yes  is selected on another location

Tested manually

* add behaviour to unset values

Author: TemitopeAyokuHO

apps/paf/behaviours/unset-crime-country.js

@@ -0,0 +1,10 @@
+'use strict';
+
+
+module.exports = superclass => class extends superclass {
+  getValues(req) {
+    req.sessionModel.unset('crime-location-country');
+    req.sessionModel.unset('crime-another-location-country');
+    return super.getValues.apply(this, arguments);
+  }
+};

apps/paf/fields/index.js

@@ -381,6 +381,7 @@ module.exports = {
   'boat-country-departure': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -415,6 +416,7 @@ module.exports = {
   'train-country-departure': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -452,6 +454,7 @@ module.exports = {
   'airline-country-departure': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -544,6 +547,7 @@ module.exports = {
   'crime-location-country': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -591,7 +595,11 @@ module.exports = {
   },
   'crime-location-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }],
+    dependent: {
+      field: 'crime-location',
+      value: 'yes'
+    }
   },
   'crime-another-location': {
     isPageHeading: true,
@@ -607,6 +615,7 @@ module.exports = {
   'crime-another-location-country': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -654,7 +663,11 @@ module.exports = {
   },
   'crime-another-location-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }],
+    dependent: {
+      field: 'crime-another-location',
+      value: 'yes'
+    }
   },
   'report-person': {
     mixin: 'radio-group',
@@ -756,6 +769,7 @@ module.exports = {
   'report-person-location-outside-uk-address-country': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -782,6 +796,7 @@ module.exports = {
   'report-person-location-travel-to-uk-country': {
     mixin: 'select',
     className: ['typeahead', 'js-hidden'],
+    validate: ['required', 'notUrl'],
     options:
       [{
         value: '',
@@ -803,7 +818,7 @@ module.exports = {
   },
   'report-person-location-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }]
   },
   'report-person-location-email': {
     validate: ['email', { type: 'maxlength', arguments: 100 }]
@@ -887,7 +902,7 @@ module.exports = {
   },
   'report-person-occupation-company-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }]
   },
   'report-person-occupation-company-manager': {
     mixin: 'input-text',
@@ -947,7 +962,7 @@ module.exports = {
   },
   'report-person-study-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }]
   },
   'report-person-study-email': {
     validate: ['email', { type: 'maxlength', arguments: 100 }]
@@ -1204,7 +1219,7 @@ module.exports = {
   },
   'company-phone': {
     className: ['govuk-input', 'govuk-input--width-20'],
-    validate: [{ type: 'maxlength', arguments: 20 }]
+    validate: ['required', { type: 'maxlength', arguments: 20 }]
   },
   'company-email': {
     formatter: ['removespaces'],

apps/paf/index.js

@@ -15,8 +15,10 @@ const addressFormatter = require('./behaviours/address-formatter');
 const additionalPersonFormatter = require('./behaviours/additional-person-formatter');
 const vehicleToggleFormatter = require('./behaviours/vehicle-toggle-formatter');
 const SendToSQS = require('./behaviours/send-to-sqs');
+const UnsetCrimeCountry = require('./behaviours/unset-crime-country');
 const timeFormatter = require('./behaviours/time-formatter');
 
+
 module.exports = {
   name: 'paf',
   baseUrl: '/paf',
@@ -261,7 +263,8 @@ module.exports = {
           field: 'crime-location',
           value: 'yes'
         }
-      }]
+      }],
+      behaviours: [UnsetCrimeCountry]
     },
     '/crime-another-location': {
       fields: ['crime-another-location',

apps/paf/translations/src/en/validation.json

@@ -93,12 +93,19 @@
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "crime-location-phone": {
+    "required": "Enter a valid phone number",
+    "maxlength": "You can't use more than {{maxlength}} characters for your answer"
+  },
+
+  "report-person-study-phone": {
+    "required": "Enter a valid phone number",
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "crime-another-location-address-postcode": {
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "crime-another-location-phone": {
+    "required": "Enter a valid phone number",
     "maxlength": "You can't use more than {{maxlength}} numbers for your answer"
   },
   "report-person-first-name": {
@@ -135,6 +142,7 @@
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "report-person-location-phone": {
+    "required": "Enter a valid phone number",
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "report-person-location-email": {
@@ -161,6 +169,11 @@
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "report-person-occupation-company-phone": {
+    "required": "Enter a valid phone number",
+    "maxlength": "You can't use more than {{maxlength}} characters for your answer"
+  },
+  "company-phone": {
+    "required": "Enter a valid phone number",
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
   "report-person-occupation-company-manager": {
@@ -305,6 +318,34 @@
   "when-to-contact": {
     "maxlength": "You can't use more than {{maxlength}} characters for your answer"
   },
+  "boat-country-departure": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "airline-country-departure": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "crime-location-country": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "crime-another-location-country": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "train-country-departure": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "report-person-location-outside-uk-address-country": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
+  "report-person-location-travel-to-uk-country": {
+    "required": "Enter a valid country",
+    "notUrl": "Enter a valid country on the list"
+  },
   "other-info-file-upload": {
     "maxFileSize": "Select a file that is smaller than 100 MB",
     "fileType": "This file is not a valid file format you can upload to this service."