From 42025313b5a18f56fd726e07a0977625f636cc55 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Thu, 22 May 2025 09:57:09 -0400 Subject: [PATCH 1/3] Explicitly redirect to confirmation rather than cancelling nav. --- src/router/methods/before-each.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js index cae308ccb..dde2a45ac 100644 --- a/src/router/methods/before-each.js +++ b/src/router/methods/before-each.js @@ -49,7 +49,9 @@ export async function beforeEach(to, from) { const exceptionPages = [FUNNEL_START_PAGE.name, routeData.CONFIRMATION.name]; if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) { - return false; + return { + name: routeData.CONFIRMATION.name, + }; } } From 922b57d51c4607c897f7eb788e3456256b0071cc Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Thu, 22 May 2025 10:27:22 -0400 Subject: [PATCH 2/3] Stop some weird back behavior from iframe --- src/router/methods/before-each.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js index dde2a45ac..fb1ed2256 100644 --- a/src/router/methods/before-each.js +++ b/src/router/methods/before-each.js @@ -14,6 +14,7 @@ import { checkLogParam } from "@/helpers/debug-log-helper"; import { debugLog } from "@/helpers/debug-log-helper"; import { handleHeritageReturn } from "@/router/methods/helpers/handle-heritage-return"; import { isVirtualRoute } from "@/router/methods/helpers/is-virtual-route"; +import router from "@/router"; export async function beforeEach(to, from) { try { @@ -49,9 +50,13 @@ export async function beforeEach(to, from) { const exceptionPages = [FUNNEL_START_PAGE.name, routeData.CONFIRMATION.name]; if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) { - return { + router.push({ name: routeData.CONFIRMATION.name, - }; + }); + return false; + // return { + // name: routeData.CONFIRMATION.name, + // }; } } From 599e28294708560003d0a04679d17e10bfc78459 Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Thu, 22 May 2025 10:29:08 -0400 Subject: [PATCH 3/3] Remove commented code --- src/router/methods/before-each.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/router/methods/before-each.js b/src/router/methods/before-each.js index fb1ed2256..e742f89ff 100644 --- a/src/router/methods/before-each.js +++ b/src/router/methods/before-each.js @@ -54,9 +54,6 @@ export async function beforeEach(to, from) { name: routeData.CONFIRMATION.name, }); return false; - // return { - // name: routeData.CONFIRMATION.name, - // }; } }