Merge pull request #3798 from rtibbles/bulk_completion_criteria

Bulk completion criteria fix
learningequality · Nov 7, 2022 · b6d632f · b6d632f
2 parents 72acf9e + ace8bac
commit b6d632f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
@@ -5,6 +5,8 @@
     <Checkbox
       v-model="learnerManaged"
       color="primary"
+      :indeterminate="notUnique"
+      :disabled="notUnique"
       :label="$tr('learnersCanMarkComplete')"
       style="padding-bottom: 16px;"
     />
@@ -17,6 +19,7 @@
             ref="completion"
             v-model="completionDropdown"
             box
+            :placeholder="getPlaceholder('value')"
             :items="showCorrectCompletionOptions"
             :label="translateMetadataString('completion')"
             :required="required"
@@ -61,6 +64,7 @@
             ref="duration"
             v-model="durationDropdown"
             box
+            :placeholder="getPlaceholder('value')"
             :items="selectableDurationOptions"
             :label="translateMetadataString('duration')"
             :required="required"
@@ -205,6 +209,9 @@
       },
     },
     computed: {
+      notUnique() {
+        return this.value === nonUniqueValue;
+      },
       model() {
         return this.value.model || defaultCompletionCriteriaModels[this.kind];
       },
@@ -238,6 +245,9 @@
       },
       completionDropdown: {
         get() {
+          if (this.notUnique) {
+            return;
+          }
           if (
             this.value.modality === ContentModalities.QUIZ &&
             this.model === CompletionCriteriaModels.MASTERY

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -367,7 +367,9 @@
   import difference from 'lodash/difference';
   import get from 'lodash/get';
   import intersection from 'lodash/intersection';
+  import isEqual from 'lodash/isEqual';
   import uniq from 'lodash/uniq';
+  import uniqWith from 'lodash/uniqWith';
   import { mapGetters, mapActions } from 'vuex';
   import ContentNodeThumbnail from '../../views/files/thumbnails/ContentNodeThumbnail';
   import FileUpload from '../../views/files/FileUpload';
@@ -634,8 +636,11 @@
       thumbnailEncoding: generateGetterSetter('thumbnail_encoding'),
       completionAndDuration: {
         get() {
-          const { completion_criteria, modality } =
-            this.getExtraFieldsValueFromNodes('options') || {};
+          const options = this.getExtraFieldsValueFromNodes('options', {});
+          if (options === nonUniqueValue) {
+            return nonUniqueValue;
+          }
+          const { completion_criteria, modality } = options;
           const suggested_duration_type = this.getExtraFieldsValueFromNodes(
             'suggested_duration_type'
           );
@@ -808,7 +813,7 @@
         return getValueFromResults(results);
       },
       getExtraFieldsValueFromNodes(key, defaultValue = null) {
-        const results = uniq(
+        const results = uniqWith(
           this.nodes.map(node => {
             if (
               Object.prototype.hasOwnProperty.call(
@@ -820,7 +825,8 @@
               return this.diffTracker[node.id].extra_fields[key];
             }
             return get(node.extra_fields, key, defaultValue);
-          })
+          }),
+          isEqual
         );
         return getValueFromResults(results);
       },