Update lesson editing to handle missing content.

kolibri/core/lessons/serializers.py

@@ -1,6 +1,5 @@
 from collections import OrderedDict
 
-from django.db.models import Q
 from rest_framework.serializers import ListField
 from rest_framework.serializers import ModelSerializer
 from rest_framework.serializers import PrimaryKeyRelatedField
@@ -16,7 +15,6 @@
 from kolibri.core.auth.models import FacilityUser
 from kolibri.core.auth.models import Membership
 from kolibri.core.auth.utils import create_adhoc_group_for_learners
-from kolibri.core.content.models import ContentNode
 
 
 class ResourceSerializer(Serializer):
@@ -89,27 +87,6 @@ def validate(self, attrs):
                 code=error_constants.UNIQUE,
             )
 
-    def validate_resources(self, resources):
-        # Validates that every ContentNode passed into resources is actually installed
-        # on the server. NOTE that this could cause problems if content is deleted from
-        # device.
-        resource_query = Q()
-        for resource in resources:
-            resource_query |= Q(
-                content_id=resource["content_id"],
-                channel_id=resource["channel_id"],
-                id=resource["contentnode_id"],
-            )
-
-        available_resources = ContentNode.objects.filter(
-            resource_query, available=True
-        ).count()
-        if available_resources < len(resources):
-            raise ValidationError(
-                "One or more of the selected resources is not available"
-            )
-        return resources
-
     def to_internal_value(self, data):
         data = OrderedDict(data)
         data["created_by"] = self.context["request"].user.id

kolibri/plugins/coach/assets/src/modules/lessonResources/handlers.js

