Merge branch 'learningequality:unstable' into unstable

Author: taoerman

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue

@@ -45,6 +45,7 @@
                   :item="item"
                   :errors="itemErrors(item)"
                   :openDialog="openDialog"
+                  :nodeId="nodeId"
                   data-test="editor"
                   @update="onItemUpdate"
                   @close="closeActiveItem"
@@ -207,7 +208,6 @@
         if (!this.items) {
           return [];
         }
-
         return [...this.items].sort((item1, item2) => (item1.order > item2.order ? 1 : -1));
       },
       firstItem() {

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue

@@ -66,7 +66,7 @@
         </VFlex>
       </VLayout>
 
-      <VLayout mt-4>
+      <VLayout v-if="kind !== AssessmentItemTypes.FREE_RESPONSE" mt-4>
         <VFlex>
           <ErrorList
             :errors="answersErrorMessages"
@@ -112,7 +112,12 @@
   import translator from '../../translator';
   import { updateAnswersToQuestionType, assessmentItemKey } from '../../utils';
   import { AssessmentItemTypeLabels } from '../../constants';
-  import { AssessmentItemTypes, ValidationErrors } from 'shared/constants';
+  import {
+    ContentModalities,
+    AssessmentItemTypes,
+    ValidationErrors,
+    FeatureFlagKeys,
+  } from 'shared/constants';
   import ErrorList from 'shared/views/ErrorList/ErrorList';
   import Uploader from 'shared/views/files/Uploader';
   import MarkdownEditor from 'shared/views/MarkdownEditor/MarkdownEditor/MarkdownEditor';
@@ -147,6 +152,10 @@
        *    ...
        * }
        */
+      nodeId: {
+        type: String,
+        required: true,
+      },
       item: {
         type: Object,
         default: null,
@@ -184,10 +193,13 @@
         openHintIdx: null,
         openAnswerIdx: null,
         kindSelectKey: 0,
+        AssessmentItemTypes,
       };
     },
     computed: {
       ...mapGetters('file', ['getFileUpload']),
+      ...mapGetters(['hasFeatureEnabled']),
+      ...mapGetters('contentNode', ['getContentNode']),
       question() {
         if (!this.item || !this.item.question) {
           return '';
@@ -198,6 +210,9 @@
       imagePreset() {
         return FormatPresetsNames.EXERCISE_IMAGE;
       },
+      modality() {
+        return this.getContentNode(this.nodeId)?.extra_fields?.options?.modality;
+      },
       kind() {
         if (!this.item || !this.item.type) {
           return AssessmentItemTypes.SINGLE_SELECTION;
@@ -206,7 +221,7 @@
         return this.item.type;
       },
       kindSelectItems() {
-        return [
+        const items = [
           {
             value: AssessmentItemTypes.SINGLE_SELECTION,
             text: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.SINGLE_SELECTION]),
@@ -224,6 +239,18 @@
             text: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.TRUE_FALSE]),
           },
         ];
+
+        if (
+          this.hasFeatureEnabled(FeatureFlagKeys.survey) &&
+          this.modality === ContentModalities.SURVEY
+        ) {
+          items.push({
+            value: AssessmentItemTypes.FREE_RESPONSE,
+            text: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.FREE_RESPONSE]),
+          });
+        }
+
+        return items;
       },
       answers() {
         if (!this.item || !this.item.answers) {
@@ -244,8 +271,12 @@
 
         if (this.errors && this.errors.includes(ValidationErrors.QUESTION_REQUIRED)) {
           errorMessages.push(translator.$tr(`errorQuestionRequired`));
+        } else if (
+          this.errors &&
+          this.errors.includes(ValidationErrors.INVALID_COMPLETION_TYPE_FOR_FREE_RESPONSE_QUESTION)
+        ) {
+          errorMessages.push(translator.$tr(`errorInvalidQuestionType`));
         }
-
         return errorMessages;
       },
       answersErrorMessages() {
@@ -292,12 +323,10 @@
           ...assessmentItemKey(this.item),
           ...payload,
         };
-
         this.$emit('update', payload);
       },
       changeKind(newKind) {
         const newAnswers = updateAnswersToQuestionType(newKind, this.answers);
-
         this.closeAnswer();
         this.updateItem({
           type: newKind,
@@ -365,6 +394,21 @@
 
             break;
 
+          case AssessmentItemTypes.FREE_RESPONSE:
+            if (typeof this.openDialog === 'function' && this.answers.length > 0) {
+              this.openDialog({
+                title: this.$tr('dialogTitle'),
+                message: this.$tr('dialogMessageChangeToFreeResponse'),
+                submitLabel: this.$tr('dialogSubmitBtnLabel'),
+                onSubmit: () => this.changeKind(newKind),
+                onCancel: this.rerenderKindSelect,
+              });
+            } else {
+              this.changeKind(newKind);
+            }
+
+            break;
+
           default:
             this.changeKind(newKind);
             break;
@@ -415,6 +459,8 @@
         "Switching to 'true or false' will remove all current answers. Continue?",
       dialogMessageChangeToInput:
         "Switching to 'numeric input' will set all answers as correct and remove all non-numeric answers. Continue?",
+      dialogMessageChangeToFreeResponse:
+        "Switching to 'free response' will remove all current answers. Continue?",
     },
   };
 

contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue

@@ -91,21 +91,26 @@
         return this.getAssessmentItems(this.nodeId);
       },
       areAssessmentItemsValid() {
-        return this.getAssessmentItemsAreValid({ contentNodeId: this.nodeId, ignoreDelayed: true });
+        return this.getAssessmentItemsAreValid({
+          contentNodeId: this.nodeId,
+          ignoreDelayed: true,
+        });
       },
       assessmentItemsErrors() {
-        return this.getAssessmentItemsErrors({ contentNodeId: this.nodeId, ignoreDelayed: true });
+        const errorMap = this.getAssessmentItemsErrors({
+          contentNodeId: this.nodeId,
+          ignoreDelayed: true,
+        });
+        return errorMap;
       },
       invalidItemsErrorMessage() {
         const invalidItemsCount = this.getInvalidAssessmentItemsCount({
           contentNodeId: this.nodeId,
           ignoreDelayed: true,
         });
-
         if (!invalidItemsCount) {
           return '';
         }
-
         return this.$tr('incompleteItemsCountMessage', { invalidItemsCount });
       },
     },

contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue

@@ -675,4 +675,8 @@
     margin-top: -4px !important;
   }
 
+  ::v-deep .v-dialog__content {
+    z-index: 5 !important;
+  }
+
 </style>

contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue

@@ -78,7 +78,11 @@
                   </li>
                 </ul>
               </VAlert>
-              <DetailsTabView :key="nodeIds.join('-')" ref="detailsTab" :nodeIds="nodeIds" />
+              <DetailsTabView
+                :key="nodeIds.join('-')"
+                ref="detailsTab"
+                :nodeIds="nodeIds"
+              />
             </VTabItem>
             <VTabItem :key="tabs.QUESTIONS" ref="questionwindow" :value="tabs.QUESTIONS" lazy>
               <AssessmentTab :nodeId="nodeIds[0]" />

contentcuration/contentcuration/frontend/channelEdit/constants.js

@@ -48,6 +48,7 @@ export const AssessmentItemTypeLabels = {
   [AssessmentItemTypes.TRUE_FALSE]: 'questionTypeTrueFalse',
   [AssessmentItemTypes.INPUT_QUESTION]: 'questionTypeInput',
   [AssessmentItemTypes.PERSEUS_QUESTION]: 'questionTypePerseus',
+  [AssessmentItemTypes.FREE_RESPONSE]: 'questionTypeFreeResponse',
 };
 
 export const TabNames = {

contentcuration/contentcuration/frontend/channelEdit/translator.js

@@ -10,7 +10,9 @@ const MESSAGES = {
   questionTypeTrueFalse: 'True/False',
   questionTypeInput: 'Numeric input',
   questionTypePerseus: 'Perseus',
+  questionTypeFreeResponse: 'Free response',
   errorQuestionRequired: 'Question is required',
+  errorInvalidQuestionType: 'Invalid question type',
   errorMissingAnswer: 'Choose a correct answer',
   errorChooseAtLeastOneCorrectAnswer: 'Choose at least one correct answer',
   errorProvideAtLeastOneCorrectAnswer: 'Provide at least one correct answer',

contentcuration/contentcuration/frontend/channelEdit/utils.js

@@ -93,6 +93,10 @@ export function updateAnswersToQuestionType(questionType, answers) {
     }
   }
 
+  if (questionType === AssessmentItemTypes.FREE_RESPONSE) {
+    return [];
+  }
+
   const answersCopy = JSON.parse(JSON.stringify(answers));
 
   switch (questionType) {