From 0ed0566395a8bbc593902a552bbff18ca55bb042 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 13 Sep 2022 15:17:59 -0400 Subject: [PATCH 1/5] CSR-803: remove unneeded property --- src/common-components/question-chain/question-chain.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue index 3eacfac34..1f4f05ce8 100644 --- a/src/common-components/question-chain/question-chain.vue +++ b/src/common-components/question-chain/question-chain.vue @@ -41,12 +41,10 @@ export default { await useValidateForm(); // do a test validation check, without triggering full validation this.questionData.map((q, i) => { - let answerPair = []; const question = { questionText: q.questionText, questionSequence: q.questionSequence, answers: q.answers.map((a) => { - answerPair.push(a.nextQuestionSequence ? a.nextQuestionSequence : a.answerResult); return { Text: a.answerText, // Name will either be nextQuestionSequence or answerResult @@ -65,7 +63,6 @@ export default { }), answerSelected: q.answerSelected || "", }; - question.answerPair = answerPair; if (!q.suppressQuestion) { this.questions.push(question); } From cffbe64b33c4f14f0cbf4cfdd74ec28945ade581 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 13 Sep 2022 17:24:45 -0400 Subject: [PATCH 2/5] CSR-803: remove keyString prop from question-chain component --- src/common-components/question-chain/question-chain.vue | 3 +-- src/layouts/capability-questions/capability-questions.vue | 2 +- src/layouts/molding-questions/molding-questions.vue | 1 - src/layouts/part-questions/part-questions.vue | 1 - src/mixins/vin-pages-mixin.js | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue index 1f4f05ce8..6f349fd5f 100644 --- a/src/common-components/question-chain/question-chain.vue +++ b/src/common-components/question-chain/question-chain.vue @@ -7,7 +7,7 @@ :class="(q.questionSequence === currentQuestionNum) && 'current-question'" :questionText="q.questionText" :answers="q.answers" - :groupName="`${keyString}-${q.questionSequence}`" + :groupName="`question-${glassIndex}-${q.questionSequence}`" v-model="q.answerSelected" @isCheckedChanged="handleAnswer" isRequired @@ -34,7 +34,6 @@ export default { validationRules: String, modelValue: Array, glassIndex: Number, - keyString: String, }, async created() { // validate form upon create to prevent out of sync / persistent valid states diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index 2d73e20db..cdb38c58e 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -10,7 +10,7 @@ :manualHeadline="AlertFewMoreQuestionsHeader" :manualCopy="AlertFewMoreQuestionsCopy" v-bind:isDismissible="false" />
- Date: Tue, 13 Sep 2022 17:38:24 -0400 Subject: [PATCH 3/5] CSR-803: do not think async/await is needed here --- src/common-components/question-chain/question-chain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue index 6f349fd5f..425f6ff48 100644 --- a/src/common-components/question-chain/question-chain.vue +++ b/src/common-components/question-chain/question-chain.vue @@ -35,9 +35,9 @@ export default { modelValue: Array, glassIndex: Number, }, - async created() { + created() { // validate form upon create to prevent out of sync / persistent valid states - await useValidateForm(); // do a test validation check, without triggering full validation + useValidateForm(); // do a test validation check, without triggering full validation this.questionData.map((q, i) => { const question = { From d59378588ba617abce95a3abe86f056e45a47a78 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 14 Sep 2022 09:36:56 -0400 Subject: [PATCH 4/5] Revert "CSR-803: do not think async/await is needed here" This reverts commit e98543dc5c3de6cd975c721eccd39222329f51ed. --- src/common-components/question-chain/question-chain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue index 425f6ff48..6f349fd5f 100644 --- a/src/common-components/question-chain/question-chain.vue +++ b/src/common-components/question-chain/question-chain.vue @@ -35,9 +35,9 @@ export default { modelValue: Array, glassIndex: Number, }, - created() { + async created() { // validate form upon create to prevent out of sync / persistent valid states - useValidateForm(); // do a test validation check, without triggering full validation + await useValidateForm(); // do a test validation check, without triggering full validation this.questionData.map((q, i) => { const question = { From 922597ca65e4d6cc90c2357d2b710a237cefb834 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 14 Sep 2022 09:41:21 -0400 Subject: [PATCH 5/5] CSR-803: add comment --- src/common-components/question-chain/question-chain.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue index 6f349fd5f..0b5f45363 100644 --- a/src/common-components/question-chain/question-chain.vue +++ b/src/common-components/question-chain/question-chain.vue @@ -36,8 +36,8 @@ export default { glassIndex: Number, }, async created() { - // validate form upon create to prevent out of sync / persistent valid states - await useValidateForm(); // do a test validation check, without triggering full validation + // do a test validation check upon create to prevent out of sync / incorrect valid states + await useValidateForm(); // NOTE: needs to have async/await here; tested and won't work without it this.questionData.map((q, i) => { const question = {