PCLU update (#384)

* SB update for PCLU updates

* Remove postcode validation now handled within the PCLU itself

Author: AndyEPhipps

package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.11.5",
     "@comicrelief/pattern-lab": "7.58.6",
-    "@comicrelief/storybook": "1.33.3",
+    "@comicrelief/storybook": "1.34.0",
     "@snyk/protect": "^1.986.0",
     "autoprefixer": "10.0.0",
     "axios": "^0.21.1",

src/pages/GiftAid/GiftAid.js

@@ -19,8 +19,6 @@ import {
   scrollToError,
   getPathParams,
   hiddenFields,
-  GBPostCodePattern,
-  OverseasPostCodePattern,
   justInTimeLinkText,
   validateForm,
   getFieldValidations,
@@ -40,12 +38,6 @@ function GiftAid(props) {
   const [formValidityState, setFormValidityState] = useState(initialFormValidity); // intitialise form validity states
   const [fieldValidation, setFieldValidation] = useState(getFieldValidations(update)); // intitialise field validation state based on form type
   const [isSubmitting, setIsSubmitting] = useState(false);
-  // As GB is the default country, set the matching postcode regex pattern as default too
-  const [currentPostcodePattern, setCurrentPostcodePattern] = useState(GBPostCodePattern);
-
-  // Simple counter to allow us to trigger the child 'revalidate postcode' function after regex updates
-  const [postcodeRevalidate, setPostcodeRevalidate] = useState(0);
-
   const inputRef = useRef(null);
 
   // initialise URL token state if available
@@ -79,29 +71,6 @@ function GiftAid(props) {
     }
   }, []);
 
-  /**
-  * Crummy workaround to trigger a revalidation
-  * as the bespoke validation here has issues
-  */
-    const revalidatePostcode = () => {
-      // Store the current postcode to re-add
-      const postcodeField = document.getElementById("field-input--postcode");
-      const currentPostcodeValue = postcodeField.value;
-      const blurEvent = new Event('blur', { bubbles: true });
-
-      // Temporarily reset the postcode field and programmatically
-      // trigger a blur event to make the validation take notice
-      postcodeField.value = '';
-      postcodeField.dispatchEvent(blurEvent);
-
-      setTimeout(() => {
-        // Immediately re-add the value and trigger another blur event
-        postcodeField.value = currentPostcodeValue;
-        postcodeField.dispatchEvent(blurEvent);
-      }, 1);
-    };
-
-
   /**
    * Fetches decrypted MSISDN using token
    * @param cipherText
@@ -151,20 +120,6 @@ function GiftAid(props) {
       (thisFieldsState.fieldValidation !== thisFieldsPreviousState.fieldValidation);
 
     if ((thisFieldsPreviousState && isUpdatedState) || marketingConsentFieldsChanged === true) {
-      
-      // Update postcode regex is 'Country' select value has changed
-      if (thisFieldsName === 'country' && thisFieldsState.value !== thisFieldsPreviousState.value){
-
-        // Ignore the on-mount validation call
-        if (thisFieldsPreviousState.value !== undefined) {
-          // Switch regex patterns accordingly; if a non-GB value, this undefined value
-          // will cause the PCLU to fallback to its default, much looser regex
-          setCurrentPostcodePattern(thisFieldsState.value === 'GB' ? GBPostCodePattern : undefined);
-          // Call our workaround to trigger a revalidation of the PCLU postcode field
-          revalidatePostcode();
-        }
-      }
-
         // Reset url transaction Id state
         if (thisFieldsName === 'transactionId' && thisFieldsState.valid) {
           setFormValidityState({
@@ -226,7 +181,6 @@ function GiftAid(props) {
   const contextProps = {
     urlTransactionId,
     hiddenFields,
-    currentPostcodePattern,
     justInTimeLinkText,
     formValidityState,
     fieldValidation,
@@ -249,7 +203,6 @@ function GiftAid(props) {
         <SubmitForm
           title="Submit Form"
           msisdn={msisdn}
-          postcodeRevalidate={postcodeRevalidate}
         />
       )}
     </FormProvider>

src/pages/GiftAid/SubmitForm/SubmitForm.js

@@ -34,7 +34,6 @@ function SubmitForm(props) {
   const {
     refs,
     setFieldValidity,
-    currentPostcodePattern,
     justInTimeLinkText,
     formValidityState,
     fieldValidation,
@@ -99,8 +98,6 @@ function SubmitForm(props) {
         ref={refs}
         label="Home address"
         showErrorMessages={formValidityState.showErrorMessages}
-        postcodePattern={currentPostcodePattern}
-        invalidErrorText="Please enter a valid UK postcode, using a space and capital letters"
         isAddressValid={
           (validation) => {
             Object.keys(validation).map(key => setFieldValidity(validation[key], key));

src/pages/GiftAid/UpdateForm/UpdateForm.js

@@ -25,7 +25,6 @@ function UpdateForm(props) {
   const {
     refs,
     setFieldValidity,
-    currentPostcodePattern,
     justInTimeLinkText,
     formValidityState,
     fieldValidation,
@@ -83,8 +82,6 @@ function UpdateForm(props) {
           ref={refs}
           label="Home address"
           showErrorMessages={formValidityState.showErrorMessages}
-          postcodePattern={currentPostcodePattern}
-          invalidErrorText="Please enter a valid UK postcode, using a space and capital letters"
           isAddressValid={
             (validation) => {
               Object.keys(validation).map(key => setFieldValidity(validation[key], key));

src/pages/GiftAid/utils/Utils.js

@@ -138,12 +138,6 @@ const DONATION_TYPES = {
 */
 export const hiddenFields = ['field-input--address1', 'field-input--town', 'field-wrapper--country'];
 
-/*
-* REGEX for postcode fields:
-*/
-// HMRC-approved, GB-only pattern to ensure no invalid GiftAid submissions can slip through
-export const GBPostCodePattern = '(GIR 0AA)|((([A-Z][0-9][0-9]?)|(([A-Z][A-HJ-Y][0-9][0-9]?)|(([A-Z][0-9][A-Z])|([A-Z][A-HJ-Y][0-9]?[A-Z])))) [0-9][A-Z]{2})';
-
 /*
 * Just In Time Link Text
 *

yarn.lock

@@ -1274,10 +1274,10 @@
     susy "^2.2.12"
     underscore.string "3.3.5"
 
-"@comicrelief/storybook@1.33.3":
-  version "1.33.3"
-  resolved "https://registry.yarnpkg.com/@comicrelief/storybook/-/storybook-1.33.3.tgz#780ff6e9656b53098218918027f597e5ed334995"
-  integrity sha512-LbiW0wQ6+WlcKuXGQIy+z30uC1lJfDlnfp/J8r5+ku8ibV+fiJYilFNOC+gzDV2srWZhzEpTdf4/QH829TqQnQ==
+"@comicrelief/storybook@1.34.0":
+  version "1.34.0"
+  resolved "https://registry.yarnpkg.com/@comicrelief/storybook/-/storybook-1.34.0.tgz#ac355b601280a45c076f7980806cc9f39f480373"
+  integrity sha512-/eK018inDqKdXhgkab40qwfI7VtQhtF46wjpMWtwkfNz3rJ/dA/utf2FsDZNVFegVw5sj1gJILXCgyyi7Rv26g==
   dependencies:
     "@comicrelief/pattern-lab" "*"
     "@snyk/protect" "^1.1060.0"