Merge remote-tracking branch 'origin/develop' into feature/CSR-731

This commit is contained in:
Scott Kiener 2022-10-12 15:34:53 -04:00
commit b3d9eba33f
3 changed files with 10 additions and 11 deletions

View file

@ -26,13 +26,12 @@ export default ({
},
computed: {
answersFromCms(){
//console.log(JSON.parse(JSON.stringify(this.getCmsContent(this.cmsWidgetName, 'Answers'))));
return this.getCmsContent(this.cmsWidgetName, 'Answers');
},
selectedValues: {
get: function() {
// Convert to CMS answer name from bool
var cmsAnswerValue = this.modelValue ? insuranceAnswer : cashAnswer;
const cmsAnswerValue = this.modelValue ? insuranceAnswer : cashAnswer;
return cmsAnswerValue;
},
set: function(newValue) {

View file

@ -148,7 +148,7 @@ describe("vehicle-parts.vue", () => {
expect(arePagePrerequisitesValid).toBe(true);
});
test("Initial data, should populate this.glassParts", async () => {
test("Initial data, should populate this.selectedGlassParts", async () => {
//Arrange
store.getters.pageData.mockReturnValue(basePartResponse);
@ -183,7 +183,7 @@ describe("vehicle-parts.vue", () => {
await nextTick();
//Assert
expect(wrapper.vm.glassParts).toEqual({ "Rear-Stationary": { "Rear": ['DB12209YPYNOEM'] } });
expect(wrapper.vm.selectedGlassParts).toEqual({ "Rear-Stationary": { "Rear": ['DB12209YPYNOEM'] } });
});
test("User had part questions > BackButtonAction triggers a router.navigateWithoutSaving change with correct scenario", async () => {
@ -343,7 +343,7 @@ describe("vehicle-parts.vue", () => {
}
});
wrapper.setData({ glassParts: { "Rear-Stationary": { partNumber: 'FW03861GTYN' } } });
wrapper.setData({ selectedGlassParts: { "Rear-Stationary": { partNumber: 'FW03861GTYN' } } });
//Act
vehicleParts.beforeRouteEnter.call(
@ -409,7 +409,7 @@ describe("vehicle-parts.vue", () => {
}
});
wrapper.setData({ glassParts: { "Rear-Stationary": { partNumber: 'DB12209GTYN' } } });
wrapper.setData({ selectedGlassParts: { "Rear-Stationary": { partNumber: 'DB12209GTYN' } } });
//Act
vehicleParts.beforeRouteEnter.call(
@ -455,7 +455,7 @@ describe("vehicle-parts.vue", () => {
wrapper.vm.$store.commit = jest.fn();
wrapper.vm.$refs.loadingModal.showModal = jest.fn();
wrapper.setData({ glassParts: { "Rear-Stationary": { partNumber: 'DB12209GTYN' } } });
wrapper.setData({ selectedGlassParts: { "Rear-Stationary": { partNumber: 'DB12209GTYN' } } });
//Act
vehicleParts.beforeRouteEnter.call(

View file

@ -30,7 +30,7 @@
<hr v-if="i > 0" />
<glassPartQuestion
:ref="`${RefPrefix}-${item.glassLocation}-${item.glassName}`"
v-model="glassParts[item.glassLocation + '-' + item.glassName]"
v-model="selectedGlassParts[item.glassLocation + '-' + item.glassName]"
:glassLocation="item.glassLocation"
:glassName="item.glassName"
:colorAnswers="item.colorAnswers"
@ -97,7 +97,7 @@ export default {
},
data() {
return {
glassParts: {},
selectedGlassParts: {},
alertWidgetData: Object,
alreadyPopulatedPartsData: [],
};
@ -111,7 +111,7 @@ export default {
selectedGlassPartNumbers () {
// Compile all selected parts from the page.
const numberArray = [];
for (let glassPart of Object.values(this.glassParts)) {
for (let glassPart of Object.values(this.selectedGlassParts)) {
if (glassPart?.partNumber) { numberArray.push(glassPart.partNumber) }
}
return numberArray;
@ -204,7 +204,7 @@ export default {
const partNumber = this.alreadyPopulatedPartsData[key].partNumber;
g.parts.forEach((p) => {
if (p.partNumber === partNumber) {
this.glassParts[g.glassLocation + "-" + g.glassName] = {
this.selectedGlassParts[g.glassLocation + "-" + g.glassName] = {
[g.glassLocation]: [partNumber],
};
}