hof 21.2.0-postcode-lookup-beta.5 → 21.2.0-postcode-lookup-beta.7

package/components/postcode-lookup/index.js

@@ -343,7 +343,7 @@ module.exports = config => {
     saveValues(req, res, callback) {
       const step = req.query.step;
       if (step === 'postcode') {
-        postcode = req.form.values[`${addressFieldNamePrefix}-postcode`]?.replace(/[^\w]+/g, '$1 $2');
+        postcode = req.form.values[`${addressFieldNamePrefix}-postcode`]?.replace(/[^\w]+/g, '').replace(/^(.*)(\d)/, '$1 $2');
         this.clearAddressFieldValues(req);
         return this.postcode(req, res, err => {
           if (err) {

package/controller/validation/validators.js

@@ -180,7 +180,7 @@ module.exports = Validators = {
 
   postcodeValidation(value) {
     // eslint-disable-next-line max-len
-    return Validators.regex(value, /^(([GIRgir] ?[ ]*0[ ]*[Aa]{2}[ ]*)|((([A-Za-z][ ]*[0-9]{1,2}[ ]*)|(([A-Za-z][ ]*[A-Ha-hJ-Yj-y][ ]*[0-9][ ]*[0-9]?)[ ]*|(([A-Za-z][ ]*[0-9][ ]*[A-Za-z][ ]*)|([A-Za-z][ ]*[A-Ha-hJ-Yj-y][ ]*[0-9]?[ ]*[A-Za-z][ ]*))))[^\w]*?[ ]*[0-9][ ]*[A-Za-z][ ]*[A-Za-z][ ]*))$/);
+    return Validators.regex(value, /^[^\w]*(([GIRgir] ?[ ]*0[ ]*[Aa]{2}[ ]*)|((([A-Za-z][ ]*[0-9]{1,2}[ ]*)|(([A-Za-z][^\w]*[ ]*[A-Ha-hJ-Yj-y][^\w]*[ ]*[0-9][^\w]*[ ]*[0-9]?)[ ]*|(([A-Za-z][ ]*[0-9][ ]*[A-Za-z][ ]*)|([A-Za-z][ ]*[A-Ha-hJ-Yj-y][ ]*[0-9]?[ ]*[A-Za-z][ ]*))))[^\w]*?[ ]*[0-9][^\w]*[ ]*[A-Za-z][^\w]*[ ]*[A-Za-z][ ]*)[^\w]*)$/);
   }
 
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "21.2.0-postcode-lookup-beta.5",
+  "version": "21.2.0-postcode-lookup-beta.7",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",