From 00d62b483fa73470bc132de6348abd7b720351f7 Mon Sep 17 00:00:00 2001 From: Katie Date: Wed, 10 Aug 2022 09:18:41 -0400 Subject: [PATCH] CSR-690 Cleanup --- src/global-methods.js | 7 +------ .../navigation-helper.spec.js | 1 - .../heritage-integration/session-helper.js | 16 +--------------- .../capability-questions.vue | 2 +- .../molding-questions/molding-questions.vue | 2 +- src/layouts/vehicle-make/vehicle-make.vue | 6 +----- src/router/index.js | 2 -- 7 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/global-methods.js b/src/global-methods.js index 4a2026764..ffda1e77f 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -9,12 +9,7 @@ import { headerKeys } from "@/constants/header-keys"; export default { callHttpClient({ method, endpoint, payload, logApiCall = true }) { return new Promise((resolve, reject) => { - // const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; - - let cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; - if (endpoint.includes("/order/")) - cfDistroUrl = "https://localhost:44346" - + const cfDistroUrl = applicationConfig.CONSUMER_CF_DISTRO; const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass" }); const headers = { [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings) diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js index 8cc72284b..85e3878ff 100644 --- a/src/helpers/heritage-integration/navigation-helper.spec.js +++ b/src/helpers/heritage-integration/navigation-helper.spec.js @@ -9,7 +9,6 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values"; import store from "@/store"; import router from "@/router"; -import { lazy } from "yup"; // Mock Lazy Load jest.mock("@/router/dynamic-routing/component-loader.js", () => ({ diff --git a/src/helpers/heritage-integration/session-helper.js b/src/helpers/heritage-integration/session-helper.js index a5118a21d..b71602f3c 100644 --- a/src/helpers/heritage-integration/session-helper.js +++ b/src/helpers/heritage-integration/session-helper.js @@ -43,18 +43,4 @@ export function getDateForSavedSessionTimeout() { const currentDate = new Date(new Date().toUTCString()) currentDate.setDate(currentDate.getDate() + applicationConfig.SAVED_SESSION_TIMEOUT_DAYS) return currentDate.toUTCString(); -} - -/** Function to get saved session timeout date based on values in the cookie */ -// function getSavedSessionTimeoutDate() { -// let lastTouched = new Date(getFunnelCookie()?.LastTouched); -// lastTouched = lastTouched ? lastTouched : new Date().toUTCString(); -// let savedSessionTimeoutDate = lastTouched; -// savedSessionTimeoutDate.setDate(savedSessionTimeoutDate.getDate() + applicationConfig.SAVED_SESSION_TIMEOUT_DAYS); - -// // const test = lastTouched -// // ? lastTouched.setDate(lastTouched.getDate() + applicationConfig.SAVED_SESSION_TIMEOUT_DAYS) -// // : getDateForSavedSessionTimeout(); - -// return savedSessionTimeoutDate; -// } \ No newline at end of file +} \ No newline at end of file diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index a29aa3779..69fc8aad5 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -112,7 +112,7 @@ export default { }, methods: { arePagePrerequisitesValid() { - return false; // TODO - DO TRUE TEST OF PAGEDATA + return true; // TODO - DO TRUE TEST OF PAGEDATA // return Object.keys(store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS)).length > 0; }, showThisPartQuestionChain(part, i) { diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue index f575c9240..d2b469a36 100644 --- a/src/layouts/molding-questions/molding-questions.vue +++ b/src/layouts/molding-questions/molding-questions.vue @@ -115,7 +115,7 @@ export default { }, methods: { arePagePrerequisitesValid() { - return false; // TODO - DO TRUE TEST OF PAGEDATA + return true; // TODO - DO TRUE TEST OF PAGEDATA // return Object.keys(store.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)).length > 0; }, showThisPartQuestionChain(part, i) { diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue index 4a2eff8f9..e769c4290 100644 --- a/src/layouts/vehicle-make/vehicle-make.vue +++ b/src/layouts/vehicle-make/vehicle-make.vue @@ -76,11 +76,7 @@ export default { ); }, arePagePrerequisitesValid() { - if (store.getters.vehicle.year){ - return true; - } - - return false; + return store.getters.vehicle.year != null; }, }, diff --git a/src/router/index.js b/src/router/index.js index f1f9a2f69..525664dd5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -207,8 +207,6 @@ function navigateToUrl(url, optionalQuery = {}) { externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]); } - externalUrl.searchParams.append("experiments", "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true"); - window.location.assign(externalUrl); }