Merge down hotfixes to unstable, with string translations and fixes

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

@@ -167,7 +167,8 @@
     },
     methods: {
       treeItemStyle(item) {
-        return this.nested ? { paddingLeft: `${item.level * 24}px` } : {};
+        const rule = this.$isRTL ? 'paddingRight' : 'paddingLeft';
+        return this.nested ? { [rule]: `${item.level * 24}px` } : {};
       },
       add(value) {
         this.selected = [...this.selected, value];

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

@@ -90,6 +90,7 @@
 
 <script>
 
+  import get from 'lodash/get';
   import MasteryCriteriaGoal from './MasteryCriteriaGoal';
   import ActivityDuration from './ActivityDuration.vue';
   import MasteryCriteriaMofNFields from './MasteryCriteriaMofNFields';
@@ -163,11 +164,8 @@
     computed: {
       showMasteryCriteriaGoalDropdown() {
         if (this.kind === ContentKindsNames.EXERCISE) {
-          if (this.value.modality === ContentModalities.QUIZ) {
-            //this ensures that anytime the completion dropdown is practice quiz
-            return false;
-          }
-          return true;
+          //this ensures that anytime the completion dropdown is practice quiz
+          return this.value.modality !== ContentModalities.QUIZ;
         }
         return false;
       },
@@ -392,8 +390,8 @@
               model: CompletionCriteriaModels.MASTERY,
               threshold: {
                 mastery_model: threshold.mastery_model,
-                m: this.value.threshold.m || this.m,
-                n: this.value.threshold.n || this.n,
+                m: get(this.value, 'threshold.m') || this.m,
+                n: get(this.value, 'threshold.n') || this.n,
               },
             };
           } else {
@@ -406,8 +404,6 @@
               },
             };
           }
-          this.m = (this.value.threshold ? this.value.threshold.m : null) || this.m;
-          this.n = (this.value.threshold ? this.value.threshold.n : null) || this.n;
           this.handleInput(update);
         },
       },
