Bookmarks feature

kolibri/core/assets/src/api-resources/index.js

@@ -12,6 +12,10 @@ export const DynamicNetworkLocationResource = new Resource({
   name: 'dynamicnetworklocation',
 });
 
+export const BookmarksResource = new Resource({
+  name: 'bookmarks',
+});
+
 export { default as ClassroomResource } from './classroom';
 export { default as ContentNodeResource } from './contentNode';
 export { default as ContentNodeGranularResource } from './contentNodeGranular';

kolibri/core/assets/src/constants.js

@@ -27,6 +27,7 @@ export const ContentNodeKinds = {
   CLASSROOM: 'CLASSROOM',
   ACTIVITY: 'ACTIVITY',
   SLIDESHOW: 'slideshow',
+  BOOKMARK: 'bookmark',
 };
 
 export const LearningActivities = {

kolibri/plugins/coach/assets/src/constants/index.js

@@ -10,6 +10,8 @@ export const PageNames = {
   EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC: 'EXAM_CREATION_SELECT_CHANNEL_QUIZ_TOPIC',
   EXAM_CREATION_CHANNEL_QUIZ_PREVIEW: 'EXAM_CREATION_CHANNEL_QUIZ_PREVIEW',
   EXAM_CREATION_TOPIC: 'EXAM_CREATION_TOPIC',
+  EXAM_CREATION_BOOKMARKS: 'EXAM_CREATION_BOOKMARKS',
+  EXAM_CREATION_BOOKMARKS_MAIN: 'EXAM_CREATION_BOOKMARKS_MAIN',
   EXAM_CREATION_PREVIEW: 'EXAM_CREATION_PREVIEW',
   EXAM_CREATION_SEARCH: 'EXAM_CREATION_SEARCH',
   EXAM_CREATION_QUESTION_SELECTION: 'EXAM_CREATION_QUESTION_SELECTION',

kolibri/plugins/coach/assets/src/constants/lessonsConstants.js

@@ -10,6 +10,8 @@ export const LessonsPageNames = {
   SELECTION_SEARCH: 'SELECTION_SEARCH',
   SELECTION_CONTENT_PREVIEW: 'SELECTION_CONTENT_PREVIEW', // exclusively a route name
   CONTENT_PREVIEW: 'CONTENT_PREVIEW',
+  LESSON_SELECTION_BOOKMARKS: 'LESSON_SELECTION_BOOKMARKS',
+  LESSON_SELECTION_BOOKMARKS_MAIN: 'LESSON_SELECTION_BOOKMARKS_MAIN',
 };
 
 export const CollectionTypes = {

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

@@ -1,17 +1,23 @@
 import pickBy from 'lodash/pickBy';
 import uniq from 'lodash/uniq';
 import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
-import { ContentNodeResource, ContentNodeSearchResource, ChannelResource } from 'kolibri.resources';
+import {
+  ContentNodeResource,
+  BookmarksResource,
+  ContentNodeSearchResource,
+  ChannelResource,
+} from 'kolibri.resources';
 import { assessmentMetaDataState } from 'kolibri.coreVue.vuex.mappers';
 import router from 'kolibri.coreVue.router';
 import { PageNames } from '../../constants';
 import { filterAndAnnotateContentList, fetchChannelQuizzes } from './actions';
 
 function showExamCreationPage(store, params) {
-  const { contentList, pageName, ancestors = [], searchResults = null } = params;
+  const { contentList, bookmarksList, pageName, ancestors = [], searchResults = null } = params;
   return store.dispatch('loading').then(() => {
     store.commit('examCreation/SET_ANCESTORS', ancestors);
     store.commit('examCreation/SET_CONTENT_LIST', contentList);
+    store.commit('examCreation/SET_BOOKMARKS_LIST', bookmarksList);
     if (searchResults) {
       store.commit('examCreation/SET_SEARCH_RESULTS', searchResults);
     }
@@ -118,6 +124,53 @@ export function showExamCreationTopicPage(store, params) {
     });
   });
 }
+export function showExamCreationBookmarksPage(store, params) {
+  return store.dispatch('loading').then(() => {
+    const { topicId } = params;
+    const topicNodePromise = ContentNodeResource.fetchModel({ id: topicId });
+    const childNodesPromise = ContentNodeResource.fetchCollection({
+      getParams: {
+        parent: topicId,
+        kind_in: [ContentNodeKinds.TOPIC, ContentNodeKinds.VIDEO, ContentNodeKinds.EXERCISE],
+      },
+    });
+    const loadRequirements = [topicNodePromise, childNodesPromise];
+
+    return Promise.all(loadRequirements).then(([topicNode, childNodes]) => {
+      return filterAndAnnotateContentList(childNodes).then(() => {
+        store.commit('SET_TOOLBAR_ROUTE', {
+          name: PageNames.EXAMS,
+        });
+        return showExamCreationPage(store, {
+          classId: params.classId,
+          bookmarksList: childNodes,
+          pageName: PageNames.EXAM_CREATION_BOOKMARKS,
+          ancestors: [...topicNode.ancestors, topicNode],
+        });
+      });
+    });
+  });
+}
+export function showExamCreationAllBookmarks(store) {
+  return store.dispatch('loading').then(() => {
+    getBookmarks().then(bookmarks => {
+      return showExamCreationPage(store, {
+        bookmarksList: bookmarks,
+      });
+    });
+  });
+}
+function getBookmarks() {
+  return BookmarksResource.fetchCollection()
+    .then(bookmarks => {
+      return bookmarks.map(bookmark => {
+        return ContentNodeResource.fetchModel({ id: bookmark.contentnode_id });
+      });
+    })
+    .then(bookmarkPromises => {
+      return Promise.all(bookmarkPromises);
+    });
+}
 
 export function showExamCreationPreviewPage(store, params, query = {}) {
   const { classId, contentId } = params;

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

@@ -11,6 +11,7 @@ function defaultState() {
     numberOfQuestions: 10,
     seed: getRandomInt(), // consistent seed is used for question selection
     contentList: [],
+    bookmarksList: [],
     selectedExercises: {},
     availableQuestions: 0,
     searchResults: {
@@ -70,6 +71,9 @@ export default {
     SET_CONTENT_LIST(state, contentList) {
       state.contentList = contentList;
     },
+    SET_BOOKMARKS_LIST(state, bookmarksList) {
+      state.bookmarksList = bookmarksList;
+    },
     ADD_TO_SELECTED_EXERCISES(state, exercises) {
       state.selectedExercises = Object.assign(
         {},

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

@@ -1,12 +1,16 @@
 import pickBy from 'lodash/pickBy';
 import { assessmentMetaDataState } from 'kolibri.coreVue.vuex.mappers';
-import { ContentNodeResource, ContentNodeSearchResource } from 'kolibri.resources';
+import {
+  BookmarksResource,
+  ContentNodeResource,
+  ContentNodeSearchResource,
+} from 'kolibri.resources';
 import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
 import { getContentNodeThumbnail } from 'kolibri.utils.contentNode';
 import { LessonsPageNames } from '../../constants/lessonsConstants';
 
 function showResourceSelectionPage(store, params) {
-  const { lessonId, contentList, pageName, ancestors = [] } = params;
+  const { lessonId, contentList, pageName, bookmarksList, ancestors = [] } = params;
   const pendingSelections = store.state.lessonSummary.workingResources || [];
   const cache = store.state.lessonSummary.resourceCache || {};
   const lessonSummaryState = {
@@ -18,73 +22,77 @@ function showResourceSelectionPage(store, params) {
   return store.dispatch('loading').then(() => {
     store.commit('SET_TOOLBAR_ROUTE', {});
     store.commit('lessonSummary/SET_STATE', lessonSummaryState);
+    store.commit('lessonSummary/resources/SET_BOOKMARKS_LIST', bookmarksList);
     store.commit('lessonSummary/resources/SET_STATE', {
       contentList: [],
       ancestors: [],
     });
+    store.dispatch('notLoading');
 
-    const loadRequirements = [store.dispatch('lessonSummary/updateCurrentLesson', lessonId)];
-    return Promise.all(loadRequirements).then(([currentLesson]) => {
-      // TODO make a state mapper
-      // contains selections that were commited to server prior to opening this page
-      if (!pendingSelections.length) {
-        store.commit('lessonSummary/SET_WORKING_RESOURCES', currentLesson.resources);
-      }
-
-      if (ancestors.length) {
-        store.commit('lessonSummary/resources/SET_ANCESTORS', ancestors);
-      }
-
-      const ancestorCounts = {};
-
-      let resourceAncestors;
-
-      resourceAncestors = store.state.lessonSummary.workingResources.map(
-        resource => (cache[resource.contentnode_id] || {}).ancestors || []
-      );
-      // store ancestor ids to get their descendants later
-      const ancestorIds = new Set();
-
-      resourceAncestors.forEach(ancestorArray =>
-        ancestorArray.forEach(ancestor => {
-          ancestorIds.add(ancestor.id);
-          if (ancestorCounts[ancestor.id]) {
-            ancestorCounts[ancestor.id].count++;
-          } else {
-            ancestorCounts[ancestor.id] = {};
-            // total number of working/added resources
-            ancestorCounts[ancestor.id].count = 1;
-            // total number of descendants
-            ancestorCounts[ancestor.id].total = 0;
+    if (lessonId) {
+      const loadRequirements = [store.dispatch('lessonSummary/updateCurrentLesson', lessonId)];
+      return Promise.all(loadRequirements).then(([currentLesson]) => {
+        // TODO make a state mapper
+        // contains selections that were commited to server prior to opening this page
+        if (!pendingSelections.length) {
+          store.commit('lessonSummary/SET_WORKING_RESOURCES', currentLesson.resources);
+        }
+
+        if (ancestors.length) {
+          store.commit('lessonSummary/resources/SET_ANCESTORS', ancestors);
+        }
+
+        const ancestorCounts = {};
+
+        let resourceAncestors;
+
+        resourceAncestors = store.state.lessonSummary.workingResources.map(
+          resource => (cache[resource.contentnode_id] || {}).ancestors || []
+        );
+        // store ancestor ids to get their descendants later
+        const ancestorIds = new Set();
+
+        resourceAncestors.forEach(ancestorArray =>
+          ancestorArray.forEach(ancestor => {
+            ancestorIds.add(ancestor.id);
+            if (ancestorCounts[ancestor.id]) {
+              ancestorCounts[ancestor.id].count++;
+            } else {
+              ancestorCounts[ancestor.id] = {};
+              // total number of working/added resources
+              ancestorCounts[ancestor.id].count = 1;
+              // total number of descendants
+              ancestorCounts[ancestor.id].total = 0;
+            }
+          })
+        );
+        ContentNodeResource.fetchDescendants(Array.from(ancestorIds)).then(nodes => {
+          nodes.data.forEach(node => {
+            // exclude topics from total resource calculation
+            if (node.kind !== ContentNodeKinds.TOPIC) {
+              ancestorCounts[node.ancestor_id].total++;
+            }
+          });
+          store.commit('lessonSummary/resources/SET_ANCESTOR_COUNTS', ancestorCounts);
+          // carry pendingSelections over from other interactions in this modal
+          store.commit('lessonSummary/resources/SET_CONTENT_LIST', contentList);
+          if (params.searchResults) {
+            store.commit('lessonSummary/resources/SET_SEARCH_RESULTS', params.searchResults);
           }
-        })
-      );
-      ContentNodeResource.fetchDescendants(Array.from(ancestorIds)).then(nodes => {
-        nodes.data.forEach(node => {
-          // exclude topics from total resource calculation
-          if (node.kind !== ContentNodeKinds.TOPIC) {
-            ancestorCounts[node.ancestor_id].total++;
+          store.commit('SET_PAGE_NAME', pageName);
+          if (pageName === LessonsPageNames.SELECTION_SEARCH) {
+            store.commit('SET_TOOLBAR_ROUTE', {
+              name: LessonsPageNames.SELECTION_ROOT,
+            });
+          } else {
+            store.commit('SET_TOOLBAR_ROUTE', {
+              name: LessonsPageNames.SUMMARY,
+            });
           }
+          store.dispatch('notLoading');
         });
-        store.commit('lessonSummary/resources/SET_ANCESTOR_COUNTS', ancestorCounts);
-        // carry pendingSelections over from other interactions in this modal
-        store.commit('lessonSummary/resources/SET_CONTENT_LIST', contentList);
-        if (params.searchResults) {
-          store.commit('lessonSummary/resources/SET_SEARCH_RESULTS', params.searchResults);
-        }
-        store.commit('SET_PAGE_NAME', pageName);
-        if (pageName === LessonsPageNames.SELECTION_SEARCH) {
-          store.commit('SET_TOOLBAR_ROUTE', {
-            name: LessonsPageNames.SELECTION_ROOT,
-          });
-        } else {
-          store.commit('SET_TOOLBAR_ROUTE', {
-            name: LessonsPageNames.SUMMARY,
-          });
-        }
-        store.dispatch('notLoading');
       });
-    });
+    }
   });
 }
 
@@ -132,7 +140,50 @@ export function showLessonResourceSelectionTopicPage(store, params) {
     });
   });
 }
+export function showLessonResourceBookmarks(store, params) {
+  return store.dispatch('loading').then(() => {
+    const { topicId } = params;
+    const loadRequirements = [
+      ContentNodeResource.fetchModel({ id: topicId }),
+      ContentNodeResource.fetchCollection({ getParams: { parent: topicId } }),
+    ];
+
+    return Promise.all(loadRequirements).then(([topicNode, childNodes]) => {
+      const topicContentList = childNodes.map(node => {
+        return { ...node, thumbnail: getContentNodeThumbnail(node) };
+      });
 
+      return showResourceSelectionPage(store, {
+        classId: params.classId,
+        lessonId: params.lessonId,
+        bookmarksList: topicContentList,
+        pageName: LessonsPageNames.SELECTION,
+        ancestors: [...topicNode.ancestors, topicNode],
+      });
+    });
+  });
+}
+export function showLessonResourceBookmarksMain(store) {
+  return store.dispatch('loading').then(() => {
+    getBookmarks().then(bookmarks => {
+      console.log(111111, bookmarks);
+      return showResourceSelectionPage(store, {
+        bookmarksList: bookmarks,
+      });
+    });
+  });
+}
+function getBookmarks() {
+  return BookmarksResource.fetchCollection()
+    .then(bookmarks => {
+      return bookmarks.map(bookmark => {
+        return ContentNodeResource.fetchModel({ id: bookmark.contentnode_id });
+      });
+    })
+    .then(bookmarkPromises => {
+      return Promise.all(bookmarkPromises);
+    });
+}
 export function showLessonResourceContentPreview(store, params) {
   const { classId, lessonId, contentId } = params;
   return store.dispatch('loading').then(() => {
@@ -143,6 +194,7 @@ export function showLessonResourceContentPreview(store, params) {
 }
 
 export function showLessonSelectionContentPreview(store, params, query = {}) {
+  console.log('in prview', params);
   const { classId, lessonId, contentId } = params;
   return store.dispatch('loading').then(() => {
     const pendingSelections = store.state.lessonSummary.workingResources || [];

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

@@ -4,6 +4,7 @@ import * as actions from './actions';
 
 function defaultState() {
   return {
+    bookmarksList: [],
     ancestorCounts: {},
     ancestors: [],
     contentList: [],
@@ -40,6 +41,9 @@ export default {
     SET_ANCESTORS(state, ancestors) {
       state.ancestors = [...ancestors];
     },
+    SET_BOOKMARKS_LIST(state, bookmarks) {
+      state.bookmarksList = bookmarks;
+    },
     SET_ANCESTOR_COUNTS(state, ancestorCountsObject) {
       state.ancestorCounts = ancestorCountsObject;
     },

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

@@ -3,6 +3,8 @@ import { PageNames } from '../constants';
 import {
   showExamCreationRootPage,
   showExamCreationTopicPage,
+  showExamCreationBookmarksPage,
+  showExamCreationAllBookmarks,
   showExamCreationSearchPage,
   showExamCreationQuestionSelectionPage,
   showExamCreationPreviewPage,
@@ -64,6 +66,22 @@ export default [
       showExamCreationTopicPage(store, toRoute.params);
     },
   },
+  {
+    name: PageNames.EXAM_CREATION_BOOKMARKS,
+    path: '/:classId/plan/quizzes/new/bookmark/:topicId',
+    component: CreateExamPage,
+    handler: toRoute => {
+      showExamCreationBookmarksPage(store, toRoute.params);
+    },
+  },
+  {
+    name: PageNames.EXAM_CREATION_BOOKMARKS_MAIN,
+    path: '/:classId/plan/quizzes/new/bookmarks',
+    component: CreateExamPage,
+    handler: toRoute => {
+      showExamCreationAllBookmarks(store, toRoute.params);
+    },
+  },
   {
     name: PageNames.EXAM_CREATION_SEARCH,
     path: '/:classId/plan/quizzes/new/search/:searchTerm',