From 80a4de2cc796aaf8b4c5220cf505e880f0244bb6 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 13 Jan 2022 11:56:04 -0500 Subject: [PATCH] Updating method and action name and awaiting data before page change on vehicle style page --- src/constants/store-actions.js | 2 +- src/layouts/vehicle-style/vehicle-style.spec.js | 4 ++-- src/layouts/vehicle-style/vehicle-style.vue | 9 +++++---- src/store/index.js | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index c6f1a23a9..d052bed32 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -5,7 +5,7 @@ const storeActions = { GET_VEHICLE_MAKES: "getVehicleMakes", GET_VEHICLE_MODELS: "getVehicleModels", GET_VEHICLE_STYLES: "getVehicleStyles", - GET_VEHICLE: "getVehicle", + SET_VEHICLE: "setVehicle", GET_DAMAGE_OPTIONS: "getDamageOptions", GET_EVOX_IMAGE: "getEvoxImage", LOOKUP_VEHICLE_BY_YMMS: "lookupVehicleByYmms", diff --git a/src/layouts/vehicle-style/vehicle-style.spec.js b/src/layouts/vehicle-style/vehicle-style.spec.js index 7d3bcaca7..31c1b2487 100644 --- a/src/layouts/vehicle-style/vehicle-style.spec.js +++ b/src/layouts/vehicle-style/vehicle-style.spec.js @@ -142,7 +142,7 @@ describe("vehicle-style.vue", () => { }, actionList: [ { - actionName: storeActions.GET_VEHICLE, + actionName: storeActions.SET_VEHICLE, data: 'mockData' } ] @@ -151,7 +151,7 @@ describe("vehicle-style.vue", () => { //Act vehicleStyle.beforeRouteEnter.call(wrapper.vm, { query: { fmgPage: "vehicle-style" } }, undefined, (c) => c(wrapper.vm)); - wrapper.vm.selectVehicle(); + wrapper.vm.setVehicle(); await nextTick(); //Assert diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue index ff9fb86d3..ea3300036 100644 --- a/src/layouts/vehicle-style/vehicle-style.vue +++ b/src/layouts/vehicle-style/vehicle-style.vue @@ -68,16 +68,17 @@ export default { // route to move backwards this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, - selectVehicle() { - this.dispatchNonBlockingStoreAction(this.storeActions.GET_VEHICLE, {year: this.$store.getters.vehicle.year, make: this.$store.getters.vehicle.make, model: this.$store.getters.vehicle.model, style: this.$store.getters.vehicle.style}); + setVehicle() { + return this.dispatchNonBlockingStoreAction(this.storeActions.SET_VEHICLE, {year: this.$store.getters.vehicle.year, make: this.$store.getters.vehicle.make, model: this.$store.getters.vehicle.model, style: this.$store.getters.vehicle.style}); } }, watch: { selectedStyle(style) { this.$store.commit(this.storeMutations.UPDATE_STYLE, style); - this.selectVehicle(); - this.$router.navigate(this.navigationScenarios.SELECTED_STYLE, this.$route); + this.setVehicle().then(() => { + this.$router.navigate(this.navigationScenarios.SELECTED_STYLE, this.$route); + }); } }, diff --git a/src/store/index.js b/src/store/index.js index 742e4be25..f27a362b5 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -129,7 +129,7 @@ export default createStore({ payload: {}, }); }, - getVehicle(context, {year, make, model, style}) { + setVehicle(context, {year, make, model, style}) { return globalMethods.callHttpClient({ methods: endpoints.GetVehicle.method, endpoint: `${endpoints.GetVehicle.url}/${year}/${make}/${model}/${style}`,