@@ -435,35 +431,33 @@
       },
       masteryModelItem: {
         get() {
-          if (!this.value.threshold) {
-            return { m: null, n: null };
-          }
-
-          if (this.value.threshold.mastery_model !== MasteryModelsNames.M_OF_N) {
+          if (get(this.value, 'threshold.mastery_model') !== MasteryModelsNames.M_OF_N) {
             return {
-              m: this.value.threshold.m,
-              n: this.value.threshold.n,
+              m: null,
+              n: null,
             };
           }
           return {
-            m: this.value.threshold.m ? this.value.threshold.m : this.m,
-            n: this.value.threshold.n ? this.value.threshold.n : this.n,
+            m: get(this.value, 'threshold.m') || this.m,
+            n: get(this.value, 'threshold.n') || this.n,
           };
         },
         set(threshold) {
-          this.m = threshold.m;
-          this.n = threshold.n;
+          this.m = get(threshold, 'm') || this.m;
+          this.n = get(threshold, 'n') || this.n;
 
-          let update = {};
-          update.completion_criteria = {
+          const mastery_model = get(this.value, 'threshold.mastery_model');
+          const completion_criteria = {
             model: CompletionCriteriaModels.MASTERY,
             threshold: {
-              mastery_model: this.value.threshold.mastery_model,
-              m: threshold.m,
-              n: threshold.n,
+              mastery_model,
             },
           };
-          this.handleInput(update);
+          if (mastery_model === MasteryModelsNames.M_OF_N) {
+            completion_criteria.threshold.m = this.m;
+            completion_criteria.threshold.n = this.n;
+          }
+          this.handleInput({ completion_criteria });
         },
       },
       isLongActivity() {

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

@@ -59,7 +59,7 @@
               <LearningActivityOptions
                 ref="learning_activities"
                 v-model="contentLearningActivities"
-                :disabled="isTopic"
+                :disabled="anyIsTopic"
                 @focus="trackClick('Learning activities')"
               />
               <!-- Level -->
@@ -125,7 +125,7 @@
       </VLayout>
 
       <!-- Completion section for all resources -->
-      <VLayout v-if="!isTopic" row wrap class="section">
+      <VLayout v-if="!anyIsTopic && allSameKind" row wrap class="section">
         <VFlex xs12>
           <h1 class="subheading">
             {{ $tr('completionLabel') }}
@@ -143,7 +143,7 @@
             v-model="completionAndDuration"
             :kind="firstNode.kind"
             :fileDuration="fileDuration"
-            :required="!isDocument"
+            :required="!anyIsDocument || !allSameKind"
           />
         </VFlex>
       </VLayout>
@@ -528,9 +528,22 @@
       allResources() {
         return !this.nodes.some(node => node.kind === ContentKindsNames.TOPIC);
       },
+      allSameKind() {
+        const kind = this.firstNode.kind;
+        return !this.nodes.some(node => node.kind !== kind);
+      },
+      anyIsDocument() {
+        return this.nodes.some(n => n.kind === ContentKindsNames.DOCUMENT);
+      },
+      anyIsTopic() {
+        return this.nodes.some(n => n.kind === ContentKindsNames.TOPIC);
+      },
       isImported() {
         return isImportedContent(this.firstNode);
       },
+      newContent() {
+        return !this.nodes.some(n => n[NEW_OBJECT]);
+      },
       importedChannelLink() {
         return importedChannelLink(this.firstNode, this.$router);
       },
@@ -706,15 +719,6 @@
       videoSelected() {
         return this.oneSelected && this.firstNode.kind === ContentKindsNames.VIDEO;
       },
-      newContent() {
-        return !this.nodes.some(n => n[NEW_OBJECT]);
-      },
-      isDocument() {
-        return this.firstNode.kind === ContentKindsNames.DOCUMENT;
-      },
-      isTopic() {
-        return this.firstNode.kind === ContentKindsNames.TOPIC;
-      },
     },
     watch: {
       nodes: {

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

@@ -30,7 +30,7 @@
 
 <script>
 
-  import { getMasteryModelValidators, translateValidator } from '../../../shared/utils/validation';
+  import { getMasteryModelValidators, translateValidator } from 'shared/utils/validation';
   import MasteryModels, { MasteryModelsList } from 'shared/leUtils/MasteryModels';
   import { constantsTranslationMixin } from 'shared/mixins';
   import DropdownWrapper from 'shared/views/form/DropdownWrapper';

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

@@ -52,8 +52,8 @@
     getMasteryModelMValidators,
     getMasteryModelNValidators,
     translateValidator,
-  } from '../../../shared/utils/validation';
-  import MasteryModels from 'shared/leUtils/MasteryModels'; // MasteryModelsNames, // MasteryModelsList,
+  } from 'shared/utils/validation';
+  import MasteryModels from 'shared/leUtils/MasteryModels';
   import { constantsTranslationMixin } from 'shared/mixins';
 
   export default {
@@ -108,19 +108,15 @@
           return this.value && this.value.m;
         },
         set(value) {
-          value = Number(value);
-          // Make sure n is always greater than or equal to m
-          this.handleInput(value > this.nValue ? { m: value, n: value } : { m: value });
+          this.handleInput({ m: Number(value) });
         },
       },
       nValue: {
         get() {
           return this.value && this.value.n;
         },
         set(value) {
-          value = Number(value);
-          // Make sure m is always less than or equal to n
-          this.handleInput(value < this.mValue ? { m: value, n: value } : { n: value });
+          this.handleInput({ n: Number(value) });
         },
       },
       mRules() {
@@ -133,10 +129,15 @@
       },
     },
     methods: {
-      handleInput(newValue) {
+      handleInput(update) {
+        // Don't emit input events unless we're sure we should
+        if (!this.showMofN) {
+          return;
+        }
+
         let data = {
           ...this.value,
-          ...newValue,
+          ...update,
         };
         this.$emit('input', data);
       },

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

@@ -279,15 +279,6 @@ function generateContentNodeData({
   }
   if (extra_fields !== NOVALUE) {
     contentNodeData.extra_fields = contentNodeData.extra_fields || {};
-    if (extra_fields.mastery_model) {
-      contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
-    }
-    if (extra_fields.m) {
-      contentNodeData.extra_fields.m = extra_fields.m;
-    }
-    if (extra_fields.n) {
-      contentNodeData.extra_fields.n = extra_fields.n;
-    }
     if (extra_fields.randomize !== undefined) {
       contentNodeData.extra_fields.randomize = extra_fields.randomize;
     }

contentcuration/contentcuration/frontend/shared/data/mergeChanges.js

@@ -132,10 +132,16 @@ export default function mergeAllChanges(changes, flatten = false, changesToSync
     if (!('rev' in change) || typeof change.rev === 'undefined') {
       console.error('This change has no `rev`:', change);
       throw new Error('Cannot determine the correct order for a change with no `rev`.');
-    } else if (change.rev <= lastRev) {
+    } else if (lastRev && change.rev <= lastRev) {
       console.error("These changes aren't ordered by `rev`:", changes);
       throw new Error('Cannot merge changes unless they are ordered by `rev`.');
     }
+
+    // Skip the change if the change errored or was disallowed
+    if (change.disallowed || (change.errors && change.errors.length > 0)) {
+      continue;
+    }
+
     lastRev = change.rev;
 
     // Ignore changes initiated by non-Resource registered tables

contentcuration/contentcuration/frontend/shared/data/serverSync.js

@@ -154,7 +154,7 @@ function handleErrors(response) {
     // both with any errors and the results of any merging that happened prior
     // to the sync operation being called
     return db[CHANGES_TABLE].where('server_rev')
-      .anyOf(Object.keys(errorMap))
+      .anyOf(Object.keys(errorMap).map(Number))
       .modify(obj => {
         return Object.assign(obj, errorMap[obj.server_rev]);
       });

contentcuration/contentcuration/frontend/shared/views/ContentNodeLearningActivityIcon.vue

@@ -86,20 +86,17 @@
     },
     methods: {
       icon(activity) {
-        return getLearningActivityIcon(this.text(activity));
+        return getLearningActivityIcon(activity);
       },
       text(activity) {
-        if (this.isTopic) {
-          return this.$tr('topic');
-        } else if (activity == 'multiple') {
+        if (activity === 'multiple') {
           return this.$tr('multipleLearningActivities');
         }
         return this.translateMetadataString(camelCase(activity));
       },
     },
     $trs: {
       multipleLearningActivities: 'Multiple learning activities',
-      topic: 'Folder',
     },
   };
 

contentcuration/contentcuration/frontend/shared/views/form/DropdownWrapper.vue

@@ -48,6 +48,7 @@
           top: this.top,
           maxHeight: this.menuHeight,
           lazy: true,
+          contentClass: this.$isRTL ? 'forceRTLMenu' : '',
         };
       },
     },
@@ -91,3 +92,16 @@
   };
 
 </script>
+<style>
+
+/* According to the documentation, Vuetify supposedly supports a `right` prop to position the menu
+   on the right side, but there isn't any code that actually does this. So when using an RTL
+   language, this class will be applied and these will get flipped, because our intention is
+   left:auto and right:0
+ */
+.forceRTLMenu {
+  left: 0 !important;
+  right: auto !important;
+}
+
+</style>

contentcuration/contentcuration/frontend/shared/vuetify/icons.js

@@ -28,9 +28,9 @@ export function getContentKindIcon(kind, isEmpty = false) {
 }
 
 export function getLearningActivityIcon(activity) {
-  if (activity == 'Explore') {
+  if (activity.toLowerCase() === 'explore') {
     return 'interactShaded';
-  } else if (activity == 'Multiple learning activities') {
+  } else if (activity === 'multiple') {
     return 'allActivities';
   } else {
     return `${camelCase(activity) + 'Solid'}`;

contentcuration/contentcuration/viewsets/channel.py

@@ -584,6 +584,7 @@ class CatalogViewSet(ReadOnlyValuesViewset):
         "count",
         "public",
         "last_published",
+        "demo_server_url",
     )
 
     def get_queryset(self):

contentcuration/contentcuration/viewsets/contentnode.py

@@ -273,7 +273,7 @@ def update(self, instance, validated_data):
 class CompletionCriteriaSerializer(JSONFieldDictSerializer):
     threshold = ThresholdField(allow_null=True)
     model = CharField()
-    learner_managed = BooleanField(required=False)
+    learner_managed = BooleanField(required=False, allow_null=True)
 
     def update(self, instance, validated_data):
         instance = super(CompletionCriteriaSerializer, self).update(instance, validated_data)