@@ -28,10 +28,7 @@ function showResourceSelectionPage(store, params) {
       // TODO make a state mapper
       // contains selections that were commited to server prior to opening this page
       if (!pendingSelections.length) {
-        const preselectedResources = currentLesson.resources.map(
-          resourceObj => resourceObj.contentnode_id
-        );
-        store.commit('lessonSummary/SET_WORKING_RESOURCES', preselectedResources);
+        store.commit('lessonSummary/SET_WORKING_RESOURCES', currentLesson.resources);
       }
 
       if (ancestors.length) {

kolibri/plugins/coach/assets/src/modules/lessonSummary/actions.js

@@ -58,25 +58,14 @@ export function getResourceCache(store, resourceIds) {
   }
 }
 
-export function saveLessonResources(store, { lessonId, resourceIds }) {
-  return store.dispatch('getResourceCache', resourceIds).then(resourceCache => {
-    const resources = resourceIds.map(resourceId => {
-      const node = resourceCache[resourceId];
-      return {
-        contentnode_id: resourceId,
-        channel_id: node.channel_id,
-        content_id: node.content_id,
-      };
-    });
-
-    return LessonResource.saveModel({
-      id: lessonId,
-      data: { resources },
-    }).then(lesson => {
-      // Update the class summary now that there is a change to a lesson
-      return store.dispatch('classSummary/refreshClassSummary', null, { root: true }).then(() => {
-        return lesson;
-      });
+export function saveLessonResources(store, { lessonId, resources }) {
+  return LessonResource.saveModel({
+    id: lessonId,
+    data: { resources },
+  }).then(lesson => {
+    // Update the class summary now that there is a change to a lesson
+    return store.dispatch('classSummary/refreshClassSummary', null, { root: true }).then(() => {
+      return lesson;
     });
   });
 }

kolibri/plugins/coach/assets/src/modules/lessonSummary/handlers.js

@@ -25,7 +25,7 @@ export function setLessonSummaryState(store, params) {
       const resourceIds = currentLesson.resources.map(resourceObj => resourceObj.contentnode_id);
 
       return store.dispatch('lessonSummary/getResourceCache', resourceIds).then(() => {
-        store.commit('lessonSummary/SET_WORKING_RESOURCES', resourceIds);
+        store.commit('lessonSummary/SET_WORKING_RESOURCES', currentLesson.resources);
         store.commit('lessonSummary/SET_LEARNER_GROUPS', learnerGroups);
         store.commit('SET_PAGE_NAME', LessonsPageNames.SUMMARY);
       });

kolibri/plugins/coach/assets/src/modules/lessonSummary/index.js

@@ -1,4 +1,3 @@
-import isArray from 'lodash/isArray';
 import lessonResources from '../lessonResources';
 import * as actions from './actions';
 
@@ -37,21 +36,20 @@ export default {
     SET_WORKING_RESOURCES(state, workingResources) {
       state.workingResources = [...workingResources];
     },
-    ADD_TO_WORKING_RESOURCES(state, ids) {
-      if (typeof ids === 'string') {
-        state.workingResources.push(ids);
-      } else if (isArray(ids)) {
-        state.workingResources = [...state.workingResources, ...ids];
-      }
+    ADD_TO_WORKING_RESOURCES(state, resources) {
+      state.workingResources = [
+        ...state.workingResources,
+        ...resources.map(r => ({
+          contentnode_id: r.id,
+          content_id: r.content_id,
+          channel_id: r.channel_id,
+        })),
+      ];
     },
-    REMOVE_FROM_WORKING_RESOURCES(state, ids) {
-      if (typeof ids === 'string') {
-        state.workingResources = state.workingResources.filter(resourceId => resourceId !== ids);
-      } else if (isArray(ids)) {
-        state.workingResources = state.workingResources.filter(
-          resourceId => !ids.includes(resourceId)
-        );
-      }
+    REMOVE_FROM_WORKING_RESOURCES(state, resources) {
+      state.workingResources = state.workingResources.filter(
+        workingResource => !resources.find(r => r.id === workingResource.contentnode_id)
+      );
     },
     ADD_TO_RESOURCE_CACHE(state, { node, channelTitle }) {
       if (node && node.id) {

kolibri/plugins/coach/assets/src/routes/planLessonsRoutes.js

@@ -83,7 +83,7 @@ export default [
       if (fromRoute.name === LessonsPageNames.SELECTION_CONTENT_PREVIEW) {
         preHandlerPromise = store.dispatch('lessonSummary/saveLessonResources', {
           lessonId: toRoute.params.lessonId,
-          resourceIds: store.state.lessonSummary.workingResources,
+          resources: store.state.lessonSummary.workingResources,
         });
       } else {
         preHandlerPromise = Promise.resolve();

kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue

@@ -21,7 +21,7 @@
           :showLabel="false"
           :checked="contentIsChecked(content)"
           :indeterminate="contentIsIndeterminate(content)"
-          @change="handleCheckboxChange(content.id, $event)"
+          @change="handleCheckboxChange(content, $event)"
         />
         <LessonContentCard
           :class="{ 'with-checkbox': needCheckboxes }"
@@ -131,8 +131,8 @@
       },
     },
     methods: {
-      handleCheckboxChange(contentId, checked) {
-        this.$emit('change_content_card', { contentId, checked });
+      handleCheckboxChange(content, checked) {
+        this.$emit('change_content_card', { content, checked });
       },
     },
     $trs: {

kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/index.vue

@@ -84,7 +84,6 @@
   import debounce from 'lodash/debounce';
   import every from 'lodash/every';
   import pickBy from 'lodash/pickBy';
-  import xor from 'lodash/xor';
   import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
   import BottomAppBar from 'kolibri.coreVue.components.BottomAppBar';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -120,7 +119,6 @@
           role: this.$route.query.role || null,
         },
         isExiting: false,
-        workingResourcesCopy: [...this.$store.state.lessonSummary.workingResources],
         moreResultsState: null,
       };
     },
@@ -194,7 +192,8 @@
         return 'visible';
       },
       contentIsInLesson() {
-        return ({ id }) => this.workingResources.includes(id);
+        return ({ id }) =>
+          Boolean(this.workingResources.find(resource => resource.contentnode_id === id));
       },
       addableContent() {
         // Content in the topic that can be added if 'Select All' is clicked
@@ -240,37 +239,31 @@
       },
     },
     beforeRouteLeave(to, from, next) {
-      // Only autosave if changes have been made
-      if (xor(this.workingResources, this.workingResourcesCopy).length > 0) {
-        // Block the UI and show a notification in case last save takes too long
-        this.isExiting = true;
-        const isSamePage = samePageCheckGenerator(this.$store);
-        setTimeout(() => {
-          if (isSamePage()) {
-            this.createSnackbar(this.$tr('saveBeforeExitSnackbarText'));
-          }
-        }, 500);
+      // Block the UI and show a notification in case last save takes too long
+      this.isExiting = true;
+      const isSamePage = samePageCheckGenerator(this.$store);
+      setTimeout(() => {
+        if (isSamePage()) {
+          this.createSnackbar(this.$tr('saveBeforeExitSnackbarText'));
+        }
+      }, 500);
 
-        // Cancel any debounced calls
-        this.debouncedSaveResources.cancel();
-        this.saveLessonResources({
-          lessonId: this.lessonId,
-          resourceIds: [...this.workingResources],
+      // Cancel any debounced calls
+      this.debouncedSaveResources.cancel();
+      this.saveLessonResources({
+        lessonId: this.lessonId,
+        resources: [...this.workingResources],
+      })
+        .then(() => {
+          this.clearSnackbar();
+          this.isExiting = false;
+          next();
         })
-          .then(() => {
-            this.clearSnackbar();
-            this.isExiting = false;
-            next();
-          })
-          .catch(() => {
-            this.showResourcesChangedError();
-            this.isExiting = false;
-            next(false);
-          });
-      } else {
-        this.isExiting = false;
-        next();
-      }
+        .catch(() => {
+          this.showResourcesChangedError();
+          this.isExiting = false;
+          next(false);
+        });
     },
     methods: {
       ...mapActions(['createSnackbar', 'clearSnackbar']),
@@ -300,16 +293,16 @@
               node: { ...resource },
             });
           });
-          this.addToWorkingResources(this.addableContent.map(({ id }) => id));
+          this.addToWorkingResources(this.addableContent);
         } else {
-          this.removeFromSelectedResources(this.contentList.map(({ id }) => id));
+          this.removeFromSelectedResources(this.contentList);
         }
       },
-      addToSelectedResources(contentId) {
+      addToSelectedResources(content) {
         this.addToResourceCache({
-          node: this.contentList.find(n => n.id === contentId),
+          node: this.contentList.find(n => n.id === content.id),
         });
-        this.addToWorkingResources([contentId]);
+        this.addToWorkingResources([content]);
       },
       contentIsDirectoryKind({ kind }) {
         return kind === ContentNodeKinds.TOPIC || kind === ContentNodeKinds.CHANNEL;
@@ -360,11 +353,11 @@
         }
         return '';
       },
-      toggleSelected({ checked, contentId }) {
+      toggleSelected({ checked, content }) {
         if (checked) {
-          this.addToSelectedResources(contentId);
+          this.addToSelectedResources(content);
         } else {
-          this.removeFromSelectedResources(contentId);
+          this.removeFromSelectedResources(content);
         }
       },
       handleSearchTerm(searchTerm) {