Merge pull request #744 from Safelite/SSR-1349-ui-fixes-qa
Format code only.
This commit is contained in:
bmauger
GitHub
commit
ae7fc9a4fe
1 changed files with 30 additions and 38 deletions
|
|
@ -57,11 +57,9 @@
|
|||
)}`,
|
||||
},
|
||||
name: 'root',
|
||||
}"
|
||||
>{{
|
||||
}">{{
|
||||
getRouterLinkDisplayTextFromCopy(copy)
|
||||
}}</router-link
|
||||
>
|
||||
}}</router-link>
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
|
|
@ -95,7 +93,7 @@ import {
|
|||
doesCopyContainRouterLink,
|
||||
splitCopyOnCMSPlaceHolder,
|
||||
getRouterLinkRouteFromCopy,
|
||||
getRouterLinkDisplayTextFromCopy,
|
||||
getRouterLinkDisplayTextFromCopy
|
||||
} from '@/helpers/cms-content-helper.js';
|
||||
import routerParams from '@/router/router-constants/router-params';
|
||||
import vinPagesMixin from '@/mixins/vin-pages-mixin';
|
||||
|
|
@ -122,7 +120,7 @@ export default {
|
|||
Form,
|
||||
vehicleBanner,
|
||||
alert,
|
||||
addressVehiclesQuestion,
|
||||
addressVehiclesQuestion
|
||||
},
|
||||
mixins: [baseFormMixin, vinPagesMixin],
|
||||
async beforeRouteEnter(to, from, next) {
|
||||
|
|
@ -132,8 +130,8 @@ export default {
|
|||
const promiseResultMap = [
|
||||
{
|
||||
resultKey: 'cmsContent',
|
||||
promise: cmsContentPromise,
|
||||
},
|
||||
promise: cmsContentPromise
|
||||
}
|
||||
];
|
||||
|
||||
const resultMap = await settleAllPromises(promiseResultMap);
|
||||
|
|
@ -143,7 +141,7 @@ export default {
|
|||
});
|
||||
},
|
||||
props: {
|
||||
validationRules: String,
|
||||
validationRules: String
|
||||
},
|
||||
setup() {
|
||||
const mainStore = useMainStore();
|
||||
|
|
@ -158,7 +156,7 @@ export default {
|
|||
displayMatchedDifferentVehicleAlert: false,
|
||||
displayMatchedTwoIdenticalYMMVehicleAlert: false,
|
||||
previouslyEnteredCarId: '',
|
||||
forwardButtonCarStyle: '',
|
||||
forwardButtonCarStyle: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -194,7 +192,7 @@ export default {
|
|||
vehicle: v.vehicle,
|
||||
Text: `${v.vehicle.year} ${v.vehicle.make} ${v.vehicle.model}`,
|
||||
Name: v.vin,
|
||||
SubText: `VIN ${vinStart}${vinEnd}`,
|
||||
SubText: `VIN ${vinStart}${vinEnd}`
|
||||
};
|
||||
});
|
||||
return mappedData;
|
||||
|
|
@ -203,13 +201,11 @@ export default {
|
|||
return useMainStore().pageData(issPageValues.ADDRESS_VEHICLES);
|
||||
},
|
||||
selectedVehicle() {
|
||||
return this.VehiclesForQuestions.find(
|
||||
({ vin }) => vin === this.selectedVehicleVin
|
||||
);
|
||||
return this.VehiclesForQuestions.find(({ vin }) => vin === this.selectedVehicleVin);
|
||||
},
|
||||
VehicleSelected() {
|
||||
return this.mainStore.order.vehicle;
|
||||
},
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
selectedVehicleVin: {
|
||||
|
|
@ -217,12 +213,12 @@ export default {
|
|||
this.resetWarningsAndErrors();
|
||||
// does this vehicle match the previously selected carId?
|
||||
this.isCarIdDifferent =
|
||||
this.selectedVehicle?.vehicle.carId !==
|
||||
useMainStore().vehicle.carId;
|
||||
this.selectedVehicle?.vehicle.carId
|
||||
!== useMainStore().vehicle.carId;
|
||||
if (
|
||||
this.isCarIdDifferent &&
|
||||
this.selectedVehicle?.vehicle.carId !==
|
||||
this.previouslyEnteredCarId
|
||||
this.isCarIdDifferent
|
||||
&& this.selectedVehicle?.vehicle.carId
|
||||
!== this.previouslyEnteredCarId
|
||||
) {
|
||||
this.previouslyEnteredCarId =
|
||||
this.selectedVehicle?.vehicle.carId;
|
||||
|
|
@ -233,21 +229,17 @@ export default {
|
|||
} else {
|
||||
this.displayMatchedDifferentVehicleAlert = true;
|
||||
}
|
||||
this.$refs.siteFooter.updateButtonText(
|
||||
`Continue with ${this.selectedVehicle.vehicle.year} ` +
|
||||
`${this.selectedVehicle.vehicle.make} ${this.selectedVehicle.vehicle.model} ${this.forwardButtonCarStyle}`
|
||||
);
|
||||
this.$refs.siteFooter.updateButtonText(`Continue with ${this.selectedVehicle.vehicle.year} `
|
||||
+ `${this.selectedVehicle.vehicle.make} ${this.selectedVehicle.vehicle.model} ${this.forwardButtonCarStyle}`);
|
||||
} else {
|
||||
this.$refs.siteFooter.updateButtonText(
|
||||
this.getCmsContent(
|
||||
'SiteFooterWidget',
|
||||
'ForwardButtonText'
|
||||
)
|
||||
);
|
||||
this.$refs.siteFooter.updateButtonText(this.getCmsContent(
|
||||
'SiteFooterWidget',
|
||||
'ForwardButtonText'
|
||||
));
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
doesCopyContainRouterLink,
|
||||
|
|
@ -274,10 +266,10 @@ export default {
|
|||
await useMainStore().saveVin(
|
||||
{
|
||||
vehicleInfo: Object.assign(this.selectedVehicle.vehicle, {
|
||||
vin: this.selectedVehicle.vin,
|
||||
vin: this.selectedVehicle.vin
|
||||
}),
|
||||
isSelectedGlassAvailableForVehicle:
|
||||
this.isSelectedGlassAvailableForVehicle,
|
||||
this.isSelectedGlassAvailableForVehicle
|
||||
},
|
||||
false
|
||||
);
|
||||
|
|
@ -288,8 +280,8 @@ export default {
|
|||
// If the vehicle selected on this page is different from the one originally entered and the selected glass is not available
|
||||
// for that vehicle, then navigate back to "vehicle-damage" and display vehicle changed alert on that page.
|
||||
if (
|
||||
this.isCarIdDifferent &&
|
||||
!this.isSelectedGlassAvailableForVehicle
|
||||
this.isCarIdDifferent
|
||||
&& !this.isSelectedGlassAvailableForVehicle
|
||||
) {
|
||||
this.$router.navigate(
|
||||
this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
|
||||
|
|
@ -305,8 +297,8 @@ export default {
|
|||
this.displayMatchedDifferentVehicleAlert = false;
|
||||
this.displayMatchedTwoIdenticalYMMVehicleAlert = false;
|
||||
this.forwardButtonCarStyle = '';
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue