CSR-762 Fix merge conflicts

src/layouts/vehicle-damage/vehicle-damage.vue

@@ -225,7 +225,6 @@ export default {
       }
 
       return windShieldOptions;
-
     },
 
     getDoorSidesFromStore() {
@@ -264,7 +263,7 @@ export default {
 
       return passengerSideReplaceOptions;
     },
-
+    
     getRearReplaceOptionsFromStore() {
       var rearReplaceOptions = store.getters.damage.glassToReplace?.filter(glass => glass.location === damageLocationsSelected.REAR)[0]?.name;
 

src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue

@@ -76,14 +76,17 @@ export default {
     computed: {
         tintValidationRules() {
             const validationRuleName = `${this.location}-${this.name}-tint-required`;
+
             defineRule(
                 validationRuleName,
                 required(errorMessages.OPTION_REQUIRED)
             );
+
             return validationRuleName;
         },
         partValidationRules() {
             const validationRuleName = `${this.location}-${this.name}-part-required`;
+
             defineRule(
                 validationRuleName,
                 required(errorMessages.OPTION_REQUIRED)

src/layouts/vehicle-parts/vehicle-parts.vue

@@ -1,52 +1,45 @@
 <template>
-  <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-    <div class="page-container-grouped-styles vehicle-parts">
-      <loadingModal ref="loadingModal"/>
-      <funnelHeader ref="funnelHeader" cmsWidgetName="FunnelHeaderWidget" />
-      <vehicleBanner
-        ref="vehicleBanner"
-        cmsWidgetName="VehicleBannerWidget"
-        :displayGenericVehicleImage="false"
-      />
-      <funnelSubHeader
-        ref="funnelSubHeader"
-        cmsWidgetName="FunnelSubHeaderWidget"
-      />
-      <div class="fade-on-route-transition sub-container make-tall">
-        <div class="prevent-squish my-5">
-          <div class="row">
-            <div class="col">
-              <alert
-                class="rounded border-0 shadow-sm"
-                alertClass="alert-warning"
-                cmsWidgetName="AlertWidget"
-                :isDismissible="false"
-              />
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
+        <div class="page-container-grouped-styles vehicle-parts">
+            <loadingModal ref="loadingModal" />
+            <funnelHeader ref="funnelHeader" cmsWidgetName="FunnelHeaderWidget" />
+            <vehicleBanner
+                ref="vehicleBanner"
+                cmsWidgetName="VehicleBannerWidget"
+                :displayGenericVehicleImage="false" />
+            <funnelSubHeader ref="funnelSubHeader" cmsWidgetName="FunnelSubHeaderWidget" />
+            <div class="fade-on-route-transition sub-container make-tall">
+                <div class="prevent-squish my-5">
+                    <div class="row">
+                        <div class="col">
+                            <alert
+                                class="rounded border-0 shadow-sm"
+                                alertClass="alert-warning"
+                                cmsWidgetName="AlertWidget"
+                                :isDismissible="false" />
+                        </div>
+                    </div>
+                </div>
+                <div v-for="(item, i) in PartsOrQuestions" :key="i">
+                    <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
+                    <hr v-if="i > 0" />
+                    <glassPartQuestion
+                        :ref="`${RefPrefix}-${item.location}-${item.name}`"
+                        v-model="selectedGlassParts[item.location + '-' + item.name]"
+                        :location="item.location"
+                        :name="item.name"
+                        :colorAnswers="item.colorAnswers"
+                        :alreadyPopulatedPartsData="alreadyPopulatedPartsData" />
+                </div>
+                <funnelFooter
+                    cmsWidgetName="FunnelFooterWidget"
+                    ref="funnelFooter"
+                    :isForwardActionDisabled="isForwardActionDisabled"
+                    @back-clicked="backButtonAction"
+                    @ForwardClicked="forwardButtonAction" />
             </div>
-          </div>
         </div>
-        <div v-for="(item, i) in PartsOrQuestions" :key="i">
-          <!-- Render horizontal lines if there is multi-glass (aka if i > 0) -->
-          <hr v-if="i > 0" />
-          <glassPartQuestion
-            :ref="`${RefPrefix}-${item.location}-${item.name}`"
-            v-model="selectedGlassParts[item.location + '-' + item.name]"
-            :location="item.location"
-            :name="item.name"
-            :colorAnswers="item.colorAnswers"
-            :alreadyPopulatedPartsData="alreadyPopulatedPartsData"
-          />
-        </div>
-        <funnelFooter
-          cmsWidgetName="FunnelFooterWidget"
-          ref="funnelFooter"
-          :isForwardActionDisabled="isForwardActionDisabled"
-          @back-clicked="backButtonAction"
-          @ForwardClicked="forwardButtonAction"
-        />
-      </div>
-    </div>
-  </Form>
+    </Form>
 </template>
 
 <script>
@@ -57,7 +50,7 @@ import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
 import alert from "@/ux-components/alert/alert";
-import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -74,25 +67,25 @@ export default {
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         // Settle promises and get results
         const promiseResultMap = [
-        {
-            resultKey: "cmsContent",
-            promise: cmsContentPromise,
-        },
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
         ];
         const resultMap = await settleAllPromises(promiseResultMap);
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
-        vm.setCmsContent(resultMap.cmsContent);
+            vm.setCmsContent(resultMap.cmsContent);
 
-        // Glass Part Question dynamic component
-        Object.keys(vm.$refs)
-            .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
-            .forEach((c) =>
-            vm.$refs[c][0].initializeComponent({
-                ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
-                FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
-            })
-            );
+            // Glass Part Question dynamic component
+            Object.keys(vm.$refs)
+                .filter((r) => r.includes(vm.RefPrefix) && vm.$refs[r][0] !== undefined)
+                .forEach((c) =>
+                    vm.$refs[c][0].initializeComponent({
+                        ColorQuestionWidget: resultMap.cmsContent.ColorQuestionWidget,
+                        FeatureQuestionWidget: resultMap.cmsContent.FeatureQuestionWidget,
+                    })
+                );
         });
     },
     data() {
@@ -108,11 +101,13 @@ export default {
                 this.selectedGlassPartNumbers.length !== this.PartsFromApi.partsOrQuestions.length
             );
         },
-        selectedGlassPartNumbers () {
+        selectedGlassPartNumbers() {
             // Compile all selected parts from the page.
             const numberArray = [];
             for (let glassPart of Object.values(this.selectedGlassParts)) {
-                if (glassPart?.partNumber) { numberArray.push(glassPart.partNumber) }
+                if (glassPart?.partNumber) {
+                    numberArray.push(glassPart.partNumber);
+                }
             }
             return numberArray;
         },
@@ -129,7 +124,8 @@ export default {
                             ColorAnswerText: p.color,
                             FeatureAnswers: [
                                 {
-                                    FeatureAnswerText: p.description === "" ? p.color : p.description,
+                                    FeatureAnswerText:
+                                        p.description === "" ? p.color : p.description,
                                     PartNumber: p.partNumber,
                                 },
                             ],
@@ -153,16 +149,17 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            return store.getters.damage.isRepair != null && store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
-            Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0;
+            return (
+                store.getters.damage.isRepair != null &&
+                store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
+                Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0
+            );
         },
         async forwardButtonAction() {
             const matchedParts = [];
 
             // Match them to the parts from the API.
-            for (let [key, value] of Object.entries(
-                this.PartsFromApi.partsOrQuestions
-            )) {
+            for (let [key, value] of Object.entries(this.PartsFromApi.partsOrQuestions)) {
                 for (let [partKey, partValue] of Object.entries(value.parts)) {
                     const currentPart = this.PartsFromApi.partsOrQuestions[key].parts[partKey];
 
@@ -174,7 +171,7 @@ export default {
                         matchedParts.push({
                             location: value.location,
                             name: value.name,
-                            parts: [currentPart]
+                            parts: [currentPart],
                         });
                     }
                 }
@@ -185,7 +182,11 @@ export default {
                 throw new Error("Could not match any parts to the selected parts");
             }
 
-            await this.dispatchStoreAction(this.storeActions.RESET_MOLDING_AND_CAPABILITY_QUESTIONS_IF_NEEDED, matchedParts, false);
+            await this.dispatchStoreAction(
+                this.storeActions.RESET_MOLDING_AND_CAPABILITY_QUESTIONS_IF_NEEDED,
+                matchedParts,
+                false
+            );
 
             // Navigate to the next page
             this.navigateForward(matchedParts);
@@ -195,18 +196,18 @@ export default {
             const partsData = this.PartsFromApi;
             this.alreadyPopulatedPartsData =
                 this.$store.getters.lineItems.glassParts === null
-                ? []
-                : this.$store.getters.lineItems.glassParts;
+                    ? []
+                    : this.$store.getters.lineItems.glassParts;
 
             partsData.partsOrQuestions.map((g) => {
                 // If the part is already populated, use the value from the store and populate the v-model.
                 Object.keys(this.alreadyPopulatedPartsData).forEach((key) => {
-                const partNumber = this.alreadyPopulatedPartsData[key].partNumber;
-                g.parts.forEach((p) => {
-                    if (p.partNumber === partNumber) {
-                        this.selectedGlassParts[g.location + "-" + g.name] = p;
-                    }
-                });
+                    const partNumber = this.alreadyPopulatedPartsData[key].partNumber;
+                    g.parts.forEach((p) => {
+                        if (p.partNumber === partNumber) {
+                            this.selectedGlassParts[g.location + "-" + g.name] = p;
+                        }
+                    });
                 });
             });
         },