From c05f76e0d73c4a3eb60dab1a6526df9d6f572ca2 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Thu, 12 May 2022 21:48:47 -0400 Subject: [PATCH 01/11] Prod --- azure-pipelines.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f11da4951..c8184f93f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -127,4 +127,45 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + cfDistributionId: $(cfDistributionId) + + # Prod Build/Deploy + - stage: Prod + condition: eq(variables['Build.SourceBranch'], variables['prod-branch'] ) + variables: + - group: FixMyGlassProd + jobs: + - deployment: prodBuildDeployment + displayName: Build and Deploy FMG - Prod + environment: digitalCloud-prod + container: node + workspace: + clean: all + strategy: + runOnce: + deploy: + steps: + - checkout: self + clean: true + - template: templates/digital/step-build-vue.yml@AzureDevOps + parameters: + buildOutputDir: dist + - template: templates/digital/step-deploy-vue.yml@AzureDevOps + parameters: + artifactName: vueDist + awsProfile: $(prodDeploymentProfile) + outputPath: /fmg/ + deployBuckets: + safelite-prod-fmg-us-east-1: + clearFolder: true + deployFolder: '' + region: us-east-1 + appDeployVariables: + __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) + __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) + __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) + __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) + indexDeployVariables: + __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) + __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) cfDistributionId: $(cfDistributionId) \ No newline at end of file From c67f86f22d8105434ad21f115105abbdcd4d5159 Mon Sep 17 00:00:00 2001 From: Donielle Austin Date: Fri, 13 May 2022 15:17:28 -0400 Subject: [PATCH 02/11] ui defect --- src/common-components/button-question/button-question.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index a2e3f9625..20ad2b2f8 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -41,7 +41,7 @@
- +
From 1985932f0ffe927639bfe37dcfc1e2852883d9a2 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 16 May 2022 10:31:56 -0400 Subject: [PATCH 03/11] CSR-561 QA Updates Fix so perfect match alert doesn't display if zip code error alert is present. --- .../license-plate-lookup.vue | 26 +++++++++++-------- src/layouts/vin-lookup/vin-lookup.vue | 21 +++++++++++---- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 5e7fdc2c1..b46a97668 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -24,7 +24,7 @@
- +
@@ -46,25 +46,25 @@ 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'; // Supporting files -import { - fetchCmsContentForPage +import { + fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { - settleAllPromises + settleAllPromises } from "@/helpers/layout-helper"; import store from "@/store"; import baseMixin from "@/mixins/base-mixin.js"; import { - storeActions + storeActions } from "@/constants/store-actions"; import { - storeMutations + storeMutations } from "@/constants/store-mutations"; import { - errorMessages + errorMessages } from "@/constants/error-messages"; -import { - navigateAfterSaveToHeritageFunnel +import { + navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { getDamageString, @@ -80,6 +80,10 @@ import { } from "vee-validate"; // DEFINE VALIDATION RULES +defineRule( + "zip-format", + regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT) +); defineRule( "license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED) @@ -256,7 +260,7 @@ export default { vinLookup.data.vehicle, zipValidation.data.state ); - + this.navigateForward(); }, navigateForward() { @@ -335,4 +339,4 @@ export default { loadingModal, }, }; - \ No newline at end of file + diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 6e3a83653..aeb9e5d8e 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -41,7 +41,7 @@ mask="#####" isRequired disableAutoFill - validationRules="zip-required" + validationRules="zip-required|zip-format" /> @@ -97,10 +97,11 @@ /> Date: Mon, 16 May 2022 10:59:18 -0400 Subject: [PATCH 04/11] CSR-572 fix so proper alert shows based on VIN. --- src/layouts/vin-lookup/vin-lookup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index aeb9e5d8e..cc7bd3c16 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -77,7 +77,7 @@ :manualHeadline="MatchedDifferentVehicleAlertHeader" :manualCopy="MatchedDifferentVehicleAlertBody" v-model="customAlertData" - v-if="isCarIdDifferent" + v-if="isCarIdDifferent && !vinNotFound" alertClass="alert-warning" /> Date: Mon, 16 May 2022 12:32:25 -0400 Subject: [PATCH 05/11] CSR-583 Save vin when there's a match in address with multiple vehicles --- src/layouts/address-lookup/address-lookup.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index a9cf1bd53..d317c0f6d 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -286,9 +286,11 @@ export default { } } else if (carsFound.length > 1) { // if multiple cars were found - if (carsFound.find(car => car.vehicle.carId === carEntered.carId)) { + const matchingCars = carsFound.find(car => car.vehicle.carId === carEntered.carId); + if (matchingCars) { // and one of them matches the car id entered this.$refs.loadingModal.showModal(); + this.updateVehicleInfo(matchingCars.vin, matchingCars.vehicle); navigateAfterSaveToHeritageFunnel(this.$route); } else { // and there is no match, navigate to "address-vehicles" page From 3ffd41ff0e9d8379a94493af74939aad6b773140 Mon Sep 17 00:00:00 2001 From: Katie Date: Mon, 16 May 2022 12:34:04 -0400 Subject: [PATCH 06/11] CSR-583 Rename variable --- src/layouts/address-lookup/address-lookup.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index d317c0f6d..cedc140d2 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -286,11 +286,11 @@ export default { } } else if (carsFound.length > 1) { // if multiple cars were found - const matchingCars = carsFound.find(car => car.vehicle.carId === carEntered.carId); - if (matchingCars) { + const matchingCar = carsFound.find(car => car.vehicle.carId === carEntered.carId); + if (matchingCar) { // and one of them matches the car id entered this.$refs.loadingModal.showModal(); - this.updateVehicleInfo(matchingCars.vin, matchingCars.vehicle); + this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle); navigateAfterSaveToHeritageFunnel(this.$route); } else { // and there is no match, navigate to "address-vehicles" page From a512e45d9b8da509b56299828119a934490fb9f4 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 16 May 2022 13:49:04 -0400 Subject: [PATCH 07/11] CSR-572 fix display of improper alert based on correct/incorrect vin match to vehicle. --- src/layouts/vin-lookup/vin-lookup.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index cc7bd3c16..1b1452fd5 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -77,7 +77,7 @@ :manualHeadline="MatchedDifferentVehicleAlertHeader" :manualCopy="MatchedDifferentVehicleAlertBody" v-model="customAlertData" - v-if="isCarIdDifferent && !vinNotFound" + v-if="isCarIdDifferent && !vinNotFound && !perfectMatchNewVinAlert" alertClass="alert-warning" /> Date: Mon, 16 May 2022 13:59:24 -0400 Subject: [PATCH 08/11] CSR-550 use svg for loading modal --- src/assets/img/FMGTransitionAnimation.svg | 1 + .../loading-modal/loading-modal.vue | 21 ++++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) create mode 100644 src/assets/img/FMGTransitionAnimation.svg diff --git a/src/assets/img/FMGTransitionAnimation.svg b/src/assets/img/FMGTransitionAnimation.svg new file mode 100644 index 000000000..b3548305d --- /dev/null +++ b/src/assets/img/FMGTransitionAnimation.svg @@ -0,0 +1 @@ +Assessing your damageFinding your glassGenerating your quote \ No newline at end of file diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue index 741800792..31058951e 100644 --- a/src/common-components/loading-modal/loading-modal.vue +++ b/src/common-components/loading-modal/loading-modal.vue @@ -3,14 +3,7 @@
- Loading - -
-
- Please wait... -
-
- This process can take up to 20 seconds. + Loading
@@ -60,23 +53,15 @@ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2); border-radius: 4px; top: 48px; - height: 246px; + height: 186px; width: 327px; } - .loading-modal-body { - position: relative; - padding: 20px 10px; - } - .loading-modal-text { padding: 0 24px 0 24px; } .modal-icon-container { - position: relative; - width: 75px; - height: 75px; margin: 15px auto; padding-bottom: 26px; } @@ -85,6 +70,8 @@ position: absolute; vertical-align: middle; border: 0; + width: 327px; + height: 186px; left: 50%; top: 50%; transform: translate(-50%, -50%); From 9d5d51cb57b64f1726ef80993a2087314a1a77a7 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 16 May 2022 15:02:10 -0400 Subject: [PATCH 09/11] Turn off active zip check. --- src/layouts/license-plate-lookup/license-plate-lookup.vue | 6 +----- src/layouts/vin-lookup/vin-lookup.vue | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index b46a97668..3fa8a953c 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -24,7 +24,7 @@
- +
@@ -80,10 +80,6 @@ import { } from "vee-validate"; // DEFINE VALIDATION RULES -defineRule( - "zip-format", - regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT) -); defineRule( "license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 1b1452fd5..5ae8a913b 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -41,7 +41,7 @@ mask="#####" isRequired disableAutoFill - validationRules="zip-required|zip-format" + validationRules="zip-required" /> @@ -144,10 +144,6 @@ defineRule( "zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED) ); -defineRule( - "zip-format", - regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT) -); defineRule( "email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED) From 7687b18dea91594309d1e0e5701487b27b505392 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 16 May 2022 17:31:25 -0400 Subject: [PATCH 10/11] Fix spacing between toggle text and error. --- .../textbox-question/textbox-question.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index 3919388ce..7f43c1e58 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -2,7 +2,7 @@
- -
+
{{ errorMessage }}
@@ -60,7 +60,7 @@ export default { let initialValue; switch (typeof modelValue) { - case "number": + case "number": initialValue = modelValue; break; default: @@ -182,4 +182,4 @@ export default { display: none; } } - \ No newline at end of file + From 09a3d1e26acae9d18631afc3a731b85d30bf9c7d Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 16 May 2022 18:18:12 -0400 Subject: [PATCH 11/11] Fix spacing between input and alert. --- src/layouts/vin-lookup/vin-lookup.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 5ae8a913b..c0308eb38 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -58,14 +58,14 @@