From 25f0eaf07516d14dc706537d0b319036ffb567fa Mon Sep 17 00:00:00 2001 From: FrankRua Date: Wed, 23 Feb 2022 16:55:13 -0500 Subject: [PATCH] include parameters in the prereq calls --- src/layouts/vehicle-parts/part-question/part-question.vue | 4 ++-- src/layouts/vehicle-parts/vehicle-parts.vue | 8 ++++---- src/router/index.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/layouts/vehicle-parts/part-question/part-question.vue b/src/layouts/vehicle-parts/part-question/part-question.vue index 574139727..9a7e63df6 100644 --- a/src/layouts/vehicle-parts/part-question/part-question.vue +++ b/src/layouts/vehicle-parts/part-question/part-question.vue @@ -8,7 +8,6 @@
- {{ selectedTint }}
- +
@@ -67,6 +66,7 @@ export default { colorQuestionText() { return getCustomTransformValue(this.glassColorQuestion, `${this.glassLocation} ${this.glassName}`); }, + selectedPart: { get: function () { return this.modelValue; diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 5c2d290a7..06fa46341 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -3,7 +3,6 @@ - {{ glassParts }}
@@ -173,9 +172,10 @@ export default { }, }, methods: { - arePagePrerequisitesValid() { - // return store.getters.damage.isRepair !== null; - + arePagePrerequisitesValid(parameters) { + // store.getters.damage.isRepair !== null; + // parameters.PartsByGlassName.length > 0; + return true; } }, diff --git a/src/router/index.js b/src/router/index.js index b564b7e94..0195dd8d9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -55,7 +55,7 @@ const routes = [ .getRoutes() .filter((x) => x.name === to.query.fmgPage)[0].components; - if (!arePagePrerequisitesValid(component)) { + if (!arePagePrerequisitesValid(component, to.params)) { await GoToFunnelStartOn404(next); } @@ -80,7 +80,7 @@ const routes = [ .filter((x) => x.name === routeData[0].name)[0] .components.default(); - if (!arePagePrerequisitesValid(nextComponent)) { + if (!arePagePrerequisitesValid(nextComponent, to.params)) { await GoToFunnelStartOn404(next); } @@ -217,8 +217,8 @@ async function GoToFunnelStartOn404(next) { } // Checks arePagePrerequisitesValid on the component passed in. -function arePagePrerequisitesValid(component) { - return component.default.methods.arePagePrerequisitesValid(); +function arePagePrerequisitesValid(component, parameters = {}) { + return component.default.methods.arePagePrerequisitesValid(parameters); } // Reset dependant state on route change.