diff --git a/src/layouts/vehicle-year/vehicle-year.spec.js b/src/layouts/vehicle-year/vehicle-year.spec.js index 1d5096e60..d3fd4fe77 100644 --- a/src/layouts/vehicle-year/vehicle-year.spec.js +++ b/src/layouts/vehicle-year/vehicle-year.spec.js @@ -16,12 +16,12 @@ describe("vehicle-year.vue", () => { // Our mock data for our call to settleAllPromises const mockData = { - pageContentPromise: { + getPageContent: { PageHeaderWidget: [{ HeaderText: "Select a year to get started" }], RadioQuestionWidget: [{ QuestionText: "What year is your vehicle?" }], isCmsContentReady: true, }, - vehicleYearsPromise: [2023, 2022, 2021] + getVehicleYear: [2023, 2022, 2021] } // our router information needed. diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue index ec6838b10..688b400bb 100644 --- a/src/layouts/vehicle-year/vehicle-year.vue +++ b/src/layouts/vehicle-year/vehicle-year.vue @@ -27,25 +27,29 @@ export default { computed: {}, beforeRouteEnter(to, from, next) { - const layoutPromiseTable = [ + const contentPromise = fetchCmsContentForPage(to.query.fmgPage); + const getVehicleYearPromise = store.dispatch(storeActions.GET_VEHICLE_YEARS, {}); + + const promiseResultMap = [ { - key: "pageContentPromise", - promise: fetchCmsContentForPage(to.query.fmgPage), + resultKey: "getPageContent", + promise: contentPromise, }, { - key: "vehicleYearsPromise", - promise: store.dispatch(storeActions.GET_VEHICLE_YEARS, {}), + resultKey: "getVehicleYear", + promise: getVehicleYearPromise, }, ]; - settleAllPromises(layoutPromiseTable).then((resultMap) => { + settleAllPromises(promiseResultMap).then((resultMap) => { + // Call our next function to transition to the next page. next((vm) => { - vm.pageHeaderWidgets = resultMap.pageContentPromise.PageHeaderWidget[0]; - vm.radioQuestionWidgets = resultMap.pageContentPromise.RadioQuestionWidget[0]; - vm.vehicleYears = resultMap.vehicleYearsPromise; - + vm.pageHeaderWidgets = resultMap.getPageContent.PageHeaderWidget[0]; + vm.radioQuestionWidgets = resultMap.getPageContent.RadioQuestionWidget[0]; + vm.vehicleYears = resultMap.getVehicleYear; }); + }); },