From 3ed110485cda95706fa0c16ba6bbccf6edec6d52 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 11:08:05 -0400 Subject: [PATCH 1/6] Fixing adas link not working --- src/helpers/cms-content-helper.js | 8 +++++++- .../loading-modal/loading-modal.vue | 1 + .../coverage-statement/coverage-statement.vue | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 12bd7043..473c7f2b 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -463,7 +463,13 @@ export function setupModalLinks(context) { for (const element of elements) { const target = element.getAttribute('modalTarget'); if (target) { - element.addEventListener('click', () => context.$refs[target].openModal()); + console.log('click event'); + console.log(target) + console.log(element) + element.addEventListener('click', () =>{ + console.log('hi'); + context.$refs[target].openModal() + }); } } }); diff --git a/src/iss-components/loading-modal/loading-modal.vue b/src/iss-components/loading-modal/loading-modal.vue index 02deed69..5c1cfb47 100644 --- a/src/iss-components/loading-modal/loading-modal.vue +++ b/src/iss-components/loading-modal/loading-modal.vue @@ -54,6 +54,7 @@ export default { if (evt.persisted) { setTimeout(() => { window.location.reload(); + console.log('reload'); }, 10); } }, diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index ccd03999..a1c3eec2 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -217,6 +217,8 @@ export default { return this.getHeaderTextFromCms('NextStepsWidget'); }, nextStepsBody() { + console.log('next steps body'); + return this.getBodyTextFromCms('NextStepsWidget')?.replaceAll('{custom:damage}', this.damageText); }, continueWithSchedulingBodyText() { @@ -314,10 +316,17 @@ export default { } else { this.$refs.siteFooter.updateButtonText('Continue'); } + }, + nextStepsBody(newValue, oldValue) { + console.log('watching next step'); + if (newValue !== oldValue){ + setupModalLinks(this); + } } }, async mounted() { this.$refs.loadingModal.showModal(); + console.log("mounted"); setupModalLinks(this); const vm = this; if (this.policyLookupSuccessful @@ -325,6 +334,7 @@ export default { && this.coveredAndServicePriceAboveOrEqualDeductible) { await useMainStore().registerClaim()?.catch(() => {}); } + //setupModalLinks(this); vm.$refs.loadingModal.hideModal(); }, methods: { @@ -374,9 +384,9 @@ export default { ); } }, - openModalAction(modalName) { - this.$refs[modalName.args].openModal(); - }, + // openModalAction(modalName) { + // this.$refs[modalName.args].openModal(); + // }, processIfStatements, getHeaderTextFromCms(cmsWidgetName) { const header = this.getCmsContent(cmsWidgetName, 'HeaderText'); From 61583f5345c6f331fd16f41a8dd6abf0e958ee49 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 11:09:42 -0400 Subject: [PATCH 2/6] Removing comments --- src/helpers/cms-content-helper.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 473c7f2b..12bd7043 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -463,13 +463,7 @@ export function setupModalLinks(context) { for (const element of elements) { const target = element.getAttribute('modalTarget'); if (target) { - console.log('click event'); - console.log(target) - console.log(element) - element.addEventListener('click', () =>{ - console.log('hi'); - context.$refs[target].openModal() - }); + element.addEventListener('click', () => context.$refs[target].openModal()); } } }); From d1d514adfd76c7c483dc7c5a34b8fec4a8f51b56 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 11:11:07 -0400 Subject: [PATCH 3/6] Remove comment --- src/iss-components/loading-modal/loading-modal.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/iss-components/loading-modal/loading-modal.vue b/src/iss-components/loading-modal/loading-modal.vue index 5c1cfb47..02deed69 100644 --- a/src/iss-components/loading-modal/loading-modal.vue +++ b/src/iss-components/loading-modal/loading-modal.vue @@ -54,7 +54,6 @@ export default { if (evt.persisted) { setTimeout(() => { window.location.reload(); - console.log('reload'); }, 10); } }, From 3a70880471a49935b173576a9d050b38a2b84024 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 11:32:24 -0400 Subject: [PATCH 4/6] Clean up --- src/layouts/coverage-statement/coverage-statement.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index a1c3eec2..626187fd 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -318,7 +318,6 @@ export default { } }, nextStepsBody(newValue, oldValue) { - console.log('watching next step'); if (newValue !== oldValue){ setupModalLinks(this); } @@ -326,7 +325,6 @@ export default { }, async mounted() { this.$refs.loadingModal.showModal(); - console.log("mounted"); setupModalLinks(this); const vm = this; if (this.policyLookupSuccessful @@ -334,7 +332,6 @@ export default { && this.coveredAndServicePriceAboveOrEqualDeductible) { await useMainStore().registerClaim()?.catch(() => {}); } - //setupModalLinks(this); vm.$refs.loadingModal.hideModal(); }, methods: { @@ -384,9 +381,6 @@ export default { ); } }, - // openModalAction(modalName) { - // this.$refs[modalName.args].openModal(); - // }, processIfStatements, getHeaderTextFromCms(cmsWidgetName) { const header = this.getCmsContent(cmsWidgetName, 'HeaderText'); From df94c4dda1d6781b8f865ffabd65be56a106eb8a Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 11:34:27 -0400 Subject: [PATCH 5/6] Remove comment --- src/layouts/coverage-statement/coverage-statement.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 626187fd..ba9a854b 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -217,8 +217,6 @@ export default { return this.getHeaderTextFromCms('NextStepsWidget'); }, nextStepsBody() { - console.log('next steps body'); - return this.getBodyTextFromCms('NextStepsWidget')?.replaceAll('{custom:damage}', this.damageText); }, continueWithSchedulingBodyText() { From be499757b00396c556346174523524ee23941214 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 12 Sep 2023 14:24:37 -0400 Subject: [PATCH 6/6] Updating only recal modal link when appropriate --- src/helpers/cms-content-helper.js | 14 ++++++++++++++ .../coverage-statement/coverage-statement.vue | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 12bd7043..861eacec 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -469,6 +469,20 @@ export function setupModalLinks(context) { }); } +/** + * + * @param context + * @param desiredTarget + */ +export function setupModalLink(context, desiredTarget) { + context.$nextTick(() => { + const element = document.querySelector(`[modalTarget=${desiredTarget}]`); + if (element) { + element.addEventListener('click', () => context.$refs[desiredTarget].openModal()); + } + }); +} + /** * * @param copy diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index ba9a854b..9cddedd6 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -112,7 +112,7 @@ import buttonQuestion from '@/digital-components/button-question/button-question import loadingModal from '@/iss-components/loading-modal/loading-modal.vue'; // Import Supporting Files -import { fetchCmsContentForPage, setupModalLinks, processIfStatements } from '@/helpers/cms-content-helper.js'; +import { fetchCmsContentForPage, setupModalLinks, setupModalLink, processIfStatements } from '@/helpers/cms-content-helper.js'; import settleAllPromises from '@/helpers/layout-helper.js'; import { getDamageString } from '@/helpers/damage-helper.js'; import { useMainStore } from '@/store/index.js'; @@ -317,7 +317,7 @@ export default { }, nextStepsBody(newValue, oldValue) { if (newValue !== oldValue){ - setupModalLinks(this); + setupModalLink(this, "RecalModal"); } } },