From 047d8adacfd1ffbb77e4e10655d48a57ccf0f0bf Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 11 Apr 2022 09:33:33 -0400 Subject: [PATCH 01/26] CSR-478 Block keyboard input after button click --- src/layouts/vehicle-damage/vehicle-damage.vue | 2 ++ src/mixins/base-mixin.js | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index b84e2fbfa..d9cdd1f0f 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -258,6 +258,8 @@ export default { }, async forwardButtonAction() { + this.blockKeyboard(); + store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair); if (this.isWindshieldRepair){ diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index b5a954c43..7160cc3d9 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -25,6 +25,11 @@ export default { return store.dispatch(type, payload); }, + blockKeyboard(){ + document.onkeydown = function (e) { + return false; + }; + }, savePageDataToStore(page, data){ store.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: data }); }, From b6966aade08cc2f7ae83907b82252166101ca4fe Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 11 Apr 2022 10:11:47 -0400 Subject: [PATCH 02/26] CSR-478 rename and add mock for test --- src/layouts/vehicle-damage/vehicle-damage.spec.js | 1 + src/layouts/vehicle-damage/vehicle-damage.vue | 2 +- src/mixins/base-mixin.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index fe3a4aa51..282c30d86 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -814,6 +814,7 @@ function setupMocks({ damageLocationQuestion.methods.initializeComponent; wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; + wrapper.vm.blockKeyDownInputFromKeyboard = baseMixin.methods.blockKeyDownInputFromKeyboard; return { wrapper, apiPromise }; } diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index d9cdd1f0f..f9207e710 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -258,7 +258,7 @@ export default { }, async forwardButtonAction() { - this.blockKeyboard(); + this.blockKeyDownInputFromKeyboard(); store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair); diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 7160cc3d9..6b3658089 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -25,7 +25,7 @@ export default { return store.dispatch(type, payload); }, - blockKeyboard(){ + blockKeyDownInputFromKeyboard(){ document.onkeydown = function (e) { return false; }; From 710898a3fe58ecb71d9d6f401a6381a2789f81d9 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 11 Apr 2022 11:03:31 -0400 Subject: [PATCH 03/26] CSR-478 reset keydown after navigation --- src/router/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 778c55cfc..1caa4f3af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,6 +34,8 @@ const routes = [ path: "/", name: "root", async beforeEnter(to, from, next) { + document.onkeydown = null; + // If we have no query string, or we don't have the FmgPage query string. if (to.query.fmgPage === undefined) { await GoToFunnelStartOn404(next); From cc2e00b88d1af1789745ac8b836c768182f12db3 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 11 Apr 2022 13:51:52 -0400 Subject: [PATCH 04/26] parsed string for int to make consistent with documentation --- src/layouts/vehicle-damage/vehicle-damage.vue | 2 +- src/layouts/vehicle-year/vehicle-year.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index f9207e710..e5fd04523 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -278,7 +278,7 @@ export default { navigateForward(partsData){ // CSR-98 TEMP - const vehicleYearsToShowHeritageFunnel = [ "2001", "2002", "2010" ]; + const vehicleYearsToShowHeritageFunnel = [ 2001, 2002, 2010 ]; if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) { navigateToHeritageFunnel(); return; diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue index 9e3dd7e2f..305cef7fc 100644 --- a/src/layouts/vehicle-year/vehicle-year.vue +++ b/src/layouts/vehicle-year/vehicle-year.vue @@ -64,8 +64,8 @@ export default { watch: { selectedYear(year) { - - this.$store.commit(this.storeMutations.UPDATE_YEAR, year); + const parsedYear = parseInt(year); + this.$store.commit(this.storeMutations.UPDATE_YEAR, parsedYear); this.$router.navigateAfterSave( this.navigationScenarios.SELECTED_YEAR, this.$route From c2e39d8b1be6f32dcadf87b8123a08fa0d2de85b Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 11 Apr 2022 14:48:21 -0400 Subject: [PATCH 05/26] CSR-482 defect the cms returns styling html embedded for the content and it is displaying the html in the alert box --- src/ux-components/alert/alert.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue index 515658e16..e8f8848a7 100644 --- a/src/ux-components/alert/alert.vue +++ b/src/ux-components/alert/alert.vue @@ -5,7 +5,7 @@ :class="[isDismissible ? 'alert-dismissible' : '', this.alertClass]" >

{{ alertHeadline }}

-

{{ alertCopy }}

+