CSR-803: prettify formatting changes

src/layouts/capability-questions/capability-questions.vue

@@ -1,10 +1,5 @@
 <template>
-    <Form 
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        @submit="onSubmit" 
-        @invalid-submit="onInvalidSubmit" 
-        ref="theForm" 
-        v-slot="{ meta }"
-    >
         <questions-page
             ref="questionsPage"
             :isMetaValid="meta.valid"
@@ -15,8 +10,7 @@
             v-model="selectedAnswers2"
             @forwardButtonAction="forwardButtonAction"
             @backButtonAction="backButtonAction"
-            :currentGlassPieceIndex="currentGlassPieceIndex"
+            :currentGlassPieceIndex="currentGlassPieceIndex" />
-        />
     </Form>
 </template>
 
@@ -81,7 +75,9 @@ export default {
         // are there alreadyAnsweredQuestions?
         const alreadyAnsweredQuestions = store.getters.damage.capabilityQuestionAnswers;
 
-        this.questionsData = this.pageData.partsOrQuestions.filter((x) => x.capabilityQuestions).map((glass, i) => {
+        this.questionsData = this.pageData.partsOrQuestions
+            .filter((x) => x.capabilityQuestions)
+            .map((glass, i) => {
                 // NOTE: questions for property "questions" can differ between layouts
                 glass.questions = glass.capabilityQuestions;
                 glass.answerKey = glass.glassLocation + "-" + glass.glassName;
@@ -91,15 +87,18 @@ export default {
                 const updatedGlass = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
 
                 // Set up watch for each set of glass questions
-            this.$watch("selectedAnswers2." + glass.answerKey, (newValue) => {
+                this.$watch(
+                    "selectedAnswers2." + glass.answerKey,
+                    (newValue) => {
                         if (newValue && Object.keys(newValue).length > 0) {
                             this.handleAnswerUpdates(newValue, glass.answerKey);
                         }
-            }, { deep: true });
+                    },
+                    { deep: true }
+                );
 
                 return updatedGlass;
             });
-
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -114,9 +113,13 @@ export default {
             const questionAnswersArray = this.questionsData.map((glass) => {
                 // get answerResult2 of returned answer
                 let selectedAnswerResult2;
-                glass.questions.forEach(q => {
+                glass.questions.forEach((q) => {
-                    const idx = q.answers.findIndex(a => a.answerResult === glass.answerData.answerResult);
+                    const idx = q.answers.findIndex(
-                    if (idx !== -1) { selectedAnswerResult2 = q.answers[idx].answerResult2 }
+                        (a) => a.answerResult === glass.answerData.answerResult
+                    );
+                    if (idx !== -1) {
+                        selectedAnswerResult2 = q.answers[idx].answerResult2;
+                    }
                 });
 
                 return {

src/layouts/molding-questions/molding-questions.vue

@@ -1,10 +1,5 @@
 <template>
-    <Form
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        @submit="onSubmit"
-        @invalid-submit="onInvalidSubmit"
-        ref="theForm"
-        v-slot="{ meta }"
-    >
         <questions-page
             ref="questionsPage"
             :isMetaValid="meta.valid"
@@ -15,8 +10,7 @@
             v-model="selectedAnswers2"
             @forwardButtonAction="forwardButtonAction"
             @backButtonAction="backButtonAction"
-            :currentGlassPieceIndex="currentGlassPieceIndex"
+            :currentGlassPieceIndex="currentGlassPieceIndex" />
-        />
     </Form>
 </template>
 
@@ -81,7 +75,9 @@ export default {
         // are there alreadyAnsweredQuestions?
         const alreadyAnsweredQuestions = store.getters.damage.moldingQuestionAnswers;
 
-        this.questionsData = this.pageData.partsOrQuestions.filter(x => x.parts[0].childPartQuestions.length).map((glass, i) => {
+        this.questionsData = this.pageData.partsOrQuestions
+            .filter((x) => x.parts[0].childPartQuestions.length)
+            .map((glass, i) => {
                 // NOTE: questions for property "questions" can differ between layouts
                 glass.questions = glass.parts[0].childPartQuestions;
                 glass.answerKey = glass.glassLocation + "-" + glass.glassName;
@@ -90,15 +86,18 @@ export default {
 
                 const updatedGlass = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
 
-            this.$watch("selectedAnswers2." + glass.answerKey, (newValue) => {
+                this.$watch(
+                    "selectedAnswers2." + glass.answerKey,
+                    (newValue) => {
                         if (newValue && Object.keys(newValue).length > 0) {
                             this.handleAnswerUpdates(newValue, glass.answerKey);
                         }
-            }, { deep: true });
+                    },
+                    { deep: true }
+                );
 
                 return updatedGlass;
             });
-
     },
     methods: {
         arePagePrerequisitesValid() {

src/layouts/part-questions/part-questions.vue

@@ -1,10 +1,5 @@
 <template>
-    <Form
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        @submit="onSubmit"
-        @invalid-submit="onInvalidSubmit"
-        ref="theForm"
-        v-slot="{ meta }"
-    >
         <questions-page
             ref="questionsPage"
             :isMetaValid="meta.valid"
@@ -15,8 +10,7 @@
             v-model="selectedAnswers"
             @forwardButtonAction="forwardButtonAction"
             @backButtonAction="backButtonAction"
-            :currentGlassPieceIndex="currentGlassPieceIndex"
+            :currentGlassPieceIndex="currentGlassPieceIndex" />
-        />
     </Form>
 </template>
 
@@ -81,7 +75,9 @@ export default {
         // are there alreadyAnsweredQuestions?
         const alreadyAnsweredQuestions = store.getters.damage.partQuestionAnswers;
 
-        this.questionsData = this.pageData.partsOrQuestions.filter(x => x.partQuestions).map((glass, i) => {
+        this.questionsData = this.pageData.partsOrQuestions
+            .filter((x) => x.partQuestions)
+            .map((glass, i) => {
                 // NOTE: questions for property "questions" can differ between layouts
                 glass.questions = glass.partQuestions;
                 glass.answerKey = glass.glassLocation + "-" + glass.glassName;
@@ -91,15 +87,18 @@ export default {
                 const updatedGlass = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
 
                 // Set up watch for each set of glass questions
-            this.$watch("selectedAnswers." + glass.answerKey, (newValue) => {
+                this.$watch(
+                    "selectedAnswers." + glass.answerKey,
+                    (newValue) => {
                         if (newValue && Object.keys(newValue).length > 0) {
                             this.handleAnswerUpdates(newValue, glass.answerKey);
                         }
-            }, {deep: true});
+                    },
+                    { deep: true }
+                );
 
                 return updatedGlass;
             });
-
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -130,10 +129,11 @@ export default {
             );
 
             // call API parts method
-            const partsLookup = await this.dispatchStoreAction(this.storeActions.GET_PARTS)
+            const partsLookup = await this.dispatchStoreAction(this.storeActions.GET_PARTS).catch(
-                .catch(() => {
+                () => {
                     return this.$refs.funnelFooter.removeLoader();
-                });
+                }
+            );
 
             const glassPiecePartsForStore = partsLookup.data.glassPieceParts;
 
@@ -146,4 +146,3 @@ export default {
     },
 };
 </script>
-

src/mixins/vehicle-questions-mixin.js

@@ -81,7 +81,9 @@ export default {
                     !answeredGlass.glassName ||
                     !answeredGlass.answeredQuestions ||
                     (!answeredGlass.result && !answeredGlass.partNum)
-                ) { return }
+                ) {
+                    return;
+                }
 
                 // test if glass parts match
                 if (
@@ -96,9 +98,12 @@ export default {
                             return;
                         }
                         // determine which answer was previously chosen
-                        const chosenAns = glass.questions[answeredQuestion.questionNum - 1].answers.find((a) => {
+                        const chosenAns = glass.questions[
+                            answeredQuestion.questionNum - 1
+                        ].answers.find((a) => {
                             return (
-                                a.answerText.toUpperCase() === answeredQuestion.selectedAnswerText.toUpperCase()
+                                a.answerText.toUpperCase() ===
+                                answeredQuestion.selectedAnswerText.toUpperCase()
                             );
                         });
                         // set the answerString to use for answerSelected
@@ -109,10 +114,13 @@ export default {
                         }
 
                         // mark this question as answered (question-chain will read this)
-                        glass.questions[answeredQuestion.questionNum - 1].answerSelected = answerString;
+                        glass.questions[answeredQuestion.questionNum - 1].answerSelected =
+                            answerString;
                         // mark this question as suppressed if needed (question-chain uses this)
                         if (answeredQuestion.suppressThisQuestion) {
-                            glass.questions[answeredQuestion.questionNum - 1].suppressThisQuestion = true;
+                            glass.questions[
+                                answeredQuestion.questionNum - 1
+                            ].suppressThisQuestion = true;
                         }
                     });
 
@@ -161,7 +169,6 @@ export default {
 
             // loop through every answered question on the currently answered glass part
             answer.answeredQuestions?.forEach((answeredQuestion) => {
-
                 /* answeredQuestion example format:
                     {
                         "questionText": "Is your Grand Cherokee the Laredo model?",
@@ -177,7 +184,6 @@ export default {
 
                 // loop through all glass pieces data
                 self.questionsData.forEach((glassPiece, pieceIndex) => {
-
                     /* glassPiece example format:
                         {
                             "glassName": "Single",
@@ -208,7 +214,6 @@ export default {
 
                     // limit duplicate search to glass pieces that follow after the currently being answered glass piece
                     if (pieceIndex > answer.glassIndex) {
-
                         let indexToSuppressTo;
                         // reset this glass piece, in case user is changing their previous answers
                         glassPiece.answerData = null;
@@ -216,7 +221,6 @@ export default {
 
                         // loop through this glass piece's questions, looking for a questionText match
                         glassPiece.questions.forEach((question, questionIndex) => {
-
                             // clear out any previously set answers
                             question.answerSelected = null;
 
@@ -244,10 +248,17 @@ export default {
                                 // handle duplicate's nextQuestion logic on other related questions
                                 if (matchedAnswer.nextQuestionSequence) {
                                     // clear any suppression on the nextQuestion
-                                    glassPiece.questions[matchedAnswer.nextQuestionSequence - 1].suppressThisQuestion = null;
+                                    glassPiece.questions[
+                                        matchedAnswer.nextQuestionSequence - 1
+                                    ].suppressThisQuestion = null;
                                     // if the duplicate is 1ST question in array, set indexToSuppressTo
                                     if (questionIndex === 0) {
-                                        if (!indexToSuppressTo || matchedAnswer.nextQuestionSequence < indexToSuppressTo) { indexToSuppressTo = matchedAnswer.nextQuestionSequence}
+                                        if (
+                                            !indexToSuppressTo ||
+                                            matchedAnswer.nextQuestionSequence < indexToSuppressTo
+                                        ) {
+                                            indexToSuppressTo = matchedAnswer.nextQuestionSequence;
+                                        }
                                     }
                                 }
 
@@ -255,7 +266,10 @@ export default {
                                 glassPiece.questions.forEach((q) => {
                                     q.answers.forEach((a) => {
                                         // revert any previously set nextQuestion logic modifications
-                                        if (a.originalNextQuestionSequence === question.questionSequence) {
+                                        if (
+                                            a.originalNextQuestionSequence ===
+                                            question.questionSequence
+                                        ) {
                                             // restore original nextQuestionSequence
                                             a.nextQuestionSequence = a.originalNextQuestionSequence;
                                             self.originalNextQuestionSequence = null;
@@ -271,12 +285,16 @@ export default {
 
                                             // update questions that lead to duplicated question
                                             if (matchedAnswer.nextQuestionSequence) {
-                                                a.originalNextQuestionSequence = a.nextQuestionSequence;
+                                                a.originalNextQuestionSequence =
-                                                a.nextQuestionSequence = matchedAnswer.nextQuestionSequence;
+                                                    a.nextQuestionSequence;
+                                                a.nextQuestionSequence =
+                                                    matchedAnswer.nextQuestionSequence;
                                             } else {
-                                                a.originalNextQuestionSequence = a.nextQuestionSequence;
+                                                a.originalNextQuestionSequence =
+                                                    a.nextQuestionSequence;
                                                 a.nextQuestionSequence = null;
-                                                a.originalAnswerResult = a.originalAnswerResult || a.answerResult;
+                                                a.originalAnswerResult =
+                                                    a.originalAnswerResult || a.answerResult;
                                                 a.answerResult = matchedAnswer.answerResult;
                                             }
                                         }
@@ -303,30 +321,30 @@ export default {
                                     };
                                     // set the answerData (used as indicator that it has been already answered)
                                     glassPiece.answerData = {
-                                        answerResult: matchedAnswer.nextQuestionSequence ? matchedAnswer.nextQuestionSequence : matchedAnswer.answerResult,
+                                        answerResult: matchedAnswer.nextQuestionSequence
+                                            ? matchedAnswer.nextQuestionSequence
+                                            : matchedAnswer.answerResult,
                                         answeredQuestions: [answeredQuestionObj],
                                     };
 
                                     // suppress this glass piece because it has an answer
                                     glassPiece.isSuppressedPart = true;
                                 }
-                                
                             }
                         });
 
                         // Update key to force re-render of glass piece with duplicate question in case user changes previous related answer in the chain
-                        self.questionsData[pieceIndex].key = self.questionsData[pieceIndex].key + Date.now().toString();
+                        self.questionsData[pieceIndex].key =
+                            self.questionsData[pieceIndex].key + Date.now().toString();
                     }
-
                 });
-
             });
 
             // set final answer data for the current answered glass part
             self.questionsData[answer.glassIndex].answerData = {
                 answerResult: answer.answerResult,
                 answeredQuestions: answer.answeredQuestions,
-            }
+            };
 
             // this part has been fully answered, so advance to next part's question chain
             for (let i = answer.glassIndex + 1; i < this.questionsData.length; i++) {
@@ -336,7 +354,6 @@ export default {
                     break;
                 }
             }
-
         },
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
         async navigateForward(partsOrQuestions, vm) {
@@ -427,7 +444,6 @@ export default {
                     { partsOrQuestions }
                 );
             } else {
-
                 // if single parts only
                 const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);