From 670372c6083aa3c65af86b4f48179af9ba0af415 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 17 May 2022 15:29:40 -0400 Subject: [PATCH 1/6] CSR-584: fix email regex to force dot character --- .../address-lookup/customer-questions/customer-questions.vue | 2 +- src/layouts/license-plate-lookup/license-plate-lookup.vue | 2 +- src/layouts/vin-lookup/vin-lookup.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue index 0eb82d91b..ee576de0b 100644 --- a/src/layouts/address-lookup/customer-questions/customer-questions.vue +++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue @@ -29,7 +29,7 @@ import { errorMessages } from "@/constants/error-messages"; defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED)); defineRule("last-name-required", required(errorMessages.LAST_NAME_REQUIRED)); defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED)); -defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT)); +defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT)); export default ({ name: "customer-questions", diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index b46a97668..d8b515b5f 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -96,7 +96,7 @@ defineRule( defineRule( "email-address-format", regex( - /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, + /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT ) ); diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index aeb9e5d8e..704f20f42 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -155,7 +155,7 @@ defineRule( defineRule( "email-address-format", regex( - /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, + /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT ) ); From aac13a76bff0a5a2206aa9045f9dd8141a14efae Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 18 May 2022 14:54:18 -0400 Subject: [PATCH 2/6] CSR-584: add semiAggressive option to validation --- .../textbox-question/textbox-question.vue | 173 +++++++++--------- src/layouts/address-lookup/address-lookup.vue | 6 +- .../address-questions/address-questions.vue | 144 +++++++++------ .../customer-questions/customer-questions.vue | 28 ++- .../license-plate-lookup.vue | 55 +++++- src/layouts/vin-lookup/vin-lookup.vue | 1 + 6 files changed, 256 insertions(+), 151 deletions(-) diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index 849d99ab5..1c92c6b82 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -17,6 +17,8 @@ autocomplete="do-not-autofill" :class="[hasIcon ? 'has-icon' : '', iconRight ? 'icon-right' : '']" :validationRules="validationRules" + @change="handleChange" + @blur="handleChange" />
{{ errorMessage }} @@ -25,39 +27,39 @@ diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 454a17b83..445bddf16 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -72,10 +72,8 @@ import alert from "@/ux-components/alert/alert"; import textboxQuestion from "@/common-components/textbox-question/textbox-question"; import loadingModal from '@/common-components/loading-modal/loading-modal.vue'; -import { Form } from "vee-validate"; -import { defineRule } from "vee-validate"; -import { required } from "@/helpers/validation-rules"; -import { regex } from "@/helpers/validation-rules"; +import { Form, defineRule } from "vee-validate"; +import { required, regex } from "@/helpers/validation-rules"; import { errorMessages } from "@/constants/error-messages"; // Supporting files diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue index 8a677c14c..98c0ca927 100644 --- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue +++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue @@ -1,23 +1,59 @@ From 7d41296a71095e3de7fc2b46c0023f7a17789af6 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Wed, 18 May 2022 16:46:10 -0400 Subject: [PATCH 4/6] removed experiment forcing code --- src/router/index.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index f11bd4228..397802063 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -214,13 +214,6 @@ function navigateToUrl(url, optionalQuery = {}) { externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]); } - ///////////////////////////////////////////////////// - // TEMP CODE FOR TESTING WITH SPECIFIC EXPERIMENTS // - ///////////////////////////////////////////////////// - if (externalUrl.search.indexOf("corid=") != -1) - externalUrl.search = externalUrl.search + '&experiments=CollectEmailOnQuote=CollectEmailOnQuote_V1=YesCollectEmail_TEST1=true,RemoveServiceAreaPage=ServAreaRemoval_V7=ServAreaNoRemove_V7_TEST=true,VINeducationV2=VINeducation_V2=NoShowVINmodalV2_CONTROL=true,ServicePackages=ServicePackages_V1=NoShowPackages_CONTROL=true,PhotoUploadRedesign=PhotoUploadRedesign_V1=CurrentPhotoUpload_CONTROL=true,ScheduleDetailsServiceType=ScheduleBeforeServiceType_V1=ServTypeThenSched_CONTROL=true'; - ///////////// END TEMP CODE ///////////////////////// - window.location.assign(externalUrl); } From 4dd80887a4af734ed706ddb2174a66b12265e97d Mon Sep 17 00:00:00 2001 From: FrankRua Date: Wed, 18 May 2022 17:16:00 -0400 Subject: [PATCH 5/6] spaces in LP fix --- src/layouts/license-plate-lookup/license-plate-lookup.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index de5500a59..3d65717cf 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -322,10 +322,7 @@ export default { }); }, lookupVin(plate, state) { - return baseMixin.methods.dispatchStoreAction( - storeActions.LOOKUP_VIN_BY_PLATE, - { licensePlate: plate, licenseState: state } - ); + return baseMixin.methods.dispatchStoreAction(storeActions.LOOKUP_VIN_BY_PLATE,{ licensePlate: plate, licenseState: state }, false); }, updateCustomerInfo(vin, vehicleInfo, registrationState) { if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) { From b90f6a46bfa2e300dd64fdce72e804bc83e52336 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 19 May 2022 08:40:46 -0400 Subject: [PATCH 6/6] force page reload on back button --- src/common-components/loading-modal/loading-modal.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue index 7beb113a4..030732734 100644 --- a/src/common-components/loading-modal/loading-modal.vue +++ b/src/common-components/loading-modal/loading-modal.vue @@ -24,7 +24,18 @@ const FMGAnimatedTransition = require("@/assets/img/FMGTransitionAnimation.svg") }, methods: { showModal() { + + //Display modal this.isModalVisible = true; + + //Force page reload on back button + window.addEventListener("pageshow", function(evt) { + if(evt.persisted){ + setTimeout(function(){ + window.location.reload(); + }, 10); + } +}, false); }, }, };