From 1727b8c342df85c3b6f938dcd95622c60ba0a545 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 13:49:54 -0400 Subject: [PATCH] simplified method --- .../heritage-integration/navigation-helper.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index df18f5bc6..581d81bb6 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -26,7 +26,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita // If navigating to a specific page, and that page is not part of the vin pages. // Return that page, so that it can navigate like normal. if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { - return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); + return overrideYmmsDirectionIfNeeded(toRoute); } // If this is not a direct link to a page using fmgPage, not from Safelite.com CTA or this is a vin related page. @@ -87,13 +87,15 @@ async function getLatestPageForRedirection() { /* Overrides functionality to go to the YMMS pages in certain cases. - If this is not one of the cases, it returns the default page value passed in. + If this is not one of the cases, it returns the 'to' fmgPage value. */ /* istanbul ignore next */ -function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { +function overrideYmmsDirectionIfNeeded(toRoute) { + const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE]; + if (store.getters.payment.insuranceCoverage.isVerified) { - switch (toRoute.query[queryStrings.FMG_PAGE]) { + switch (fmgPageValue) { case fmgPageValues.VEHICLE_YEAR: case fmgPageValues.VEHICLE_MAKE: case fmgPageValues.VEHICLE_MODEL: @@ -102,11 +104,11 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { return fmgPageValues.VEHICLE_DAMAGE; } default: { - return defaultPageValue; + return fmgPageValue; } } } else { - return defaultPageValue; + return fmgPageValue; } } @@ -116,9 +118,11 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { /* istanbul ignore next */ function isVinRelatedPage(toRoute) { - return toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.VIN_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.LICENSE_PLATE_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_VEHICLES || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ESTIMATE; + const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE]; + + return fmgPageValue === fmgPageValues.VIN_LOOKUP || + fmgPageValue === fmgPageValues.LICENSE_PLATE_LOOKUP || + fmgPageValue === fmgPageValues.ADDRESS_LOOKUP || + fmgPageValue === fmgPageValues.ADDRESS_VEHICLES || + fmgPageValue === fmgPageValues.ESTIMATE; }